TAVERNA-1041: explicit jaxb dependencies for Java 9
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 @@
<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>
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 @@
<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 @@
<packagename>org.apache.taverna.baclava</packagename>
</xsdOption>
</xsdOptions>
- </configuration>
+ </configuration>
</execution>
</executions>
</plugin>
