This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch java-10-test
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 12337157b0bfe8c97666cb08915285b71b6e8856
Author: Zoran Regvart <zregv...@apache.org>
AuthorDate: Tue Nov 6 11:38:54 2018 +0100
CAMEL-12618: Revert to Groovy 2.5.3
---
buildingtools/pom.xml | 16 +++++++-
components/camel-grpc/pom.xml | 14 +++++++
.../camel-olingo2/camel-olingo2-component/pom.xml | 8 ++++
components/camel-protobuf/pom.xml | 14 +++++++
pom.xml | 44 ----------------------
5 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 4e61020..e4f86a4 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,7 +113,21 @@
</configuration>
</execution>
</executions>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
<plugin>
<!--
This is needed so that the camel-checkstyle.xml is
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 6c17e9a..ac31bef 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -179,6 +179,20 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<!-- gRPC and protobuf Java code generator plugin -->
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml
b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 8ac9bd9..ae1606b 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,6 +330,14 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
diff --git a/components/camel-protobuf/pom.xml
b/components/camel-protobuf/pom.xml
index 98ced80..9fc51cd 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,6 +125,20 @@
</configuration>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-ant</artifactId>
+ <version>${groovy-version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</plugin>
<!-- Protobuf Java code generator plugin -->
diff --git a/pom.xml b/pom.xml
index ae0dc01..5f051db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,17 +138,6 @@
<enabled>false</enabled>
</releases>
</pluginRepository>
- <!-- needed for Groovy SNAPSHOTs see gmaven plugin below -->
- <pluginRepository>
- <id>oss.jfrog.org-snapshots</id>
- <url>https://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
<!-- needed for Groovy Eclipse plugin -->
<pluginRepository>
<id>bintray</id>
@@ -351,39 +340,6 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>${gmavenplus-plugin-version}</version>
- <dependencies>
- <!-- until we get a release that fixes
https://issues.apache.org/jira/browse/GROOVY-8727
- we use a snapshot version
- -->
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <!--<version>${groovy-version}</version>-->
- <version>3.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-xml</artifactId>
- <!--<version>${groovy-version}</version>-->
- <version>3.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
- <!--<version>${groovy-version}</version>-->
- <version>3.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
-
</plugins>
</pluginManagement>
</build>
