[SERVER] [HACK] commented out dependencies on test jars to allow use of -Dmaven.test.skip=true, even though tests are being skipped the test jars are considered during buildplan creation which causes the build to fail. At this point in the repo-fix some tests fail to compile so we need to exclude them, they will be fixed for the split, *but* it should be possible to build Brooklyn without test jars having been generated imho.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9d2c69d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9d2c69d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9d2c69d4 Branch: refs/heads/master Commit: 9d2c69d4384f2333b27d6a5b51ec68742eeb6cb0 Parents: df67b6e Author: John McCabe <[email protected]> Authored: Wed Dec 16 14:26:18 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Dec 21 16:43:34 2015 +0000 ---------------------------------------------------------------------- brooklyn-server/camp/camp-brooklyn/pom.xml | 4 ++-- brooklyn-server/camp/camp-server/pom.xml | 4 ++-- brooklyn-server/core/pom.xml | 4 ++-- brooklyn-server/launcher/pom.xml | 16 ++++++++-------- brooklyn-server/locations/jclouds/pom.xml | 4 ++-- brooklyn-server/policy/pom.xml | 4 ++-- brooklyn-server/rest/rest-client/pom.xml | 8 ++++---- brooklyn-server/rest/rest-server/pom.xml | 8 ++++---- brooklyn-server/server-cli/pom.xml | 4 ++-- brooklyn-server/software/base/pom.xml | 4 ++-- brooklyn-server/software/winrm/pom.xml | 4 ++-- brooklyn-server/storage/hazelcast/pom.xml | 4 ++-- brooklyn-server/test-framework/pom.xml | 4 ++-- brooklyn-server/utils/rt-felix/pom.xml | 4 ++-- 14 files changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/camp/camp-brooklyn/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-brooklyn/pom.xml b/brooklyn-server/camp/camp-brooklyn/pom.xml index fb5b68e..de50186 100644 --- a/brooklyn-server/camp/camp-brooklyn/pom.xml +++ b/brooklyn-server/camp/camp-brooklyn/pom.xml @@ -111,7 +111,7 @@ </dependency> <!-- demo and tests --> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-base</artifactId> <version>${project.version}</version> @@ -138,7 +138,7 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-locations-jclouds</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/camp/camp-server/pom.xml b/brooklyn-server/camp/camp-server/pom.xml index a41c30a..d56983a 100644 --- a/brooklyn-server/camp/camp-server/pom.xml +++ b/brooklyn-server/camp/camp-server/pom.xml @@ -49,13 +49,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-base</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/core/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/core/pom.xml b/brooklyn-server/core/pom.xml index e40aec4..777368c 100644 --- a/brooklyn-server/core/pom.xml +++ b/brooklyn-server/core/pom.xml @@ -209,7 +209,7 @@ <classifier>tests</classifier> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-rt-osgi</artifactId> <version>${project.version}</version> @@ -222,7 +222,7 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/launcher/pom.xml b/brooklyn-server/launcher/pom.xml index c8c0c57..d37c65a 100644 --- a/brooklyn-server/launcher/pom.xml +++ b/brooklyn-server/launcher/pom.xml @@ -146,20 +146,20 @@ <artifactId>testng</artifactId> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn.camp</groupId> <artifactId>camp-server</artifactId> <version>${project.version}</version> <scope>test</scope> <classifier>tests</classifier> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-test-support</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> @@ -172,8 +172,8 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> - <dependency> + </dependency> --> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-camp</artifactId> <version>${project.version}</version> @@ -186,19 +186,19 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-locations-jclouds</artifactId> <version>${project.version}</version> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-locations-jclouds</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/locations/jclouds/pom.xml b/brooklyn-server/locations/jclouds/pom.xml index efe1284..810d844 100644 --- a/brooklyn-server/locations/jclouds/pom.xml +++ b/brooklyn-server/locations/jclouds/pom.xml @@ -182,13 +182,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/policy/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/policy/pom.xml b/brooklyn-server/policy/pom.xml index ffb0048..b6d13e0 100644 --- a/brooklyn-server/policy/pom.xml +++ b/brooklyn-server/policy/pom.xml @@ -69,13 +69,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>com.google.mockwebserver</groupId> <artifactId>mockwebserver</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/rest/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/rest/rest-client/pom.xml b/brooklyn-server/rest/rest-client/pom.xml index 53a3990..fa76836 100644 --- a/brooklyn-server/rest/rest-client/pom.xml +++ b/brooklyn-server/rest/rest-client/pom.xml @@ -118,26 +118,26 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-rest-server</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-rest-server</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-test-support</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/rest/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/rest/rest-server/pom.xml b/brooklyn-server/rest/rest-server/pom.xml index 2c107ed..12078b0 100644 --- a/brooklyn-server/rest/rest-server/pom.xml +++ b/brooklyn-server/rest/rest-server/pom.xml @@ -162,7 +162,7 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> @@ -182,7 +182,7 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-locations-jclouds</artifactId> @@ -213,13 +213,13 @@ <groupId>com.sun.jersey.jersey-test-framework</groupId> <artifactId>jersey-test-framework-grizzly2</artifactId> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-rt-osgi</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/server-cli/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/server-cli/pom.xml b/brooklyn-server/server-cli/pom.xml index 531b1fe..b7cc543 100644 --- a/brooklyn-server/server-cli/pom.xml +++ b/brooklyn-server/server-cli/pom.xml @@ -97,13 +97,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/base/pom.xml b/brooklyn-server/software/base/pom.xml index 89dbcaa..2264875 100644 --- a/brooklyn-server/software/base/pom.xml +++ b/brooklyn-server/software/base/pom.xml @@ -134,7 +134,7 @@ <artifactId>mockito-core</artifactId> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> @@ -147,7 +147,7 @@ <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>mx4j</groupId> <artifactId>mx4j-tools</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/software/winrm/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/software/winrm/pom.xml b/brooklyn-server/software/winrm/pom.xml index fa1c801..3424baa 100644 --- a/brooklyn-server/software/winrm/pom.xml +++ b/brooklyn-server/software/winrm/pom.xml @@ -47,13 +47,13 @@ </dependency> <!-- test --> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-test-support</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/storage/hazelcast/pom.xml b/brooklyn-server/storage/hazelcast/pom.xml index 4db2945..c5106d3 100644 --- a/brooklyn-server/storage/hazelcast/pom.xml +++ b/brooklyn-server/storage/hazelcast/pom.xml @@ -72,13 +72,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/test-framework/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/test-framework/pom.xml b/brooklyn-server/test-framework/pom.xml index aa1bc35..192770d 100644 --- a/brooklyn-server/test-framework/pom.xml +++ b/brooklyn-server/test-framework/pom.xml @@ -64,13 +64,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-core</artifactId> <version>${brooklyn.version}</version> <scope>test</scope> <classifier>tests</classifier> - </dependency> + </dependency> --> <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9d2c69d4/brooklyn-server/utils/rt-felix/pom.xml ---------------------------------------------------------------------- diff --git a/brooklyn-server/utils/rt-felix/pom.xml b/brooklyn-server/utils/rt-felix/pom.xml index c33ec74..ddea9e6 100644 --- a/brooklyn-server/utils/rt-felix/pom.xml +++ b/brooklyn-server/utils/rt-felix/pom.xml @@ -48,13 +48,13 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-rt-osgi</artifactId> <version>${project.version}</version> <classifier>tests</classifier> <scope>test</scope> - </dependency> + </dependency> --> </dependencies>
