Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4570 Cleans up ASM and assemblies

Browse Source
This commit is contained in:
Lukasz Lenart
2016-11-23 11:43:05 +01:00
parent 6f7fcaa338
commit f03279fc1a
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assembly/src/main/assembly/all.xml
+1
View File
@@ -31,6 +31,7 @@
</formats>
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
assembly/src/main/assembly/lib.xml
+1
View File
@@ -31,6 +31,7 @@
</formats>
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
<excludes>
assembly/src/main/assembly/min-lib.xml
+1 -4
View File
@@ -31,7 +31,7 @@
</formats>
<dependencySets>
<dependencySet>
<useProjectArtifact>true</useProjectArtifact>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -40,9 +40,6 @@
<include>org.apache.commons:commons-lang3</include>
<include>org.apache.logging.log4j:log4j-api</include>
<include>ognl:ognl</include>
<include>org.ow2.asm:asm</include>
<include>org.ow2.asm:asm-tree</include>
<include>org.ow2.asm:asm-commons</include>
<include>org.javassist:javassist</include>
<include>commons-fileupload:commons-fileupload</include>
<include>commons-io:commons-io</include>
pom.xml
+3 -4
View File
@@ -85,8 +85,7 @@
<currentVersion>${project.version}</currentVersion>
<struts2.springPlatformVersion>4.1.6.RELEASE</struts2.springPlatformVersion>
<ognl.version>3.1.12</ognl.version>
<asm.version>3.3</asm.version>
<asm5.version>5.1</asm5.version>
<asm.version>5.1</asm.version>
<tiles.version>3.0.7</tiles.version>
<tiles-request.version>1.0.6</tiles-request.version>
<log4j2.version>2.7</log4j2.version>
@@ -547,12 +546,12 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>${asm5.version}</version>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>${asm5.version}</version>
<version>${asm.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>