Author: lukaszlenart
Date: Thu Mar 3 07:28:33 2011
New Revision: 1076547
URL: http://svn.apache.org/viewvc?rev=1076547&view=rev
Log:
Cleanups poms and removes shading
Modified:
struts/struts2/trunk/apps/mailreader/pom.xml
struts/struts2/trunk/apps/portlet/pom.xml
struts/struts2/trunk/apps/rest-showcase/pom.xml
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/bundles/demo/pom.xml
struts/struts2/trunk/plugins/codebehind/pom.xml
struts/struts2/trunk/plugins/convention/pom.xml
struts/struts2/trunk/plugins/dojo/pom.xml
struts/struts2/trunk/plugins/embeddedjsp/pom.xml
struts/struts2/trunk/plugins/jasperreports/pom.xml
struts/struts2/trunk/plugins/javatemplates/pom.xml
struts/struts2/trunk/plugins/json/pom.xml
struts/struts2/trunk/plugins/osgi/pom.xml
struts/struts2/trunk/plugins/oval/pom.xml
struts/struts2/trunk/plugins/portlet/pom.xml
struts/struts2/trunk/plugins/spring/pom.xml
struts/struts2/trunk/pom.xml
struts/struts2/trunk/xwork-core/pom.xml
Modified: struts/struts2/trunk/apps/mailreader/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/pom.xml (original)
+++ struts/struts2/trunk/apps/mailreader/pom.xml Thu Mar 3 07:28:33 2011
@@ -53,12 +53,6 @@
<version>1.3.5</version>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.7.ga</version>
- </dependency>
-
</dependencies>
<build>
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Thu Mar 3 07:28:33 2011
@@ -206,12 +206,6 @@
<version>2.1</version>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.7.ga</version>
- </dependency>
-
</dependencies>
<reporting>
Modified: struts/struts2/trunk/apps/rest-showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/apps/rest-showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/rest-showcase/pom.xml Thu Mar 3 07:28:33 2011
@@ -81,12 +81,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.7.ga</version>
- </dependency>
-
</dependencies>
<build>
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Thu Mar 3 07:28:33 2011
@@ -117,7 +117,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
@@ -125,13 +124,11 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
<exclusions>
<exclusion>
<groupId>velocity</groupId>
@@ -162,12 +159,10 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -211,12 +206,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- <version>3.7.ga</version>
- </dependency>
-
</dependencies>
<build>
Modified: struts/struts2/trunk/bundles/demo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/bundles/demo/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/bundles/demo/pom.xml (original)
+++ struts/struts2/trunk/bundles/demo/pom.xml Thu Mar 3 07:28:33 2011
@@ -22,13 +22,12 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>velocity</groupId>
@@ -40,7 +39,6 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8</version>
</dependency>
<dependency>
Modified: struts/struts2/trunk/plugins/codebehind/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/codebehind/pom.xml (original)
+++ struts/struts2/trunk/plugins/codebehind/pom.xml Thu Mar 3 07:28:33 2011
@@ -41,6 +41,10 @@
<dependencies>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>struts2-junit-plugin</artifactId>
<version>${project.version}</version>
Modified: struts/struts2/trunk/plugins/convention/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/convention/pom.xml (original)
+++ struts/struts2/trunk/plugins/convention/pom.xml Thu Mar 3 07:28:33 2011
@@ -47,6 +47,10 @@
</build>
<dependencies>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/dojo/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/dojo/pom.xml (original)
+++ struts/struts2/trunk/plugins/dojo/pom.xml Thu Mar 3 07:28:33 2011
@@ -224,6 +224,7 @@
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
+ <scope>compile</scope>
<optional>true</optional>
</dependency>
</dependencies>
Modified: struts/struts2/trunk/plugins/embeddedjsp/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/embeddedjsp/pom.xml (original)
+++ struts/struts2/trunk/plugins/embeddedjsp/pom.xml Thu Mar 3 07:28:33 2011
@@ -42,68 +42,61 @@
<dependencies>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>2.5.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.5.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>request</artifactId>
- <version>1.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
- <version>6.0.18</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
- <version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>1.1.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.18</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/pom.xml (original)
+++ struts/struts2/trunk/plugins/jasperreports/pom.xml Thu Mar 3 07:28:33 2011
@@ -41,6 +41,10 @@
<dependencies>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>3.1.2</version>
Modified: struts/struts2/trunk/plugins/javatemplates/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/pom.xml (original)
+++ struts/struts2/trunk/plugins/javatemplates/pom.xml Thu Mar 3 07:28:33 2011
@@ -24,22 +24,23 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymockclassextension</artifactId>
<scope>test</scope>
- <version>2.4</version>
</dependency>
</dependencies>
Modified: struts/struts2/trunk/plugins/json/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/json/pom.xml (original)
+++ struts/struts2/trunk/plugins/json/pom.xml Thu Mar 3 07:28:33 2011
@@ -70,6 +70,10 @@
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
Modified: struts/struts2/trunk/plugins/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/pom.xml (original)
+++ struts/struts2/trunk/plugins/osgi/pom.xml Thu Mar 3 07:28:33 2011
@@ -21,19 +21,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
- <version>1.3</version>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>velocity</groupId>
@@ -51,23 +49,25 @@
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>2.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
- <version>2.4</version>
</dependency>
</dependencies>
</project>
Modified: struts/struts2/trunk/plugins/oval/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/oval/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/oval/pom.xml (original)
+++ struts/struts2/trunk/plugins/oval/pom.xml Thu Mar 3 07:28:33 2011
@@ -52,6 +52,11 @@
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<scope>test</scope>
Modified: struts/struts2/trunk/plugins/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/portlet/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/portlet/pom.xml (original)
+++ struts/struts2/trunk/plugins/portlet/pom.xml Thu Mar 3 07:28:33 2011
@@ -59,6 +59,11 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
<!-- Velocity -->
<dependency>
<groupId>org.apache.velocity</groupId>
Modified: struts/struts2/trunk/plugins/spring/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/spring/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/spring/pom.xml (original)
+++ struts/struts2/trunk/plugins/spring/pom.xml Thu Mar 3 07:28:33 2011
@@ -72,9 +72,13 @@
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jci-fam</artifactId>
- <version>1.0</version>
<optional>true</optional>
</dependency>
@@ -82,13 +86,11 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
- <version>3.8.2</version>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
Modified: struts/struts2/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Thu Mar 3 07:28:33 2011
@@ -37,7 +37,7 @@
<issueManagement>
<system>JIRA</system>
- <url>http://issues.apache.org/struts/</url>
+ <url>https://issues.apache.org/jira/browse/WW</url>
</issueManagement>
<ciManagement/>
@@ -364,8 +364,6 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts-annotations</artifactId>
<version>1.0.5</version>
- <scope>compile</scope>
- <optional>true</optional>
</dependency>
<dependency>
@@ -374,6 +372,12 @@
<version>2.3.16</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+
<!-- Velocity -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -386,7 +390,6 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.3</version>
- <optional>true</optional>
<exclusions>
<exclusion>
<groupId>struts</groupId>
@@ -447,12 +450,53 @@
</dependency>
<dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ <version>6.0.18</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>request</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>juli</artifactId>
+ <version>6.0.18</version>
+ </dependency>
+
<!-- Commons -->
<dependency>
<groupId>commons-logging</groupId>
@@ -475,10 +519,21 @@
<version>2.5</version>
</dependency>
<dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
<groupId>commons-el</groupId>
<artifactId>commons-el</artifactId>
<version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ <optional>true</optional>
+ </dependency>
<!-- Mocks for unit testing (by Spring) -->
<dependency>
Modified: struts/struts2/trunk/xwork-core/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/pom.xml?rev=1076547&r1=1076546&r2=1076547&view=diff
==============================================================================
--- struts/struts2/trunk/xwork-core/pom.xml (original)
+++ struts/struts2/trunk/xwork-core/pom.xml Thu Mar 3 07:28:33 2011
@@ -150,88 +150,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <shadedArtifactId>xwork-core</shadedArtifactId>
- <artifactSet>
- <excludes>
- <exclude>junit:junit</exclude>
-
<exclude>commons-logging:commons-logging</exclude>
- <exclude>opensymphony:ognl</exclude>
- <exclude>ognl:ognl</exclude>
- <exclude>javassist:javassist</exclude>
- <exclude>jboss:javassist</exclude>
-
<exclude>org.springframework:spring-core</exclude>
-
<exclude>org.springframework:spring-aop</exclude>
-
<exclude>org.springframework:spring-aspects</exclude>
-
<exclude>org.springframework:spring-beans</exclude>
-
<exclude>org.springframework:spring-context</exclude>
-
<exclude>org.springframework:spring-context-support</exclude>
-
<exclude>org.springframework:spring-web</exclude>
-
<exclude>org.springframework:spring-test</exclude>
-
<exclude>mockobjects:mockobjects-core</exclude>
- <exclude>org.easymock:easymock</exclude>
- <exclude>aopalliance:aopalliance</exclude>
-
<exclude>aspectwerkz:aspectwerkz-core</exclude>
- <exclude>org.aspectj:aspectjrt</exclude>
-
<exclude>org.aspectj:aspectjweaver</exclude>
- <exclude>cglib:cglib</exclude>
- <exclude>cglib:cglib-nodep</exclude>
- <exclude>asm:asm-util</exclude>
- <exclude>org.testng:testng:jdk15</exclude>
- </excludes>
- </artifactSet>
- <filters>
- <filter>
-
<artifact>commons-lang:commons-lang</artifact>
- <includes>
-
<include>org/apache/commons/lang/StringUtils.class</include>
-
<include>org/apache/commons/lang/math/NumberUtils.class</include>
-
<include>org/apache/commons/lang/ObjectUtils*.class</include>
-
<include>org/apache/commons/lang/StringEscapeUtils.class</include>
-
<include>org/apache/commons/lang/exception/NestableRuntimeException.class</include>
-
<include>org/apache/commons/lang/exception/Nestable.class</include>
-
<include>org/apache/commons/lang/Entities*class</include>
-
<include>org/apache/commons/lang/UnhandledException.class</include>
-
<include>org/apache/commons/lang/IntHashMap*class</include>
- </includes>
- <artifact>commons-io:commons-io</artifact>
- <includes>
-
<include>org/apache/commons/io/FileUtils.class</include>
- </includes>
- </filter>
- </filters>
- <relocations>
- <relocation>
- <pattern>org.objectweb.asm</pattern>
-
<shadedPattern>org.objectweb.asm.xwork</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons.lang</pattern>
-
<shadedPattern>org.apache.commons.lang.xwork</shadedPattern>
- </relocation>
- <relocation>
- <pattern>org.apache.commons.io</pattern>
-
<shadedPattern>org.apache.commons.io.xwork</shadedPattern>
- </relocation>
- </relocations>
- <transformers>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer"
/>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
@@ -262,7 +180,6 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -276,12 +193,10 @@
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm-commons</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
