From commits-return-65422-archive-asf-public=cust-asf.ponee.io@camel.apache.org Tue Sep 25 13:54:04 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 6FFE31807A5 for ; Tue, 25 Sep 2018 13:54:03 +0200 (CEST) Received: (qmail 78949 invoked by uid 500); 25 Sep 2018 11:54:02 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 78741 invoked by uid 99); 25 Sep 2018 11:54:02 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Sep 2018 11:54:02 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 593FD82C34; Tue, 25 Sep 2018 11:54:01 +0000 (UTC) Date: Tue, 25 Sep 2018 11:54:05 +0000 To: "commits@camel.apache.org" Subject: [camel] 05/09: CAMEL-12618: upgrade Groovy Eclipse compiler MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: zregvart@apache.org In-Reply-To: <153787644067.11973.6759241354568835173@gitbox.apache.org> References: <153787644067.11973.6759241354568835173@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: camel X-Git-Refname: refs/heads/java-10-test X-Git-Reftype: branch X-Git-Rev: 2f73d109609b8c13a8b1070bbfba26abf970b477 X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20180925115401.593FD82C34@gitbox.apache.org> 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 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 @@ src/main/resources - false + true src/main/resources-filtered @@ -56,6 +56,17 @@ + + + maven-resources-plugin + + false + + @ + + + + 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 @@ org.codehaus.groovy groovy-eclipse-compiler - 2.9.2-01 + @groovy-eclipse-compiler-version@ org.codehaus.groovy @@ -125,7 +125,7 @@ org.codehaus.groovy groovy-eclipse-batch - 2.4.3-01 + @groovy-eclipse-batch-version@ 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 @@ The grape component allows you to fetch, load and manage additional jars when CamelContext is running - 2.4.3-01 - 2.9.2-01 2.8.3 @@ -95,12 +93,12 @@ org.codehaus.groovy groovy-eclipse-batch - ${groovy-eclipse-batch.version} + ${groovy-eclipse-batch-version} org.codehaus.groovy groovy-eclipse-compiler - ${groovy-eclipse-compiler.version} + ${groovy-eclipse-compiler-version} org.codehaus.plexus @@ -115,7 +113,7 @@ org.codehaus.groovy groovy-eclipse-compiler - ${groovy-eclipse-compiler.version} + ${groovy-eclipse-compiler-version} true 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 @@ org.codehaus.groovy groovy-eclipse-compiler - 2.9.2-01 + ${groovy-eclipse-compiler-version} org.codehaus.groovy @@ -149,7 +149,7 @@ org.codehaus.groovy groovy-eclipse-batch - 2.4.3-01 + ${groovy-eclipse-batch-version} 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 @@ org.codehaus.groovy groovy-eclipse-compiler - 2.9.2-01 + ${groovy-eclipse-compiler-version} org.codehaus.groovy @@ -108,7 +108,7 @@ org.codehaus.groovy groovy-eclipse-batch - 2.4.3-01 + ${groovy-eclipse-batch-version} 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 @@ 17.0 0.30 2.3.25 + 3.0.0-01 + 2.5.2-01 1.15.0 0.9.0 20.0 diff --git a/pom.xml b/pom.xml index 1156795..2ef5ac6 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,18 @@ false + + + bintray + https://dl.bintray.com/groovy/maven + Bintray Repository + + false + + + true + +