You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2018/04/18 11:10:48 UTC

[02/10] incubator-taverna-language git commit: TAVERNA-1041: explicit jaxb dependencies for Java 9

TAVERNA-1041: explicit jaxb dependencies for Java 9


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/a6bb396f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/a6bb396f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/a6bb396f

Branch: refs/heads/master
Commit: a6bb396f441159a6337cba8e5103d80539f17a40
Parents: 7335510
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Apr 18 09:40:23 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Apr 18 11:10:25 2018 +0100

----------------------------------------------------------------------
 pom.xml                          | 30 +++++++++++++++++++++---------
 taverna-baclava-language/pom.xml | 30 +++++-------------------------
 2 files changed, 26 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/a6bb396f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9c67a5d..8a48535 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,14 +133,11 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
-					<groupId>org.jvnet.jaxb2.maven2</groupId>
-					<artifactId>maven-jaxb2-plugin</artifactId>
-					<configuration>
-						<enableIntrospection>true</enableIntrospection>
-						<specVersion>2.2</specVersion>
-						<schemaDirectory>src/main/xsd</schemaDirectory>
-					</configuration>
-				</plugin>
+				<!-- replaces maven-jaxb2-plugin -->
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-xjc-plugin</artifactId>
+					<version>3.2.1</version>
+				</plugin>				
 			</plugins>
 		</pluginManagement>
 	</build>
@@ -201,7 +198,6 @@
 				<artifactId>jaxb-impl</artifactId>
 				<version>${jaxb.version}</version>
 				<type>jar</type>
-				<optional>true</optional>
 			</dependency>
 			<dependency>
 				<groupId>jaxen</groupId>
@@ -243,6 +239,22 @@ additional dependencies to be a happy OSGi bundle -->
       <version>${dexx.collection.version}</version>
     </dependency>
 
+	<!-- Needed for Java 9+ -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-osgi</artifactId>
+      <version>${jaxb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>${activation.version}</version>
+    </dependency>
 </dependencies>
 <profiles>
 <profile>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/a6bb396f/taverna-baclava-language/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/pom.xml b/taverna-baclava-language/pom.xml
index 7ac5122..67c4044 100644
--- a/taverna-baclava-language/pom.xml
+++ b/taverna-baclava-language/pom.xml
@@ -31,35 +31,15 @@ under the License.
   <description>Support for reading and writing Baclava files</description>
   <build>
 		<plugins>
-    <!--
-      <plugin>
-          <groupId>org.jvnet.jaxb2.maven2</groupId>
-          <artifactId>maven-jaxb2-plugin</artifactId>
-          <executions>
-            <execution>
-                <goals>
-                    <goal>generate</goal>
-                </goals>
-            </execution>
-          </executions>
-          <configuration>
-            <schemaDirectory>src/main/resources/xsd/</schemaDirectory>
-					<generatePackage>org.apache.taverna.baclava</generatePackage>
-          </configuration>
-        </plugin>
-    -->
         <plugin>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-xjc-plugin</artifactId>
-          <version>3.2.1</version>
-          <configuration>
-          </configuration>
           <executions>
             <execution>
-                <goals>
-                    <goal>xsdtojava</goal>
-                </goals>
-                <configuration>
+              <goals>
+                <goal>xsdtojava</goal>
+              </goals>
+              <configuration>
                 <xsdOptions>
                   <xsdOption>
                     <xsd>src/main/resources/xsd/xscufl.xsd</xsd>
@@ -71,7 +51,7 @@ under the License.
                     <packagename>org.apache.taverna.baclava</packagename>
                   </xsdOption>
                 </xsdOptions>
-                </configuration>
+              </configuration>
             </execution>
           </executions>          
         </plugin>