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/01/04 05:56:15 UTC
[09/13] incubator-taverna-server git commit: Use maven-jaxb2-plugin
instead of jaxb2-maven-plugin
Use maven-jaxb2-plugin instead of jaxb2-maven-plugin
Corrected Javadoc package names
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/28e873a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/28e873a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/28e873a5
Branch: refs/heads/master
Commit: 28e873a5303fb4b0acf42cced1e127af6d399e9e
Parents: 2957fba
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Jan 4 05:43:30 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Jan 4 05:43:30 2018 +0000
----------------------------------------------------------------------
pom.xml | 31 +++++++++++++++++--------------
taverna-server-usagerecord/pom.xml | 24 +++++++++---------------
2 files changed, 26 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/28e873a5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1140e8c..2618505 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,19 +135,6 @@ executing.</description>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <versionRange>[1.3.1,)</versionRange>
- <goals>
- <goal>xjc</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
<groupId>org.jvnet.ws.wadl</groupId>
<artifactId>wadl-client-plugin</artifactId>
<versionRange>[1.1.6,)</versionRange>
@@ -253,6 +240,15 @@ executing.</description>
</lifecycleMappingMetadata>
</configuration>
</plugin>
+ <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>
</plugins>
</pluginManagement>
<plugins>
@@ -347,6 +343,13 @@ executing.</description>
<artifactId>joda-time</artifactId>
<version>2.3</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ <type>jar</type>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -390,7 +393,7 @@ executing.</description>
</group>
<group>
<title>Externally-Defined Document Formats</title>
- <packages>org.taverna.server.port_description:org.ogf.usage:org.ogf.usage.v1_0:org.w3._2000._09.xmldsig_</packages>
+ <packages>org.taverna.server.port_description:org.ogf.usage:org.apache.taverna.server.usagerecord.xml.urf:org.apache.taverna.server.usagerecord.xml.dsig</packages>
</group>
<group>
<title>Server Back End Factory Coupling to Command Line Executor</title>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/28e873a5/taverna-server-usagerecord/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-server-usagerecord/pom.xml b/taverna-server-usagerecord/pom.xml
index 6af20db..73b8570 100644
--- a/taverna-server-usagerecord/pom.xml
+++ b/taverna-server-usagerecord/pom.xml
@@ -28,21 +28,15 @@ limitations under the License.
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.3.1</version>
- <executions>
- <execution>
- <id>xsd2java</id>
- <goals>
- <goal>xjc</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/generated-sources/xjc</outputDirectory>
- <schemaDirectory>${basedir}/src/main/xsd</schemaDirectory>
- </configuration>
- </execution>
- </executions>
+ <groupId>org.jvnet.jaxb2.maven2</groupId>
+ <artifactId>maven-jaxb2-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>