camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zregv...@apache.org
Subject [camel] 05/09: CAMEL-12618: upgrade Groovy Eclipse compiler
Date Tue, 25 Sep 2018 11:54:05 GMT
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 2f73d109609b8c13a8b1070bbfba26abf970b477
Author: Zoran Regvart <zregvart@apache.org>
AuthorDate: Thu Aug 23 10:56:33 2018 +0200

    CAMEL-12618: upgrade Groovy Eclipse compiler
---
 archetypes/camel-archetype-groovy/pom.xml                   | 13 ++++++++++++-
 .../src/main/resources/archetype-resources/pom.xml          |  4 ++--
 components/camel-grape/pom.xml                              |  8 +++-----
 components/camel-groovy-dsl/pom.xml                         |  4 ++--
 examples/camel-example-groovy/pom.xml                       |  4 ++--
 parent/pom.xml                                              |  2 ++
 pom.xml                                                     | 12 ++++++++++++
 7 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/archetypes/camel-archetype-groovy/pom.xml b/archetypes/camel-archetype-groovy/pom.xml
index 88d596f..e88d843 100644
--- a/archetypes/camel-archetype-groovy/pom.xml
+++ b/archetypes/camel-archetype-groovy/pom.xml
@@ -46,7 +46,7 @@
     <resources>
       <resource>
         <directory>src/main/resources</directory>
-        <filtering>false</filtering>
+        <filtering>true</filtering>
       </resource>
       <resource>
         <directory>src/main/resources-filtered</directory>
@@ -56,6 +56,17 @@
         </includes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <configuration>
+            <useDefaultDelimiters>false</useDefaultDelimiters>
+            <delimiters>
+                <delimiter>@</delimiter>
+            </delimiters>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 
 </project>
diff --git a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
index ed27546..18b945b 100644
--- a/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml
@@ -114,7 +114,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
+            <version>@groovy-eclipse-compiler-version@</version>
             <exclusions>
               <exclusion>
                 <groupId>org.codehaus.groovy</groupId>
@@ -125,7 +125,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
+            <version>@groovy-eclipse-batch-version@</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index e408f6d..811d5ac 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -32,8 +32,6 @@
   <description>The grape component allows you to fetch, load and manage additional
jars when CamelContext is running</description>
 
   <properties>
-    <groovy-eclipse-batch.version>2.4.3-01</groovy-eclipse-batch.version>
-    <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
     <plexus-compiler-api.version>2.8.3</plexus-compiler-api.version>
     <camel.osgi.export.pkg />
   </properties>
@@ -95,12 +93,12 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>${groovy-eclipse-batch.version}</version>
+            <version>${groovy-eclipse-batch-version}</version>
           </dependency>
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>${groovy-eclipse-compiler.version}</version>
+            <version>${groovy-eclipse-compiler-version}</version>
           </dependency>
           <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -115,7 +113,7 @@
       <plugin>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-eclipse-compiler</artifactId>
-        <version>${groovy-eclipse-compiler.version}</version>
+        <version>${groovy-eclipse-compiler-version}</version>
         <extensions>true</extensions>
       </plugin>
       <plugin>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 62ac12a..79db32a 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -138,7 +138,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
+            <version>${groovy-eclipse-compiler-version}</version>
             <exclusions>
               <exclusion>
                 <groupId>org.codehaus.groovy</groupId>
@@ -149,7 +149,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
+            <version>${groovy-eclipse-batch-version}</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index 577f398..c26933b 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -97,7 +97,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-compiler</artifactId>
-            <version>2.9.2-01</version>
+            <version>${groovy-eclipse-compiler-version}</version>
             <exclusions>
               <exclusion>
                 <groupId>org.codehaus.groovy</groupId>
@@ -108,7 +108,7 @@
           <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-eclipse-batch</artifactId>
-            <version>2.4.3-01</version>
+            <version>${groovy-eclipse-batch-version}</version>
           </dependency>
         </dependencies>
       </plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 61f297a..00a150d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -268,6 +268,8 @@
     <google-mail-guava-version>17.0</google-mail-guava-version>
     <google-truth-version>0.30</google-truth-version>
     <grizzly-websockets-version>2.3.25</grizzly-websockets-version>
+    <groovy-eclipse-compiler-version>3.0.0-01</groovy-eclipse-compiler-version>
+    <groovy-eclipse-batch-version>2.5.2-01</groovy-eclipse-batch-version>
     <grpc-version>1.15.0</grpc-version>
     <grpc-google-auth-library-version>0.9.0</grpc-google-auth-library-version>
     <grpc-guava-version>20.0</grpc-guava-version>
diff --git a/pom.xml b/pom.xml
index 1156795..2ef5ac6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,18 @@
         <enabled>false</enabled>
       </releases>
     </pluginRepository>
+    <!-- needed for Groovy Eclipse plugin -->
+    <pluginRepository>
+      <id>bintray</id>
+      <url>https://dl.bintray.com/groovy/maven</url>
+      <name>Bintray Repository</name>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
   </pluginRepositories>
 
   <modules>


Mime
View raw message