Skip to content

Commit 5ffa696

Browse files
yuting-liuyuting-liu
committed
Fix pom.xml
1 parent 2874013 commit 5ffa696

2 files changed

Lines changed: 358 additions & 16 deletions

File tree

‎docker-java/src/test/java/com/github/dockerjava/cmd/LogContainerCmdIT.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ public void asyncLogContainerWithTailAll() throws Exception {
281281

282282
CreateContainerResponse container = dockerRule.getClient().createContainerCmd("icevivek/logreader")
283283
.exec();
284+
int timestamp = (int) (System.currentTimeMillis() / 1000);
284285

285286
dockerRule.getClient().startContainerCmd(container.getId()).exec();
286287

@@ -291,11 +292,12 @@ public void asyncLogContainerWithTailAll() throws Exception {
291292
.withStdErr(true)
292293
.withStdOut(true)
293294
.withFollowStream(true)
294-
.withTailAll()
295+
.withTimestamps(true)
296+
.withSince(timestamp - 24 * 60 * 60 * 1000)
295297
.exec(loggingCallback);
296298

297299
loggingCallback.awaitCompletion(30, TimeUnit.SECONDS);
298300

299-
assertEquals(loggingCallback.getCollectedFrames().size(), 187);
301+
assertEquals(187, loggingCallback.getCollectedFrames().size());
300302
}
301303
}

‎pom.xml‎

Lines changed: 354 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,356 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
7-
<groupId>org.example</groupId>
8-
<artifactId>docker-java</artifactId>
9-
<version>1.0-SNAPSHOT</version>
10-
11-
<properties>
12-
<maven.compiler.source>8</maven.compiler.source>
13-
<maven.compiler.target>8</maven.compiler.target>
14-
</properties>
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
5+
<groupId>com.github.docker-java</groupId>
6+
<artifactId>docker-java-parent</artifactId>
7+
<packaging>pom</packaging>
8+
<version>0-SNAPSHOT</version>
9+
10+
<name>docker-java-parent</name>
11+
<url>https://github.com/docker-java/docker-java</url>
12+
<description>Java API Client for Docker</description>
13+
14+
<licenses>
15+
<license>
16+
<name>The Apache Software License, Version 2.0</name>
17+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
18+
<distribution>repo</distribution>
19+
</license>
20+
</licenses>
21+
22+
<scm>
23+
<connection>scm:git:git@github.com:docker-java/docker-java.git</connection>
24+
<url>git@github.com:docker-java/docker-java.git</url>
25+
<developerConnection>scm:git:git@github.com:docker-java/docker-java.git</developerConnection>
26+
<tag>HEAD</tag>
27+
</scm>
28+
29+
<developers>
30+
<developer>
31+
<id>marcuslinke</id>
32+
<name>Marcus Linke</name>
33+
<email>marcus.linke@gmx.de</email>
34+
</developer>
35+
<developer>
36+
<id>kostyasha</id>
37+
<name>Kanstantsin Shautsou</name>
38+
<email>kanstantsin.sha@gmail.com</email>
39+
</developer>
40+
<developer>
41+
<id>kpelykh</id>
42+
<name>Konstantin Pelykh</name>
43+
<email>kpelykh@gmail.com</email>
44+
</developer>
45+
<developer>
46+
<id>bsideup</id>
47+
<name>Sergei Egorov</name>
48+
<email>bsideup@gmail.com</email>
49+
</developer>
50+
</developers>
51+
52+
<properties>
53+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
54+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
55+
<jdk.debug>true</jdk.debug>
56+
<jdk.optimize>false</jdk.optimize>
57+
<jdk.source>1.8</jdk.source>
58+
<jdk.target>1.8</jdk.target>
59+
60+
<jersey.version>2.30.1</jersey.version>
61+
<jackson.version>2.10.3</jackson.version>
62+
<jackson-jaxrs.version>2.10.3</jackson-jaxrs.version>
63+
<httpclient.version>4.5.12</httpclient.version><!-- 4.5.1-4.5.2 broken -->
64+
<commons-compress.version>1.21</commons-compress.version>
65+
<commons-codec.version>1.11</commons-codec.version>
66+
<commons-io.version>2.6</commons-io.version>
67+
<commons-lang3.version>3.12.0</commons-lang3.version>
68+
<slf4j-api.version>1.7.30</slf4j-api.version>
69+
70+
<bouncycastle.version>1.64</bouncycastle.version>
71+
<junixsocket.version>2.3.2</junixsocket.version>
72+
<guava.version>19.0</guava.version> <!-- todo remove from project -->
73+
74+
<!-- test dependencies -->
75+
<logback.version>1.2.3</logback.version>
76+
<netty.version>4.1.46.Final</netty.version>
77+
<hamcrest.library.version>2.2</hamcrest.library.version>
78+
<hamcrest.jpa-matchers>1.8</hamcrest.jpa-matchers>
79+
<lambdaj.version>2.3.3</lambdaj.version>
80+
<mockito.version>3.3.0</mockito.version>
81+
82+
83+
<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
84+
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
85+
<maven-release-plugin.version>3.0.0-M1</maven-release-plugin.version>
86+
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
87+
<maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
88+
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
89+
<maven-bundlor-plugin.version>1.1.2.RELEASE</maven-bundlor-plugin.version>
90+
<maven-build-helper-plugin.version>3.0.0</maven-build-helper-plugin.version>
91+
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
92+
</properties>
93+
94+
<modules>
95+
<module>docker-java-api</module>
96+
<module>docker-java-bom</module>
97+
<module>docker-java-core</module>
98+
<module>docker-java-transport</module>
99+
<module>docker-java-transport-netty</module>
100+
<module>docker-java-transport-jersey</module>
101+
<module>docker-java-transport-okhttp</module>
102+
<module>docker-java-transport-httpclient5</module>
103+
<module>docker-java-transport-zerodep</module>
104+
<module>docker-java</module>
105+
</modules>
106+
107+
<build>
108+
<pluginManagement>
109+
<plugins>
110+
<plugin>
111+
<groupId>org.apache.maven.plugins</groupId>
112+
<artifactId>maven-clean-plugin</artifactId>
113+
<version>3.1.0</version>
114+
</plugin>
115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-deploy-plugin</artifactId>
118+
<version>3.0.0-M1</version>
119+
</plugin>
120+
<plugin>
121+
<groupId>org.apache.maven.plugins</groupId>
122+
<artifactId>maven-resources-plugin</artifactId>
123+
<version>3.1.0</version>
124+
</plugin>
125+
<plugin>
126+
<groupId>org.apache.maven.plugins</groupId>
127+
<artifactId>maven-gpg-plugin</artifactId>
128+
<version>1.6</version>
129+
</plugin>
130+
<plugin>
131+
<groupId>org.apache.maven.plugins</groupId>
132+
<artifactId>maven-install-plugin</artifactId>
133+
<version>3.0.0-M1</version>
134+
</plugin>
135+
136+
<plugin>
137+
<groupId>org.apache.maven.plugins</groupId>
138+
<artifactId>maven-surefire-plugin</artifactId>
139+
<version>${maven-surefire-plugin.version}</version>
140+
</plugin>
141+
142+
<plugin>
143+
<groupId>org.apache.maven.plugins</groupId>
144+
<artifactId>maven-compiler-plugin</artifactId>
145+
<version>${maven-compiler-plugin.version}</version>
146+
<configuration>
147+
<source>${jdk.source}</source>
148+
<target>${jdk.target}</target>
149+
<debug>${jdk.debug}</debug>
150+
<optimize>${jdk.optimize}</optimize>
151+
</configuration>
152+
</plugin>
153+
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-jar-plugin</artifactId>
157+
<version>${maven-jar-plugin.version}</version>
158+
<executions>
159+
<execution>
160+
<goals>
161+
<goal>test-jar</goal>
162+
</goals>
163+
</execution>
164+
</executions>
165+
</plugin>
166+
167+
<plugin>
168+
<groupId>org.apache.maven.plugins</groupId>
169+
<artifactId>maven-antrun-plugin</artifactId>
170+
<version>${maven-antrun-plugin.version}</version>
171+
<executions>
172+
<execution>
173+
<phase>validate</phase>
174+
<goals>
175+
<goal>run</goal>
176+
</goals>
177+
<configuration>
178+
<tasks>
179+
<echo>*******************************************************************</echo>
180+
<echo>*******************************************************************</echo>
181+
<echo>[project.name] : ${project.name}</echo>
182+
<echo>[project.basedir] : ${project.basedir}</echo>
183+
<echo>[project.version] : ${project.version}</echo>
184+
<echo>[project.artifactId] ${project.artifactId}</echo>
185+
<echo>[project.build.directory] ${project.build.directory}</echo>
186+
<echo>[jdk.source] : ${jdk.source}</echo>
187+
<echo>[jdk.target] : ${jdk.target}</echo>
188+
<echo>[jdk.debug] : ${jdk.debug}</echo>
189+
<echo>[jdk.optimize] : ${jdk.optimize}</echo>
190+
<echo>[source encoding]: ${project.build.sourceEncoding}</echo>
191+
<echo>[LocalRepository] : ${settings.localRepository}</echo>
192+
<echo>*******************************************************************</echo>
193+
<echo>*******************************************************************</echo>
194+
</tasks>
195+
</configuration>
196+
</execution>
197+
</executions>
198+
</plugin>
199+
<plugin>
200+
<groupId>org.apache.maven.plugins</groupId>
201+
<artifactId>maven-source-plugin</artifactId>
202+
<version>3.0.1</version>
203+
<executions>
204+
<execution>
205+
<id>attach-sources</id>
206+
<goals>
207+
<goal>jar-no-fork</goal>
208+
</goals>
209+
</execution>
210+
</executions>
211+
</plugin>
212+
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
214+
<artifactId>maven-javadoc-plugin</artifactId>
215+
<version>2.10.4</version>
216+
<configuration>
217+
<additionalparam>-Xdoclint:none</additionalparam>
218+
</configuration>
219+
<executions>
220+
<execution>
221+
<id>attach-javadocs</id>
222+
<goals>
223+
<goal>jar</goal>
224+
</goals>
225+
</execution>
226+
</executions>
227+
</plugin>
228+
<plugin>
229+
<groupId>org.apache.felix</groupId>
230+
<artifactId>maven-bundle-plugin</artifactId>
231+
<version>4.2.1</version>
232+
</plugin>
233+
234+
235+
<plugin>
236+
<!-- use with "mvn -DskipTests clean verify" -->
237+
<groupId>com.github.siom79.japicmp</groupId>
238+
<artifactId>japicmp-maven-plugin</artifactId>
239+
<version>0.14.3</version>
240+
<configuration>
241+
<oldVersion>
242+
<dependency>
243+
<groupId>com.github.docker-java</groupId>
244+
<artifactId>${project.artifactId}</artifactId>
245+
<version>3.2.0</version>
246+
<type>jar</type>
247+
</dependency>
248+
</oldVersion>
249+
<newVersion>
250+
<file>
251+
<path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
252+
</file>
253+
</newVersion>
254+
<parameter>
255+
<breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
256+
<accessModifier>public</accessModifier>
257+
<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
258+
<overrideCompatibilityChangeParameters>
259+
<overrideCompatibilityChangeParameter>
260+
<compatibilityChange>METHOD_NEW_DEFAULT</compatibilityChange>
261+
<binaryCompatible>true</binaryCompatible>
262+
<sourceCompatible>true</sourceCompatible>
263+
</overrideCompatibilityChangeParameter>
264+
<overrideCompatibilityChangeParameter>
265+
<compatibilityChange>METHOD_ABSTRACT_NOW_DEFAULT</compatibilityChange>
266+
<binaryCompatible>true</binaryCompatible>
267+
<sourceCompatible>true</sourceCompatible>
268+
</overrideCompatibilityChangeParameter>
269+
</overrideCompatibilityChangeParameters>
270+
</parameter>
271+
</configuration>
272+
<executions>
273+
<execution>
274+
<phase>verify</phase>
275+
<goals>
276+
<goal>cmp</goal>
277+
</goals>
278+
</execution>
279+
</executions>
280+
</plugin>
281+
</plugins>
282+
</pluginManagement>
283+
<plugins>
284+
<plugin>
285+
<groupId>org.apache.maven.plugins</groupId>
286+
<artifactId>maven-source-plugin</artifactId>
287+
</plugin>
288+
<plugin>
289+
<groupId>org.apache.maven.plugins</groupId>
290+
<artifactId>maven-javadoc-plugin</artifactId>
291+
</plugin>
292+
</plugins>
293+
</build>
294+
295+
<profiles>
296+
<profile>
297+
<id>release</id>
298+
<build>
299+
<plugins>
300+
<plugin>
301+
<groupId>org.apache.maven.plugins</groupId>
302+
<artifactId>maven-gpg-plugin</artifactId>
303+
<executions>
304+
<execution>
305+
<id>sign-artifacts</id>
306+
<phase>verify</phase>
307+
<goals>
308+
<goal>sign</goal>
309+
</goals>
310+
</execution>
311+
</executions>
312+
</plugin>
313+
<plugin>
314+
<groupId>org.apache.maven.plugins</groupId>
315+
<artifactId>maven-source-plugin</artifactId>
316+
</plugin>
317+
</plugins>
318+
</build>
319+
</profile>
320+
<profile>
321+
<id>docker-java-analyses</id>
322+
<activation>
323+
<activeByDefault>true</activeByDefault>
324+
</activation>
325+
<build>
326+
<plugins>
327+
<plugin>
328+
<artifactId>maven-checkstyle-plugin</artifactId>
329+
<version>2.17</version>
330+
<executions>
331+
<execution>
332+
<id>checkstyle</id>
333+
<phase>validate</phase>
334+
<goals>
335+
<goal>check</goal>
336+
</goals>
337+
</execution>
338+
</executions>
339+
<configuration>
340+
<encoding>UTF-8</encoding>
341+
<failOnViolation>true</failOnViolation>
342+
<logViolationsToConsole>true</logViolationsToConsole>
343+
<linkXRef>false</linkXRef>
344+
<!-- if some IDE has integration and requires other place, propose
345+
it -->
346+
<configLocation>
347+
${maven.multiModuleProjectDirectory}/src/test/resources/checkstyle/checkstyle-config.xml
348+
</configLocation>
349+
</configuration>
350+
</plugin>
351+
</plugins>
352+
</build>
353+
</profile>
354+
</profiles>
15355

16356
</project>

0 commit comments

Comments
 (0)