Repository: struts Updated Branches: refs/heads/master 6f7fcaa33 -> 7872fa80f
WW-4570 Cleans up ASM and assemblies Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f03279fc Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f03279fc Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f03279fc Branch: refs/heads/master Commit: f03279fc1ae1524272b08a4d5e031f7304ea05c5 Parents: 6f7fcaa Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Wed Nov 23 11:43:05 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Wed Nov 23 11:43:05 2016 +0100 ---------------------------------------------------------------------- assembly/src/main/assembly/all.xml | 1 + assembly/src/main/assembly/lib.xml | 1 + assembly/src/main/assembly/min-lib.xml | 5 +---- pom.xml | 7 +++---- 4 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/f03279fc/assembly/src/main/assembly/all.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml index 8a05030..6d8fefb 100644 --- a/assembly/src/main/assembly/all.xml +++ b/assembly/src/main/assembly/all.xml @@ -31,6 +31,7 @@ </formats> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>lib</outputDirectory> <scope>runtime</scope> <excludes> http://git-wip-us.apache.org/repos/asf/struts/blob/f03279fc/assembly/src/main/assembly/lib.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/lib.xml b/assembly/src/main/assembly/lib.xml index 7aa42dd..e25418d 100644 --- a/assembly/src/main/assembly/lib.xml +++ b/assembly/src/main/assembly/lib.xml @@ -31,6 +31,7 @@ </formats> <dependencySets> <dependencySet> + <useProjectArtifact>false</useProjectArtifact> <outputDirectory>lib</outputDirectory> <scope>runtime</scope> <excludes> http://git-wip-us.apache.org/repos/asf/struts/blob/f03279fc/assembly/src/main/assembly/min-lib.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/assembly/min-lib.xml b/assembly/src/main/assembly/min-lib.xml index 10a18ff..f139dd0 100644 --- a/assembly/src/main/assembly/min-lib.xml +++ b/assembly/src/main/assembly/min-lib.xml @@ -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> http://git-wip-us.apache.org/repos/asf/struts/blob/f03279fc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 62f8db9..7e3ed60 100644 --- a/pom.xml +++ b/pom.xml @@ -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>
