commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r995833 - in /commons/proper/beanutils/trunk: build.xml pom.xml src/main/java/org/apache/commons/collections/
Date Fri, 10 Sep 2010 15:48:02 GMT
Author: niallp
Date: Fri Sep 10 15:48:02 2010
New Revision: 995833

URL: http://svn.apache.org/viewvc?rev=995833&view=rev
Log:
BEANUTILS-379 Remove copied Collections classes and drop creation of commons-beanutils-core.jar
and commons-beanutils-bean-collections.jar 
(also fixes BEANUTILS-378)

Removed:
    commons/proper/beanutils/trunk/src/main/java/org/apache/commons/collections/
Modified:
    commons/proper/beanutils/trunk/build.xml
    commons/proper/beanutils/trunk/pom.xml

Modified: commons/proper/beanutils/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/build.xml?rev=995833&r1=995832&r2=995833&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/build.xml (original)
+++ commons/proper/beanutils/trunk/build.xml Fri Sep 10 15:48:02 2010
@@ -247,75 +247,8 @@
         </fileset>
     </jar>
 
-    <ant target="other-jars" />
-
-  </target>
-
-  <target name="other-jars" depends="core-jar,bean-collections-jar">
-  </target>
-
-  <target name="core-jar" description="Create BeanUtils Core jar">
-    <mkdir      dir="${dist.home}"/>
-    <mkdir      dir="${build.home}/classes/META-INF"/>
-    <copy      file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-    <copy      file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-    <jar    jarfile="${dist.home}/commons-beanutils-core-${component.version}.jar">
-        <manifest>
-            <attribute name="Specification-Title" value="Commons BeanUtils Core"/>
-            <attribute name="Specification-Version" value="${component.version}"/>
-            <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-            <attribute name="Implementation-Title" value="Commons BeanUtils Core"/>
-            <attribute name="Implementation-Version" value="${component.version}"/>

-            <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-            <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-            <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
-            <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
-        </manifest>
-        <fileset dir="${build.home}/classes">
-            <include name="**/*.class"/>
-            <include name="**/LICENSE.txt"/>
-            <include name="**/NOTICE.txt"/>
-            <exclude name="**/BeanComparator*.class"/>
-            <exclude name="**/BeanMap*.class"/>
-            <exclude name="**/BeanPredicate*.class"/>
-            <exclude name="**/BeanPropertyValueChangeClosure*.class"/>
-            <exclude name="**/BeanPropertyValueEqualsPredicate*.class"/>
-            <exclude name="**/BeanToPropertyValueTransformer*.class"/>
-        </fileset>
-    </jar>
-  </target>
-
-  <target name="bean-collections-jar" description="Create Bean Collections jar">
-    <mkdir      dir="${dist.home}"/>
-    <mkdir      dir="${build.home}/classes/META-INF"/>
-    <copy      file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
-    <copy      file="NOTICE.txt"  tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
-    <jar    jarfile="${dist.home}/commons-beanutils-bean-collections-${component.version}.jar">
-        <manifest>
-            <attribute name="Specification-Title" value="Commons BeanUtils Bean Collections"/>
-            <attribute name="Specification-Version" value="${component.version}"/>
-            <attribute name="Specification-Vendor" value="The Apache Software Foundation"/>
-            <attribute name="Implementation-Title" value="Commons BeanUtils Bean Collections"/>
-            <attribute name="Implementation-Version" value="${component.version}"/>

-            <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-            <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-            <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
-            <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
-        </manifest>
-        <fileset dir="${build.home}/classes">
-            <include name="**/LICENSE.txt"/>
-            <include name="**/NOTICE.txt"/>
-            <include name="**/BeanComparator*.class"/>
-            <include name="**/BeanMap*.class"/>
-            <include name="**/BeanPredicate*.class"/>
-            <include name="**/BeanPropertyValueChangeClosure*.class"/>
-            <include name="**/BeanPropertyValueEqualsPredicate*.class"/>
-            <include name="**/BeanToPropertyValueTransformer*.class"/>
-        </fileset>
-    </jar>
   </target>
 
-
   <target name="install-jar" depends="jar"
    description="--> Installs jar file in ${lib.repo}">
     <copy todir="${lib.repo}" filtering="no">

Modified: commons/proper/beanutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=995833&r1=995832&r2=995833&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Fri Sep 10 15:48:02 2010
@@ -146,7 +146,6 @@
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId> 
       <version>3.2.1</version> 
-      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
@@ -192,28 +191,6 @@
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <executions>
-            <execution>
-              <phase>package</phase>
-              <configuration>
-                <tasks>
-                  <ant antfile="build.xml" target="other-jars">
-                    <property name="component.version"    value="${project.version}"/>
-                    <property name="build.home"           value="${project.build.directory}"/>
-                    <property name="dist.home"            value="${project.build.directory}"/>
-                    <property name="compile.source"       value="${maven.compile.source}"/>
-                    <property name="compile.target"       value="${maven.compile.target}"/>
-                  </ant>
-                </tasks>
-              </configuration>
-              <goals>
-                <goal>run</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
                 <descriptors>
@@ -233,9 +210,6 @@
         <commons.release.version>1.8.3</commons.release.version>
         <commons.jira.id>BEANUTILS</commons.jira.id>
         <commons.jira.pid>12310460</commons.jira.pid>
-        <commons.osgi.export>
-              org.apache.commons.beanutils.*;version=${project.version};-noimport:=true
-        </commons.osgi.export>
     </properties> 
 
     <reporting>



Mime
View raw message