camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [5/5] camel git commit: CAMEL-10141 Upgrade maven jar plugin for java 9 support
Date Tue, 14 Feb 2017 11:39:15 GMT
CAMEL-10141 Upgrade maven jar plugin for java 9 support


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bbfa4ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bbfa4ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bbfa4ad

Branch: refs/heads/master
Commit: 0bbfa4ada129f017df16779dd905519812188a00
Parents: af2893f
Author: jpoth <poth.john@gmail.com>
Authored: Thu Feb 9 12:34:11 2017 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Feb 14 11:54:24 2017 +0100

----------------------------------------------------------------------
 components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 3 ---
 .../main/java/org/apache/camel/maven/connector/ConnectorMojo.java | 2 +-
 connectors/examples/bar-connector/pom.xml                         | 3 ---
 connectors/examples/foo-connector/pom.xml                         | 3 ---
 connectors/examples/salesforce-upsert-contact-connector/pom.xml   | 3 ---
 connectors/examples/twitter-mention-connector/pom.xml             | 3 ---
 connectors/examples/wine-connector/pom.xml                        | 3 ---
 parent/pom.xml                                                    | 2 +-
 8 files changed, 2 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 2e4ee21..1108309 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -179,9 +179,6 @@
           <execution>
             <id>bundle-jar</id>
             <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
           </execution>
         </executions>
         <configuration>

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
----------------------------------------------------------------------
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
index b98e478..c5c6b2e 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.jar.AbstractJarMojo;
+import org.apache.maven.plugins.jar.AbstractJarMojo;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/bar-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/bar-connector/pom.xml b/connectors/examples/bar-connector/pom.xml
index 8c1fa74..7191e5c 100644
--- a/connectors/examples/bar-connector/pom.xml
+++ b/connectors/examples/bar-connector/pom.xml
@@ -149,9 +149,6 @@
         <executions>
           <execution>
             <id>connector</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/foo-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/foo-connector/pom.xml b/connectors/examples/foo-connector/pom.xml
index c2a443b..0143208 100644
--- a/connectors/examples/foo-connector/pom.xml
+++ b/connectors/examples/foo-connector/pom.xml
@@ -149,9 +149,6 @@
         <executions>
           <execution>
             <id>connector</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/salesforce-upsert-contact-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/salesforce-upsert-contact-connector/pom.xml b/connectors/examples/salesforce-upsert-contact-connector/pom.xml
index 26f2f33..d7f655c 100644
--- a/connectors/examples/salesforce-upsert-contact-connector/pom.xml
+++ b/connectors/examples/salesforce-upsert-contact-connector/pom.xml
@@ -80,9 +80,6 @@
         <executions>
           <execution>
             <id>generate-connector</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/twitter-mention-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/twitter-mention-connector/pom.xml b/connectors/examples/twitter-mention-connector/pom.xml
index f867183..dad717b 100644
--- a/connectors/examples/twitter-mention-connector/pom.xml
+++ b/connectors/examples/twitter-mention-connector/pom.xml
@@ -155,9 +155,6 @@
         <executions>
           <execution>
             <id>connector</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/connectors/examples/wine-connector/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/examples/wine-connector/pom.xml b/connectors/examples/wine-connector/pom.xml
index f23cc88..d4d787c 100644
--- a/connectors/examples/wine-connector/pom.xml
+++ b/connectors/examples/wine-connector/pom.xml
@@ -149,9 +149,6 @@
         <executions>
           <execution>
             <id>connector</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
           </execution>
         </executions>
       </plugin>

http://git-wip-us.apache.org/repos/asf/camel/blob/0bbfa4ad/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index ef5b992..7f713cb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -423,7 +423,7 @@
     <maven-checkstyle-version>6.17</maven-checkstyle-version>
     <maven-owasp-plugin-version>1.4.5</maven-owasp-plugin-version>
     <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
-    <maven-jar-plugin-version>2.6</maven-jar-plugin-version>
+    <maven-jar-plugin-version>3.0.2</maven-jar-plugin-version>
     <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version>
     <maven-jboss-as-maven-plugin-version>7.7.Final</maven-jboss-as-maven-plugin-version>
     <!-- plugin-plugin 3.5 does not work -->


Mime
View raw message