activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject git commit: Upgrade jaxb version so that the project builds against Java 8.
Date Thu, 08 May 2014 00:57:15 GMT
Repository: activemq-apollo
Updated Branches:
  refs/heads/trunk 1e3eadff4 -> e29cfd509


Upgrade jaxb version so that the project builds against Java 8.

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

Branch: refs/heads/trunk
Commit: e29cfd509d8c5f871b140b1392797f7f39568cd1
Parents: 1e3eadf
Author: Hiram Chirino <hiram@hiramchirino.com>
Authored: Wed May 7 20:50:05 2014 -0400
Committer: Hiram Chirino <hiram@hiramchirino.com>
Committed: Wed May 7 20:50:05 2014 -0400

----------------------------------------------------------------------
 apollo-dto/pom.xml | 12 +++++++-----
 pom.xml            |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/e29cfd50/apollo-dto/pom.xml
----------------------------------------------------------------------
diff --git a/apollo-dto/pom.xml b/apollo-dto/pom.xml
index 2a76795..253f4e5 100644
--- a/apollo-dto/pom.xml
+++ b/apollo-dto/pom.xml
@@ -105,13 +105,12 @@
         <version>1.7</version>
         <executions>
           <execution>
-            <phase>generate-resources</phase>
+            <phase>process-classes</phase>
             <configuration>
               <tasks>
-                <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask">
-                  <classpath refid="maven.compile.classpath" />
-                </taskdef>
+                <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask"/>
                 <mkdir dir="${project.build.directory}/schema/org/apache/activemq/apollo/dto"
/>
+                <echo message="Generating XSD to: ${project.build.directory}/schema/org/apache/activemq/apollo/dto"/>
                 <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org/apache/activemq/apollo/dto"
includeantruntime="false">
                   <schema namespace="http://activemq.apache.org/schema/activemq/apollo"
file="apollo.xsd" />
                   <classpath refid="maven.compile.classpath" />
@@ -127,6 +126,9 @@
                 <replace token="&lt;/xs:sequence&gt;" value="&lt;/xs:choice&gt;&lt;/xs:choice&gt;"
dir="${basedir}/target/schema/org/apache/activemq/apollo/dto">
                   <include name="**/*.xsd" />
                 </replace>
+                <copy todir="${project.build.directory}/classes">
+                  <fileset dir="${project.build.directory}/schema"/>
+                </copy>
               </tasks>
             </configuration>
             <goals>
@@ -147,7 +149,7 @@
            </dependency>
            <dependency>
               <groupId>com.sun.xml.bind</groupId>
-              <artifactId>jaxb-xjc</artifactId>
+              <artifactId>jaxb-jxc</artifactId>
               <version>${jaxb-version}</version>
            </dependency>
         </dependencies>      

http://git-wip-us.apache.org/repos/asf/activemq-apollo/blob/e29cfd50/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5eeeb17..877a2fa 100755
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,9 @@
     <slf4j-version>1.6.1</slf4j-version>
     <mqtt-client-version>1.9</mqtt-client-version>
 
-    <jaxb-api-version>2.1</jaxb-api-version>
-    <jaxb-version>2.1.6</jaxb-version>
-    <xjc-version>2.1.10.1</xjc-version>
+    <jaxb-api-version>2.2.7</jaxb-api-version>
+    <jaxb-version>2.2.7</jaxb-version>
+    <xjc-version>2.2.7</xjc-version>
     <stax-api-version>1.0.1</stax-api-version>
     <stax-version>1.2.0</stax-version>
 


Mime
View raw message