camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zregv...@apache.org
Subject [camel] 04/09: CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
Date Tue, 25 Sep 2018 11:54:04 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 e000de842949e3a8509d0e58985fce54f6cc509f
Author: Zoran Regvart <zregvart@apache.org>
AuthorDate: Fri Aug 17 12:33:14 2018 +0200

    CAMEL-12618: Use Groovy 3.0.0-SNAPSHOT for gmav...
    
    ...enplus plugin
    
    There is no released Groovy version that supports Java 11[1], so this
    uses a snapshot version in the configuration of the gmavenplus plugin so
    the build can be performed on Java 11.
    
    [1] https://issues.apache.org/jira/browse/GROOVY-8727
---
 buildingtools/pom.xml                              | 14 -------
 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, 44 insertions(+), 50 deletions(-)

diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 5e8d7bd..4e61020 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -113,20 +113,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <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>
                 <!--
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 1802868..01180d6 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -172,20 +172,6 @@
             </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 ae1606b..8ac9bd9 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -330,14 +330,6 @@
                 </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 d7a4861..98ced80 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -125,20 +125,6 @@
             </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 0f39917..1156795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,17 @@
         <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>
   </pluginRepositories>
 
   <modules>
@@ -327,6 +338,39 @@
             <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>


Mime
View raw message