You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/11/12 21:02:10 UTC
svn commit: r1846463 - in /webservices/axiom/branches/1.2.x: ./
axiom-jaxb/pom.xml pom.xml testing/
Author: veithen
Date: Mon Nov 12 21:02:10 2018
New Revision: 1846463
URL: http://svn.apache.org/viewvc?rev=1846463&view=rev
Log:
Merge r1844631 (with changes) to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/testing/ (props changed)
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 21:02:10 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843073,1843075,1843517,1845037,1845623,1846359,1846362
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843073,1843075,1843517,1844631,1845037,1845623,1846359,1846362
Modified: webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml?rev=1846463&r1=1846462&r2=1846463&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml Mon Nov 12 21:02:10 2018
@@ -75,18 +75,17 @@
<build>
<plugins>
<plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
<executions>
<execution>
- <phase>generate-test-sources</phase>
<goals>
- <goal>generate</goal>
+ <goal>generate-test-sources</goal>
</goals>
<configuration>
- <schemaDirectory>src/test/schemas</schemaDirectory>
- <addCompileSourceRoot>false</addCompileSourceRoot>
- <addTestCompileSourceRoot>true</addTestCompileSourceRoot>
+ <files>
+ <file>src/test/schemas/identity.xsd</file>
+ </files>
</configuration>
</execution>
</executions>
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1846463&r1=1846462&r2=1846463&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Mon Nov 12 21:02:10 2018
@@ -750,9 +750,9 @@
<version>3.2</version>
</plugin>
<plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.14.0</version>
+ <groupId>com.github.veithen.maven</groupId>
+ <artifactId>xjc-maven-plugin</artifactId>
+ <version>0.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 21:02:10 2018
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1846362
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411,1843073,1844631,1846362