Author: veithen
Date: Sat May 4 13:22:12 2019
New Revision: 1858603
URL: http://svn.apache.org/viewvc?rev=1858603&view=rev
Log:
Merge r1795801 to the 1.2 branch. Should fix AXIOM-424.
Removed:
webservices/axiom/branches/1.2.x/buildutils/shade-osgi/
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/aspects/core-aspects/pom.xml
webservices/axiom/branches/1.2.x/aspects/dom-aspects/pom.xml
webservices/axiom/branches/1.2.x/aspects/fom-aspects/pom.xml
webservices/axiom/branches/1.2.x/aspects/om-aspects/pom.xml
webservices/axiom/branches/1.2.x/aspects/pom.xml
webservices/axiom/branches/1.2.x/aspects/shared-aspects/pom.xml
webservices/axiom/branches/1.2.x/axiom-api/pom.xml
webservices/axiom/branches/1.2.x/axiom-c14n/pom.xml
webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml
webservices/axiom/branches/1.2.x/buildutils/pom.xml
webservices/axiom/branches/1.2.x/components/xml-utils/pom.xml
webservices/axiom/branches/1.2.x/implementations/axiom-dom/pom.xml
webservices/axiom/branches/1.2.x/implementations/axiom-impl/pom.xml
webservices/axiom/branches/1.2.x/implementations/fom-impl/ (props changed)
webservices/axiom/branches/1.2.x/implementations/fom-impl/pom.xml
webservices/axiom/branches/1.2.x/implementations/pom.xml
webservices/axiom/branches/1.2.x/pom.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 4 13:22:12 2019
@@ -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,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1795105,1796489,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1820347,1821701,1821707,1826041,1831211,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727,1858598
+/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,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1795105,1795801,1796489,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1820347,1821701,1821707,1826041,1831211,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727,1858598
Modified: webservices/axiom/branches/1.2.x/aspects/core-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/core-aspects/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/core-aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/core-aspects/pom.xml Sat May 4
13:22:12 2019
@@ -27,7 +27,6 @@
</parent>
<artifactId>core-aspects</artifactId>
- <packaging>bundle</packaging>
<name>Core Aspects</name>
<url>http://ws.apache.org/axiom/</url>
Modified: webservices/axiom/branches/1.2.x/aspects/dom-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/dom-aspects/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/dom-aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/dom-aspects/pom.xml Sat May 4
13:22:12 2019
@@ -27,7 +27,6 @@
</parent>
<artifactId>dom-aspects</artifactId>
- <packaging>bundle</packaging>
<name>DOM Aspects</name>
<url>http://ws.apache.org/axiom/</url>
Modified: webservices/axiom/branches/1.2.x/aspects/fom-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/fom-aspects/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/fom-aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/fom-aspects/pom.xml Sat May 4
13:22:12 2019
@@ -27,7 +27,6 @@
</parent>
<artifactId>fom-aspects</artifactId>
- <packaging>bundle</packaging>
<name>FOM Aspects</name>
<url>http://ws.apache.org/axiom/</url>
Modified: webservices/axiom/branches/1.2.x/aspects/om-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/om-aspects/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/om-aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/om-aspects/pom.xml Sat May 4
13:22:12 2019
@@ -27,10 +27,6 @@
</parent>
<artifactId>om-aspects</artifactId>
- <!-- Although om-aspects will never be used as a bundle itself, we still
need the OSGi metadata
- so that we can generate a correct manifest when the classes are
included in axiom-impl and
- axiom-dom by maven-shade-plugin. -->
- <packaging>bundle</packaging>
<name>OM Aspects</name>
<description>Contains aspects and implementation classes shared by LLOM
and DOOM.</description>
Modified: webservices/axiom/branches/1.2.x/aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/pom.xml Sat May 4 13:22:12 2019
@@ -66,24 +66,6 @@
</executions>
</plugin>
<plugin>
- <!-- Note: Aspect libraries are not intended to be used as an
OSGi bundle.
- We generate OSGi metadata only for the shading process in
the implementations. -->
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>*;-noimport:=true</Export-Package>
- <Import-Package>
- <!-- aspectjrt is not an OSGi bundle; we don't
need to generate imports because
- the implementations include these classes
into the final JARs -->
- !org.aspectj.*,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
Modified: webservices/axiom/branches/1.2.x/aspects/shared-aspects/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/aspects/shared-aspects/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/aspects/shared-aspects/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/aspects/shared-aspects/pom.xml Sat May 4
13:22:12 2019
@@ -27,7 +27,6 @@
</parent>
<artifactId>shared-aspects</artifactId>
- <packaging>bundle</packaging>
<name>Shared Aspects</name>
<description>
Modified: webservices/axiom/branches/1.2.x/axiom-api/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-api/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/axiom-api/pom.xml Sat May 4 13:22:12 2019
@@ -225,10 +225,14 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>*;-noimport:=true</Export-Package>
+ <Private-Package />
+ <Export-Package>
+
org.apache.axiom.*;-split-package:=merge-first;-noimport:=true
+ </Export-Package>
<Import-Package>
org.jaxen.*;resolution:=optional,
org.codehaus.stax2;resolution:=optional,
+
org.apache.james.mime4j.*;version="${range;[==,=+)}",
*
</Import-Package>
<Bundle-Activator>org.apache.axiom.locator.Activator</Bundle-Activator>
Modified: webservices/axiom/branches/1.2.x/axiom-c14n/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-c14n/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-c14n/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/axiom-c14n/pom.xml Sat May 4 13:22:12 2019
@@ -60,7 +60,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>*;-noimport:=true</Export-Package>
+
<Export-Package>org.apache.axiom.c14n.*;-noimport:=true</Export-Package>
</instructions>
</configuration>
</plugin>
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=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/axiom-jaxb/pom.xml Sat May 4 13:22:12 2019
@@ -96,7 +96,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>*;-noimport:=true</Export-Package>
+ <Export-Package>
+ org.apache.axiom.om.ds.jaxb;-noimport:=true,
+ org.apache.axiom.om.utl.jaxb;-noimport:=true
+ </Export-Package>
<Import-Package>javax.xml.bind;version="[2.1,3)",javax.xml.bind.attachment;version="[2.1,3)",*</Import-Package>
</instructions>
</configuration>
Modified: webservices/axiom/branches/1.2.x/buildutils/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/buildutils/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/buildutils/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/buildutils/pom.xml Sat May 4 13:22:12 2019
@@ -36,7 +36,6 @@
<module>buildutils-maven-plugin</module>
<module>jar-resource-bundle</module>
<module>shade-axiom-xml</module>
- <module>shade-osgi</module>
<module>no-package-cycles-enforcer-rule</module>
</modules>
Modified: webservices/axiom/branches/1.2.x/components/xml-utils/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/components/xml-utils/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/components/xml-utils/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/components/xml-utils/pom.xml Sat May 4
13:22:12 2019
@@ -27,7 +27,6 @@
</parent>
<artifactId>xml-utils</artifactId>
- <packaging>bundle</packaging>
<url>http://ws.apache.org/axiom/</url>
Modified: webservices/axiom/branches/1.2.x/implementations/axiom-dom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/implementations/axiom-dom/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/implementations/axiom-dom/pom.xml
(original)
+++ webservices/axiom/branches/1.2.x/implementations/axiom-dom/pom.xml Sat May
4 13:22:12 2019
@@ -122,15 +122,25 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>!org.aspectj.*,*</Import-Package>
+ <Private-Package>
+ org.apache.axiom.core.*,
+ !org.apache.axiom.om.impl,
+ org.apache.axiom.om.impl.*,
+ org.apache.axiom.soap.impl.*,
+ org.apache.axiom.dom.*,
+ org.apache.axiom.shared.*,
+ org.apache.axiom.util.xml.*,
+ org.aspectj.lang,
+ org.aspectj.lang.annotation
+ </Private-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: webservices/axiom/branches/1.2.x/implementations/axiom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/implementations/axiom-impl/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/implementations/axiom-impl/pom.xml
(original)
+++ webservices/axiom/branches/1.2.x/implementations/axiom-impl/pom.xml Sat May
4 13:22:12 2019
@@ -106,15 +106,24 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>!org.aspectj.*,*</Import-Package>
+ <Private-Package>
+ org.apache.axiom.core.*,
+ !org.apache.axiom.om.impl,
+ org.apache.axiom.om.impl.*,
+ org.apache.axiom.soap.impl.*,
+ org.apache.axiom.shared.*,
+ org.apache.axiom.util.xml.*,
+ org.aspectj.lang,
+ org.aspectj.lang.annotation
+ </Private-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Propchange: webservices/axiom/branches/1.2.x/implementations/fom-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 4 13:22:12 2019
@@ -1,3 +1,3 @@
/abdera/java/branches/axiom-upgrade/parser:1371877-1374810
/webservices/axiom/branches/maven-site-plugin-3.5/implementations/fom-impl:1731125-1732708
-/webservices/axiom/trunk/implementations/fom-impl:1727755,1731378,1732710
+/webservices/axiom/trunk/implementations/fom-impl:1727755,1731378,1732710,1795801
Modified: webservices/axiom/branches/1.2.x/implementations/fom-impl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/implementations/fom-impl/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/implementations/fom-impl/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/implementations/fom-impl/pom.xml Sat May
4 13:22:12 2019
@@ -134,15 +134,24 @@
</configuration>
</plugin>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>!org.aspectj.*,*</Import-Package>
+ <Private-Package>
+ org.apache.axiom.core.*,
+ org.apache.axiom.om.impl.*,
+ org.apache.axiom.soap.impl.*,
+ org.apache.axiom.shared.*,
+ org.apache.axiom.fom.*,
+ org.apache.axiom.util.xml.*,
+ org.aspectj.lang,
+ org.aspectj.lang.annotation
+ </Private-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>com.github.veithen.alta</groupId>
Modified: webservices/axiom/branches/1.2.x/implementations/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/implementations/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/implementations/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/implementations/pom.xml Sat May 4
13:22:12 2019
@@ -78,41 +78,10 @@
<configuration>
<instructions>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
- <Import-Package>!org.aspectj.*,*</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <artifactSet>
- <includes>
- <include>${project.groupId}:*-aspects</include>
- <include>${project.groupId}:xml-utils</include>
- <include>org.aspectj:aspectjrt</include>
- </includes>
- </artifactSet>
- <transformers>
- <transformer
implementation="org.apache.axiom.buildutils.shade.osgi.OSGiManifestResourceTransformer"
/>
- </transformers>
- <!-- Avoid dependency reduced POMs because the artifacts
are used as dependencies by other modules
- in the project and this causes recurring problems.
E.g. in Maven 3.3, downstream modules in the
- same build still see the original dependencies of the
unshaded JAR. Instead of producing
- dependency reduced POMs, we simply declare the
relevant dependencies as optional. -->
-
<createDependencyReducedPom>false</createDependencyReducedPom>
- <!-- This removes most of the AspectJ runtime classes from
the shaded JAR -->
- <minimizeJar>true</minimizeJar>
- <createSourcesJar>true</createSourcesJar>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shade-osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1858603&r1=1858602&r2=1858603&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Sat May 4 13:22:12 2019
@@ -561,10 +561,8 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <!-- Note: don't use 2.5.4 because of FELIX-4882 -->
- <version>2.5.3</version>
+ <version>3.3.0</version>
<configuration>
- <excludeDependencies>true</excludeDependencies>
<instructions>
<_removeheaders>
<!-- Remove these headers to make the output
deterministic -->
@@ -572,8 +570,8 @@
<!-- There are not OSGi headers and shouldn't
appear in the manifest -->
Private-Package,Include-Resource
</_removeheaders>
- <!-- These two are for compatibility with
maven-bundle-plugin 1.4.0 -->
<_nodefaultversion>true</_nodefaultversion>
+
<_consumer-policy>${range;[--,++)}</_consumer-policy>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
