Shorten test (+3 squashed commits)

Squashed commits:
[3b09c167] Javadoc plugin version
[13079b14] Javadoc plugin version
[17a3eb97] Javadoc plugin version
pull/1808/head
Brett Wooldridge 4 years ago
parent 2a92bcf2c7
commit 6546dd27dd

@ -7,7 +7,7 @@
</provides> </provides>
<configuration> <configuration>
<paths> <paths>
<path>/Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/bin</path> <path>/Library/Java/JavaVirtualMachines/jdk-11.0.11.jdk/Contents/Home/bin</path>
</paths> </paths>
</configuration> </configuration>
</toolchain> </toolchain>

@ -9,7 +9,7 @@
<java11.build.outputDirectory>${project.build.directory}/classes-java11</java11.build.outputDirectory> <java11.build.outputDirectory>${project.build.directory}/classes-java11</java11.build.outputDirectory>
<artifact.classifier /> <artifact.classifier />
<docker.maven.plugin.fabric8.version>0.33.0</docker.maven.plugin.fabric8.version> <docker.maven.plugin.fabric8.version>0.36.0</docker.maven.plugin.fabric8.version>
<felix.bundle.plugin.version>5.1.1</felix.bundle.plugin.version> <felix.bundle.plugin.version>5.1.1</felix.bundle.plugin.version>
<felix.version>6.0.1</felix.version> <felix.version>6.0.1</felix.version>
<hibernate.version>5.4.16.Final</hibernate.version> <hibernate.version>5.4.16.Final</hibernate.version>
@ -22,7 +22,7 @@
<mockito.version>3.7.7</mockito.version> <mockito.version>3.7.7</mockito.version>
<pax.exam.version>4.13.1</pax.exam.version> <pax.exam.version>4.13.1</pax.exam.version>
<pax.url.version>2.5.4</pax.url.version> <pax.url.version>2.5.4</pax.url.version>
<postgresql.version>42.1.4</postgresql.version> <postgresql.version>42.2.20</postgresql.version>
<log4j.version>2.14.0</log4j.version> <log4j.version>2.14.0</log4j.version>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.30</slf4j.version>
<commons.csv.version>1.5</commons.csv.version> <commons.csv.version>1.5</commons.csv.version>
@ -499,8 +499,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version> <version>3.8.1</version>
<configuration> <configuration>
<source>1.8</source> <source>11</source>
<target>1.8</target> <target>11</target>
<compilerArgs>-Xlint</compilerArgs> <compilerArgs>-Xlint</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
@ -572,24 +572,6 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>Java8</id>
<activation>
<jdk>[,11)</jdk>
</activation>
<properties>
<automatic.module.name>com.zaxxer.hikari</automatic.module.name>
<slf4j.version>1.7.30</slf4j.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile> <profile>
<id>Java11</id> <id>Java11</id>
<activation> <activation>

@ -119,7 +119,7 @@ public class PostgresTest
do { do {
quietlySleep(SECONDS.toMillis(1)); quietlySleep(SECONDS.toMillis(1));
assertZeroErrors(threads); assertZeroErrors(threads);
} while (elapsedMillis(start) < SECONDS.toMillis(30)); } while (elapsedMillis(start) < SECONDS.toMillis(15));
stopThreads(threads); stopThreads(threads);
} }

Loading…
Cancel
Save