camel git commit: CAMEL-11166 make camel-package-maven-plugin wor...

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

camel git commit: CAMEL-11166 make camel-package-maven-plugin wor...

zregvart
Repository: camel
Updated Branches:
  refs/heads/master 2a67ab7e4 -> bee43cefb


CAMEL-11166 make camel-package-maven-plugin wor...

...k on Java 9

This changes the dependency to
`javax.annotation:javax.annotation-api:1.3` from
`javax.xml.ws:jaxws-api:2.2.11` to have a smaller footprint, and places
the dependency on the plugin instead of in the parent POM.


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

Branch: refs/heads/master
Commit: bee43cefb4255cc4d580bd270ecce2368d6d71f7
Parents: 2a67ab7
Author: Zoran Regvart <[hidden email]>
Authored: Thu Apr 20 11:04:01 2017 +0200
Committer: Zoran Regvart <[hidden email]>
Committed: Thu Apr 20 12:35:24 2017 +0200

----------------------------------------------------------------------
 parent/pom.xml                                   |  7 -------
 tooling/maven/camel-package-maven-plugin/pom.xml | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/bee43cef/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9b9013b..a8fef1c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5241,13 +5241,6 @@
             <plugin>
               <groupId>org.apache.camel</groupId>
               <artifactId>camel-package-maven-plugin</artifactId>
-              <dependencies>
-                <dependency>
-                  <groupId>javax.xml.ws</groupId>
-                  <artifactId>jaxws-api</artifactId>
-                  <version>2.2.11</version>
-                </dependency>
-              </dependencies>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/camel/blob/bee43cef/tooling/maven/camel-package-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 24bbc02..6dc7d14 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -164,4 +164,21 @@
       <artifactId>spi-annotations</artifactId>
     </dependency>
   </dependencies>
+
+  <profiles>
+    <profile>
+      <id>jigsaw</id>
+      <activation>
+        <jdk>[1.9,)</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+          <version>1.3</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
 </project>

Loading...