Repository: incubator-streams-master Updated Branches: refs/heads/master 6747bebe5 -> c54bc9018
supports STREAMS-400 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/commit/9e8b6afc Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/tree/9e8b6afc Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams-master/diff/9e8b6afc Branch: refs/heads/master Commit: 9e8b6afcfb4b2b515f71c3936bec24d8b39104f1 Parents: 6747beb Author: Steve Blackmon @steveblackmon <[email protected]> Authored: Wed Oct 5 10:52:22 2016 -0500 Committer: Steve Blackmon @steveblackmon <[email protected]> Committed: Wed Oct 5 10:52:22 2016 -0500 ---------------------------------------------------------------------- pom.xml | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 83 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams-master/blob/9e8b6afc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 349c4f1..cce6e5b 100644 --- a/pom.xml +++ b/pom.xml @@ -261,9 +261,9 @@ <clean.plugin.version>2.6</clean.plugin.version> <dependency.plugin.version>2.8</dependency.plugin.version> <depgraph.plugin.version>1.0.3</depgraph.plugin.version> - <docker.plugin.version>0.15.0</docker.plugin.version> + <docker.plugin.version>0.16.5</docker.plugin.version> <enforcer.plugin.version>1.3.1</enforcer.plugin.version> - <failsafe.plugin.version>2.17</failsafe.plugin.version> + <failsafe.plugin.version>2.19.1</failsafe.plugin.version> <jar.plugin.version>2.6</jar.plugin.version> <javadoc.plugin.version>2.10.2</javadoc.plugin.version> <pax.plugin.version>1.5</pax.plugin.version> @@ -275,12 +275,12 @@ <shade.plugin.version>2.4.3</shade.plugin.version> <site.plugin.version>3.5</site.plugin.version> <source.plugin.version>2.4</source.plugin.version> - <surefire.plugin.version>2.17</surefire.plugin.version> + <surefire.plugin.version>2.19.1</surefire.plugin.version> <wagon.plugin.version>2.5</wagon.plugin.version> <war.plugin.version>2.5</war.plugin.version> <!-- Library Dependency Versions --> - <jackson.version>2.3.2</jackson.version> + <jackson.version>2.6.5</jackson.version> <jackson-xml-databind.version>0.6.2</jackson-xml-databind.version> <aalto.version>0.9.9</aalto.version> <joda-time.version>2.2</joda-time.version> @@ -302,7 +302,7 @@ <typesafe.config.version>1.2.0</typesafe.config.version> <reflections.version>0.9.9</reflections.version> <orgjson.version>20140107</orgjson.version> - <guava.version>17.0</guava.version> + <guava.version>18.0</guava.version> <clojure.version>1.4.0</clojure.version> <zookeeper.version>3.4.5</zookeeper.version> <netty.version>3.8.0.Final</netty.version> @@ -318,6 +318,9 @@ <org.osgi.service.http.port>8080</org.osgi.service.http.port> <org.osgi.service.http.port.secure>8443</org.osgi.service.http.port.secure> + <skipITs>true</skipITs> + <skipTests>false</skipTests> + </properties> <build> @@ -495,6 +498,38 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.plugin.version}</version> + <executions> + <execution> + <id>test</id> + <phase>test</phase> + <goals> + <goal>test</goal> + </goals> + </execution> + </executions> + <configuration> + <!-- Skips unit tests if the value of skip.unit.tests property is true --> + <skipTests>${skipTests}</skipTests> + <threadCount>1</threadCount> + <useUnlimitedThreads>false</useUnlimitedThreads> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <!-- Run unit test suites before individuals tests. --> + <includes> + <include>**/*Tests.java</include> + <include>**/*Test.java</include> + </includes> + <!-- Excludes integration tests when unit tests are run. --> + <excludes> + <exclude>**/*IT.java</exclude> + <include>**/*ITs.java</include> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> <version>${failsafe.plugin.version}</version> <executions> @@ -506,6 +541,38 @@ </goals> </execution> </executions> + <configuration> + <!-- Skips integration tests if the value of skip.integration.tests property is true --> + <skipTests>${skipITs}</skipTests> + <threadCount>1</threadCount> + <useUnlimitedThreads>false</useUnlimitedThreads> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> + <shutdown>exit</shutdown> + <!-- Excludes unit tests when integration tests are run. --> + <excludes> + <exclude>**/*Test.java</exclude> + <exclude>**/*Tests.java</exclude> + </excludes> + <!-- Run integration test suites before individuals tests. --> + <includes> + <include>**/*ITs.java</include> + <include>**/*IT.java</include> + </includes> + v<reportFormat>plain</reportFormat> + </configuration> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit47</artifactId> + <version>2.19.1</version> + </dependency> + <!--<dependency>--> + <!--<groupId>org.apache.maven.surefire</groupId>--> + <!--<artifactId>surefire-testng</artifactId>--> + <!--<version>2.19.1</version>--> + <!--</dependency>--> + </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -621,6 +688,16 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>${failsafe.plugin.version}</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> <executions> <execution> @@ -727,6 +804,7 @@ <groupId>org.hamcrest</groupId> <artifactId>hamcrest-all</artifactId> <version>${hamcrest.version}</version> + <scope>test</scope> </dependency> <dependency> <groupId>junit</groupId>
