From 8c9346718bf3c6c53f41b8a4916810867e7e1a81 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Fri, 10 Jul 2009 02:12:50 +0000
Subject: [PATCH] POM maintenance/development - initial jarjar support in maven
 build for ASM

---
 build-spring-framework/pom.xml          | 100 ++++++++++++++++++++++++
 org.springframework.aop/pom.xml         |  12 +--
 org.springframework.asm/pom.xml         |  71 +++++++++++++----
 org.springframework.context/pom.xml     |  12 ++-
 org.springframework.core/pom.xml        |   6 +-
 org.springframework.test/pom.xml        |   2 +-
 org.springframework.web.portlet/pom.xml |  12 ++-
 org.springframework.web.servlet/pom.xml |  12 +--
 8 files changed, 190 insertions(+), 37 deletions(-)
 create mode 100644 build-spring-framework/pom.xml

diff --git a/build-spring-framework/pom.xml b/build-spring-framework/pom.xml
new file mode 100644
index 0000000000..a304529a60
--- /dev/null
+++ b/build-spring-framework/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
+  <!--
+    
+    This POM cannot be used to build Spring; it is a work in progress and should only be used as
+    part of a Maven repository upload bundle using artifacts created by the spring build system. 
+    
+  -->
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework</groupId>
+  <artifactId>spring</artifactId>
+  <packaging>pom</packaging>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <name>Spring Framework</name>
+  <description>Spring is a layered Java/J2EE application platform, based on code published in Expert
+  One-on-One J2EE Design and Development by Rod Johnson (Wrox, 2002). </description>
+  <url>http://www.springframework.org</url>
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://jira.springframework.org/browse/SPR</url>
+  </issueManagement>
+  <ciManagement>
+    <system>Bamboo</system>
+    <url>https://build.springframework.org/browse/SPR</url>
+  </ciManagement>
+  <inceptionYear>2003</inceptionYear>
+  <organization>
+    <name>SpringSource</name>
+    <url>http://www.springsource.com</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://fisheye.springframework.org/browse/spring-framework</url>
+    <connection>scm:svn:https://src.springframework.org/svn/spring-framework/trunk</connection>
+    <developerConnection>scm:svn:https://src.springframework.org/svn/spring-framework/trunk</developerConnection>
+  </scm>
+  <mailingLists>
+    <mailingList>
+      <name>        Spring Forum
+      </name>
+      <post>http://forum.springframework.org</post>
+      <archive>http://forum.springframework.org</archive>
+    </mailingList>
+  </mailingLists>
+  
+  <modules>
+    <module>../org.springframework.spring-parent</module>
+    <module>../org.springframework.instrument</module>
+    <module>../org.springframework.instrument.classloading</module>
+    <module>../org.springframework.asm</module>
+    <module>../org.springframework.core</module>
+    <module>../org.springframework.expression</module>
+    <module>../org.springframework.beans</module>
+    <module>../org.springframework.aop</module>
+    <module>../org.springframework.context</module>
+    <module>../org.springframework.transaction</module>
+    <module>../org.springframework.oxm</module>
+    <module>../org.springframework.jms</module>
+    <module>../org.springframework.aspects</module>
+    <module>../org.springframework.jdbc</module>
+    <module>../org.springframework.web</module>
+    <module>../org.springframework.orm</module>
+    <module>../org.springframework.context.support</module>
+    <module>../org.springframework.web.servlet</module>
+    <module>../org.springframework.web.portlet</module>
+    <module>../org.springframework.test</module>
+  </modules>
+
+  <profiles>
+    <profile>
+      <id>staging</id>
+      <distributionManagement>
+        <site>
+          <id>staging</id>
+          <url>file:///${user.dir}/target/staging</url>
+        </site>
+        <repository>
+          <id>staging</id>
+          <url>file:///${user.dir}/target/staging</url>
+        </repository>
+        <snapshotRepository>
+          <id>staging</id>
+          <url>file:///${user.dir}/target/staging</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+  </profiles>
+
+
+</project>
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index a38196af72..237e8beb6e 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -49,6 +49,12 @@
       <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
@@ -75,11 +81,5 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.objectweb.asm</groupId>
-      <artifactId>org.springframework.asm</artifactId>
-      <version>2.2.3</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 880a362e96..36d4412917 100644
--- a/org.springframework.asm/pom.xml
+++ b/org.springframework.asm/pom.xml
@@ -1,15 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.springframework</groupId>
-  <artifactId>spring-asm</artifactId>
-  <packaging>jar</packaging>
-  <version>3.0.0.BUILD-SNAPSHOT</version>
-  <parent>
-    <groupId>org.springframework</groupId>
-    <artifactId>spring-parent</artifactId>
-    <relativePath>../org.springframework.spring-parent</relativePath>
-    <version>3.0.0.BUILD-SNAPSHOT</version>
-  </parent>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.springframework</groupId>
+  <artifactId>spring-asm</artifactId>
+  <packaging>jar</packaging>
+  <version>3.0.0.BUILD-SNAPSHOT</version>
+  <parent>
+    <groupId>org.springframework</groupId>
+    <artifactId>spring-parent</artifactId>
+    <relativePath>../org.springframework.spring-parent</relativePath>
+    <version>3.0.0.BUILD-SNAPSHOT</version>
+  </parent>
+
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+	<executions>
+	  <execution>
+            <id>jarjar</id>	    
+	    <phase>process-classes</phase>
+	    <goals>
+	      <goal>run</goal> 
+	    </goals>            
+	    <configuration>
+	      <tasks>
+	        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="maven.plugin.classpath" /> 
+		<jarjar jarfile="${project.build.directory}${file.separator}${project.build.finalName}-jarjar.jar">
+ 		  <zipfileset src="${project.build.directory}/jarjar-staging/com.springsource.org.objectweb.asm.jar"/>
+		  <zipfileset src="${project.build.directory}/jarjar-staging/com.springsource.org.objectweb.asm.commons.jar"/>
+   		  <rule pattern="org.objectweb.asm.**" result="org.springframework.asm.@1"/>
+		</jarjar>
+		<unjar src="${project.build.directory}${file.separator}${project.build.finalName}-jarjar.jar"
+		       dest="${project.build.outputDirectory}">
+		  <patternset>
+		    <include name="**/*.class"/>
+                    <exclude name="*"/>
+                  </patternset>
+		</unjar>
+	      </tasks>
+	    </configuration>
+	  </execution>
+	</executions>
+	<dependencies>
+	  <dependency>
+	    <groupId>com.google.code</groupId> 
+	    <artifactId>jarjar</artifactId> 
+	    <version>1.0</version> 
+	  </dependency>
+	</dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index 89a4b8ac0b..cea71e1cfd 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -109,6 +109,12 @@
       <version>1.1.1</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
@@ -182,9 +188,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.objectweb.asm</groupId>
-      <artifactId>org.springframework.asm</artifactId>
-      <version>2.2.3</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index c932954a30..c622d99e1c 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -20,9 +20,9 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.objectweb.asm</groupId>
-      <artifactId>org.springframework.asm</artifactId>
-      <version>2.2.3</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index 4d222fba9a..eabdcab17c 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -134,7 +134,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
-      <artifactId>spring-web-portlet</artifactId>
+      <artifactId>spring-webmvc-portlet</artifactId>
       <version>${project.version}</version>
       <optional>true</optional>
     </dependency>
diff --git a/org.springframework.web.portlet/pom.xml b/org.springframework.web.portlet/pom.xml
index 0c6424a07d..9e2596c7d5 100644
--- a/org.springframework.web.portlet/pom.xml
+++ b/org.springframework.web.portlet/pom.xml
@@ -55,6 +55,12 @@
       <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
@@ -86,9 +92,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.objectweb.asm</groupId>
-      <artifactId>org.springframework.asm</artifactId>
-      <version>2.2.3</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index 35ff7d6400..68ad4fe268 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -120,6 +120,12 @@
       <version>1.4</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
@@ -170,12 +176,6 @@
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.objectweb.asm</groupId>
-      <artifactId>org.springframework.asm</artifactId>
-      <version>2.2.3</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>xmlunit</groupId>
       <artifactId>xmlunit</artifactId>