Author: simonetripodi
Date: Fri Dec 9 11:40:40 2011
New Revision: 1212338
URL: http://svn.apache.org/viewvc?rev=1212338&view=rev
Log:
[DIGESTER-160] provide an additional artifact with shaded dependencies
Modified:
commons/proper/digester/trunk/RELEASE-NOTES.txt
commons/proper/digester/trunk/pom.xml
commons/proper/digester/trunk/src/changes/changes.xml
Modified: commons/proper/digester/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/RELEASE-NOTES.txt?rev=1212338&r1=1212337&r2=1212338&view=diff
==============================================================================
--- commons/proper/digester/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/digester/trunk/RELEASE-NOTES.txt Fri Dec 9 11:40:40 2011
@@ -62,6 +62,7 @@ BUGS FIXED SINCE PREVIOUS RELEASE
IMPROVEMENTS OVER PREVIOUS RELEASE
===================================
+ * [DIGESTER-160] provide an additional artifact with shaded dependencies
* [DIGESTER-157] Improve Set(Nested)PropertiesRuleAlias performances in the
XML ruleset while binding rules
* [DIGESTER-156] Make (Nested|Set)PropertiesBuilder#addAlias() fluent.
* [DIGESTER-152] The DigesterLoader doesn't allow binding a default Locator
Modified: commons/proper/digester/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/pom.xml?rev=1212338&r1=1212337&r2=1212338&view=diff
==============================================================================
--- commons/proper/digester/trunk/pom.xml (original)
+++ commons/proper/digester/trunk/pom.xml Fri Dec 9 11:40:40 2011
@@ -236,6 +236,102 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>shaded-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+
<manifestLocation>${project.build.directory}/osgi-shaded</manifestLocation>
+ <instructions>
+
<Import-Package>javax.xml.parsers,javax.xml.validation,org.w3c.dom,org.xml.sax,org.xml.sax.helpers</Import-Package>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonatype.plugins</groupId>
+ <artifactId>jarjar-maven-plugin</artifactId>
+ <version>1.5</version>
+ <configuration>
+ <input>{classes}</input>
+ <output>${project.build.directory}/classes-shaded</output>
+ <overwrite>true</overwrite>
+ <skipManifest>true</skipManifest>
+ <includes>
+ <include>*:asm</include>
+ <include>*:cglib</include>
+ <include>*:commons-beanutils</include>
+ <include>*:commons-logging</include>
+ </includes>
+ <rules>
+ <rule>
+ <pattern>net.sf.cglib.*</pattern>
+ <result>org.apache.commons.digester3.internal.cglib.$@1</result>
+ </rule>
+ <rule>
+ <pattern>net.sf.cglib.**.*</pattern>
+
<result>org.apache.commons.digester3.internal.cglib.@1.$@2</result>
+ </rule>
+ <rule>
+ <pattern>org.objectweb.asm.*</pattern>
+ <result>org.apache.commons.digester3.internal.asm.$@1</result>
+ </rule>
+ <rule>
+ <pattern>org.objectweb.asm.**.*</pattern>
+ <result>org.apache.commons.digester3.internal.asm.@1.$@2</result>
+ </rule>
+ <keep>
+ <pattern>org.apache.commons.**</pattern>
+ </keep>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>jarjar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jarjar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.directory}/osgi-shaded/MANIFEST.MF</manifestFile>
+ </archive>
+
<classesDirectory>${project.build.directory}/classes-shaded</classesDirectory>
+ <classifier>with-deps</classifier>
+ <excludes>
+ <exclude>**/LICENSE</exclude>
+ <exclude>**/NOTICE</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
Modified: commons/proper/digester/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/changes/changes.xml?rev=1212338&r1=1212337&r2=1212338&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/changes/changes.xml (original)
+++ commons/proper/digester/trunk/src/changes/changes.xml Fri Dec 9 11:40:40
2011
@@ -23,6 +23,9 @@
</properties>
<body>
<release version="3.2" date="201?-??-??" description="Maintenance release.">
+ <action dev="simonetripodi" type="fix" issue="DIGESTER-160">
+ provide an additional artifact with shaded dependencies
+ </action>
<action dev="simonetripodi" type="fix" issue="DIGESTER-159">
*/object-param-rule is not managed in the XML rules
</action>
