You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/10/25 23:48:28 UTC
[6/7] incubator-brooklyn git commit: Remove groovy dependencies
Remove groovy dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4ba22be8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4ba22be8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4ba22be8
Branch: refs/heads/master
Commit: 4ba22be8457bad0ebb1472aae6216ba689a34c31
Parents: 0d0214c
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Oct 22 09:49:37 2015 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Oct 22 16:44:58 2015 +0300
----------------------------------------------------------------------
core/pom.xml | 16 +++++++++
examples/simple-web-cluster/pom.xml | 4 ---
parent/pom.xml | 56 +++++++++++---------------------
sandbox/database/pom.xml | 17 ----------
sandbox/nosql/pom.xml | 12 -------
software/base/pom.xml | 9 -----
software/database/pom.xml | 23 -------------
software/messaging/pom.xml | 9 -----
software/nosql/pom.xml | 9 -----
software/osgi/pom.xml | 4 ---
usage/cli/pom.xml | 4 ---
usage/downstream-parent/pom.xml | 1 -
usage/launcher/pom.xml | 4 ---
usage/qa/pom.xml | 4 ---
usage/rest-server/pom.xml | 4 ---
usage/test-support/pom.xml | 5 ---
utils/groovy/pom.xml | 12 -------
17 files changed, 35 insertions(+), 158 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 222ccfd..1a0e04b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -224,6 +224,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
+ <configuration>
+ <fork>true</fork>
+ <verbose>false</verbose>
+ </configuration>
<executions>
<!--
Compile only Groovy files with the eclipse-groovy compiler.
@@ -247,6 +251,18 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-compiler</artifactId>
+ <version>2.9.0-01</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-eclipse-batch</artifactId>
+ <version>2.3.4-01</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/examples/simple-web-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml
index afeb419..afe9364 100644
--- a/examples/simple-web-cluster/pom.xml
+++ b/examples/simple-web-cluster/pom.xml
@@ -45,10 +45,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1ca10ad..42ec0b1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1040,26 +1040,6 @@
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <fork>true</fork>
- <verbose>false</verbose>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-compiler</artifactId>
- <version>2.9.0-01</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-eclipse-batch</artifactId>
- <version>2.3.4-01</version>
- </dependency>
- </dependencies>
- </plugin>
<!-- workaround for src/main/resources excluding all in eclipse, as per
https://issues.sonatype.org/browse/MNGECLIPSE-864
-->
@@ -1865,23 +1845,25 @@
<profile>
<id>eclipse-compiler</id>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerId>eclipse</compilerId>
- <optimize>true</optimize>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.6</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <compilerId>eclipse</compilerId>
+ <optimize>true</optimize>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-eclipse</artifactId>
+ <version>2.6</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/sandbox/database/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/database/pom.xml b/sandbox/database/pom.xml
index 5305b03..b38a65d 100644
--- a/sandbox/database/pom.xml
+++ b/sandbox/database/pom.xml
@@ -63,21 +63,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/sandbox/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/nosql/pom.xml b/sandbox/nosql/pom.xml
index d3a7f52..d62be44 100644
--- a/sandbox/nosql/pom.xml
+++ b/sandbox/nosql/pom.xml
@@ -80,18 +80,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 32bb09b..556e982 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -72,11 +72,6 @@
</dependency>
<dependency>
<groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-utils-groovy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
<version>${project.version}</version>
</dependency>
@@ -102,10 +97,6 @@
<artifactId>gson</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index a48081e..890cbfb 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -60,20 +60,6 @@
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<dependencies>
@@ -98,15 +84,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-utils-groovy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 26f9810..38a6ff5 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -82,15 +82,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-utils-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index be0887d..4fd2d18 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -82,15 +82,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-utils-groovy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index e391334..6d6b141 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -60,10 +60,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index dbc5d44..92e925d 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -70,10 +70,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index be889de..974f367 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -62,7 +62,6 @@
<jersey.version>1.18.1</jersey.version>
<httpclient.version>4.4.1</httpclient.version>
<commons-lang3.version>3.1</commons-lang3.version>
- <groovy.version>2.3.4</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.0-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
<snakeyaml.version>1.11</snakeyaml.version>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 9143e45..24504e0 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -93,10 +93,6 @@
<artifactId>concurrentlinkedhashmap-lru</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index b4495e6..fd0266d 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -61,10 +61,6 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index 12630bc..28cfc7e 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -76,10 +76,6 @@
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/usage/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml
index f1eca53..4d241d0 100644
--- a/usage/test-support/pom.xml
+++ b/usage/test-support/pom.xml
@@ -59,10 +59,5 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4ba22be8/utils/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index 07a0736..f25e30f 100644
--- a/utils/groovy/pom.xml
+++ b/utils/groovy/pom.xml
@@ -67,16 +67,4 @@
<artifactId>groovy-all</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <compilerId>groovy-eclipse-compiler</compilerId>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>