Author: niallp
Date: Mon Mar 22 17:22:12 2010
New Revision: 926203
URL: http://svn.apache.org/viewvc?rev=926203&view=rev
Log:
Remove "build-other-jars.xml" and merge its targets into main Ant build.xml
Removed:
commons/proper/beanutils/trunk/build-other-jars.xml
Modified:
commons/proper/beanutils/trunk/build.xml
commons/proper/beanutils/trunk/pom.xml
commons/proper/beanutils/trunk/src/main/assembly/src.xml
Modified: commons/proper/beanutils/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/build.xml?rev=926203&r1=926202&r2=926203&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/build.xml (original)
+++ commons/proper/beanutils/trunk/build.xml Mon Mar 22 17:22:12 2010
@@ -247,13 +247,72 @@
</fileset>
</jar>
- <ant antfile="build-other-jars.xml" target="other-jars">
- <property name="dist.dir" value="${dist.home}"/>
- <property name="build.dir" value="${build.home}"/>
- <property name="component.version" value="${component.version}"/>
- <property name="maven.compile.source" value="${compile.source}"/>
- <property name="maven.compile.target" value="${compile.target}"/>
- </ant>
+ <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>
Modified: commons/proper/beanutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=926203&r1=926202&r2=926203&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Mon Mar 22 17:22:12 2010
@@ -207,12 +207,12 @@
<phase>package</phase>
<configuration>
<tasks>
- <ant antfile="build-other-jars.xml" target="other-jars">
+ <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="maven.compile.source"
value="${maven.compile.source}"/>
- <property name="maven.compile.target"
value="${maven.compile.target}"/>
+ <property name="compile.source"
value="${maven.compile.source}"/>
+ <property name="compile.target"
value="${maven.compile.target}"/>
</ant>
</tasks>
</configuration>
Modified: commons/proper/beanutils/trunk/src/main/assembly/src.xml
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/assembly/src.xml?rev=926203&r1=926202&r2=926203&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/assembly/src.xml (original)
+++ commons/proper/beanutils/trunk/src/main/assembly/src.xml Mon Mar 22
17:22:12 2010
@@ -26,7 +26,6 @@
<includes>
<include>build.properties.sample</include>
<include>build.xml</include>
- <include>build-other-jars.xml</include>
<include>checkstyle.xml</include>
<include>LICENSE.txt</include>
<include>license-header.txt</include>
