[TAVERNA-1041] common jaxb dependencies by parent

.. as they are needed by basically all modules
from Java 9 (no longer optional)


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/3f21c588
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/3f21c588
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/3f21c588

Branch: refs/heads/master
Commit: 3f21c5885300ebb381ab2f4c3ac1c48ef22d6e51
Parents: 9fd28a4
Author: Stian Soiland-Reyes <[email protected]>
Authored: Wed Apr 18 12:07:21 2018 +0100
Committer: Stian Soiland-Reyes <[email protected]>
Committed: Wed Apr 18 12:07:21 2018 +0100

----------------------------------------------------------------------
 taverna-robundle/pom.xml          | 14 --------------
 taverna-scufl2-scufl/pom.xml      |  7 -------
 taverna-scufl2-t2flow/pom.xml     |  6 ------
 taverna-scufl2-ucfpackage/pom.xml |  8 --------
 taverna-scufl2-wfbundle/pom.xml   | 17 ++---------------
 5 files changed, 2 insertions(+), 50 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/3f21c588/taverna-robundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-robundle/pom.xml b/taverna-robundle/pom.xml
index 6e51324..628f620 100644
--- a/taverna-robundle/pom.xml
+++ b/taverna-robundle/pom.xml
@@ -61,20 +61,6 @@
                        <version>${jena.version}</version>
                </dependency>
 
-
-
-<!--
-               <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-impl</artifactId>
-                       <version>2.2.7</version>
-               </dependency>
--->
-               <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-osgi</artifactId>
-                       <version>${jaxb.version}</version>
-               </dependency>
 <!-- for UUIDv5 SHA named
                <dependency>
                        <groupId>com.fasterxml.uuid</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/3f21c588/taverna-scufl2-scufl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/pom.xml b/taverna-scufl2-scufl/pom.xml
index ac633ed..3a976e1 100644
--- a/taverna-scufl2-scufl/pom.xml
+++ b/taverna-scufl2-scufl/pom.xml
@@ -70,13 +70,6 @@
                        <version>${project.version}</version>
                </dependency>
                <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-osgi</artifactId>
-      <version>${jaxb.version}</version>
-                       <type>jar</type>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
                         <version>${commons.io.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/3f21c588/taverna-scufl2-t2flow/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/pom.xml b/taverna-scufl2-t2flow/pom.xml
index 8f0a1d4..3f005c5 100644
--- a/taverna-scufl2-t2flow/pom.xml
+++ b/taverna-scufl2-t2flow/pom.xml
@@ -134,12 +134,6 @@
                </dependency>
 
                <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-osgi</artifactId>
-      <version>${jaxb.version}</version>
-                       <optional>true</optional>
-               </dependency>
-               <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
       <version>${commons.io.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/3f21c588/taverna-scufl2-ucfpackage/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/pom.xml 
b/taverna-scufl2-ucfpackage/pom.xml
index 6d590cf..8c426d4 100644
--- a/taverna-scufl2-ucfpackage/pom.xml
+++ b/taverna-scufl2-ucfpackage/pom.xml
@@ -28,14 +28,6 @@
        <description>Adobe UCF compatible Package API, making a structured ZIP 
file with manifest</description>
        <dependencies>
                <dependency>
-                       <!-- Avoid TAVERNA-920 namespace issue -->
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-osgi</artifactId>
-                       <version>${jaxb.version}</version>
-                       <optional>true</optional>
-               </dependency>
-       
-               <dependency>
                        <groupId>commons-io</groupId>
                        <artifactId>commons-io</artifactId>
       <version>${commons.io.version}</version>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/3f21c588/taverna-scufl2-wfbundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/pom.xml b/taverna-scufl2-wfbundle/pom.xml
index 131d056..e6fe2ff 100644
--- a/taverna-scufl2-wfbundle/pom.xml
+++ b/taverna-scufl2-wfbundle/pom.xml
@@ -73,25 +73,12 @@
                        <version>${sesame.version}</version>
                        <scope>test</scope>
                </dependency>
-    <!--
-               <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-impl</artifactId>
-                        <version>${jaxb.version}</version>
-                       <optional>true</optional>
-               </dependency>
-    -->
-               <dependency>
-                       <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-osgi</artifactId>
-      <version>${jaxb.version}</version>
-                       <optional>true</optional>
-               </dependency>
+
                <dependency>
                        <groupId>jaxen</groupId>
                        <artifactId>jaxen</artifactId>
                         <version>${jaxen.version}</version>
                        <scope>test</scope>
                </dependency>
-       </dependencies>
+       </dependencies> 
 </project>

Reply via email to