Hello community, here is the log from the commit of package objectweb-asm for openSUSE:Factory checked in at 2018-12-14 20:44:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/objectweb-asm (Old) and /work/SRC/openSUSE:Factory/.objectweb-asm.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "objectweb-asm" Fri Dec 14 20:44:50 2018 rev:20 rq:657252 version:6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/objectweb-asm/objectweb-asm.changes 2018-07-24 17:32:06.128040462 +0200 +++ /work/SRC/openSUSE:Factory/.objectweb-asm.new.28833/objectweb-asm.changes 2018-12-14 20:44:55.133713799 +0100 @@ -1,0 +2,25 @@ +Tue Dec 11 14:03:41 UTC 2018 - Jan Engelhardt <jeng...@inai.de> + +- Update RPM groups + +------------------------------------------------------------------- +Tue Dec 11 10:09:57 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Upgrade to version 6.0, the last version buildable with ant +- Removed patches: + * asm-3.3.1-jdk9.patch + * asm-3.3.1-sourcetarget.patch + * objectweb-asm-no-classpath-in-manifest.patch + + Not corresponding any more to the current state of code +- Added patches: + * objectweb-asm-6.0-no_bnd.patch + + Don't use bnd (which we don't have) to create bundles + * objectweb-asm-6.0-no_retrofit.patch + + Don't retrofit bytecode, since we build with target > 1.5 + * objectweb-asm-6.0-sourcetarget.patch + + Build with source/target 8 + * objectweb-asm-6.0-uberjar.patch + + Bring back the uberjars (asm-all.jar and asm-debug-all.jar) + since some packages might still depend on them + +------------------------------------------------------------------- Old: ---- asm-3.3.1-jdk9.patch asm-3.3.1-sourcetarget.patch asm-3.3.1.pom asm-3.3.1.tar.gz asm-MANIFEST.MF asm-all-3.3.1.pom asm-analysis-3.3.1.pom asm-commons-3.3.1.pom asm-parent-3.3.1.pom asm-tree-3.3.1.pom asm-util-3.3.1.pom asm-xml-3.3.1.pom objectweb-asm-no-classpath-in-manifest.patch New: ---- generate-tarball.sh objectweb-asm-6.0-no_bnd.patch objectweb-asm-6.0-no_retrofit.patch objectweb-asm-6.0-sourcetarget.patch objectweb-asm-6.0-uberjar.patch objectweb-asm-6.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ objectweb-asm.spec ++++++ --- /var/tmp/diff_new_pack.vwk9cR/_old 2018-12-14 20:44:55.673713053 +0100 +++ /var/tmp/diff_new_pack.vwk9cR/_new 2018-12-14 20:44:55.677713047 +0100 @@ -12,40 +12,31 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: objectweb-asm -Version: 3.3.1 +Version: 6.0 Release: 0 -Summary: A code manipulation tool to implement adaptable systems +Summary: Java bytecode manipulation framework License: BSD-3-Clause Group: Development/Libraries/Java -Url: http://asm.objectweb.org/ -Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz -Source1: http://repo1.maven.org/maven2/asm/asm/3.3.1/asm-3.3.1.pom -Source2: http://repo1.maven.org/maven2/asm/asm-analysis/3.3.1/asm-analysis-3.3.1.pom -Source3: http://repo1.maven.org/maven2/asm/asm-commons/3.3.1/asm-commons-3.3.1.pom -Source4: http://repo1.maven.org/maven2/asm/asm-tree/3.3.1/asm-tree-3.3.1.pom -Source5: http://repo1.maven.org/maven2/asm/asm-util/3.3.1/asm-util-3.3.1.pom -Source6: http://repo1.maven.org/maven2/asm/asm-xml/3.3.1/asm-xml-3.3.1.pom -Source7: http://repo1.maven.org/maven2/asm/asm-all/3.3.1/asm-all-3.3.1.pom -Source8: http://repo1.maven.org/maven2/asm/asm-parent/3.3.1/asm-parent-3.3.1.pom -Source9: asm-MANIFEST.MF -Patch0: objectweb-asm-no-classpath-in-manifest.patch -Patch1: asm-3.3.1-sourcetarget.patch -Patch2: asm-3.3.1-jdk9.patch -BuildRequires: ant >= 1.6.5 +URL: http://asm.objectweb.org/ +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.xz +# The source contains binary jars that cannot be verified for licensing and could be proprietary +Source1: generate-tarball.sh +Patch0: %{name}-%{version}-uberjar.patch +Patch1: %{name}-%{version}-sourcetarget.patch +Patch2: %{name}-%{version}-no_bnd.patch +Patch3: %{name}-%{version}-no_retrofit.patch +BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: objectweb-anttask -BuildRequires: xml-commons-apis -BuildRequires: zip -# Needed by asm-xml.jar -Requires: xml-commons-apis -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: xz BuildArch: noarch %description @@ -59,66 +50,106 @@ ASM offers similar functionalities as BCEL or SERP, but is much smaller. +%package javadoc +Summary: Java bytecode manipulation framework +Group: Documentation/HTML + +%description javadoc +ASM is a Java bytecode manipulation framework. + +It can be used to dynamically generate stub classes or other proxy +classes, directly in binary form, or to dynamically modify classes at +load time, i.e., just before they are loaded into the Java Virtual +Machine. + +ASM offers similar functionalities as BCEL or SERP, but is much +smaller. + +%package examples +Summary: Java bytecode manipulation framework +Group: Development/Libraries/Java + +%description examples +ASM is a Java bytecode manipulation framework. + +It can be used to dynamically generate stub classes or other proxy +classes, directly in binary form, or to dynamically modify classes at +load time, i.e., just before they are loaded into the Java Virtual +Machine. + +ASM offers similar functionalities as BCEL or SERP, but is much +smaller. + %prep -%setup -q -n asm-%{version} +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 -perl -pi -e 's/\r$//g' LICENSE.txt README.txt -mkdir META-INF -cp -p %{SOURCE9} META-INF/MANIFEST.MF +rm -f src/org/objectweb/asm/tools/ModuleInfoBndPlugin.java +%patch3 -p1 +# wrong end of line encoding +find examples/ -type 'f' | xargs sed -i -e 's/.$//' +sed -i -e 's/.$//' README.txt LICENSE.txt +mkdir -p test/lib %build -export CLASSPATH= -export OPT_JAR_LIST=: ant \ + -Dcompile.source=8 -Dcompile.target=8 \ -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) \ - -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ - jar + dist.version jar jdoc %install +install -d -m 755 %{buildroot}/%{_javadir}/%{name} # jars -install -d -m 755 %{buildroot}%{_javadir}/%{name} -for jar in output/dist/lib/*.jar; do -install -m 644 ${jar} \ -%{buildroot}%{_javadir}/%{name}/`basename ${jar} | sed 's/-%{version}//g'` -done -touch META-INF/MANIFEST.MF -zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF -install -m 644 output/dist/lib/all/asm-all-%{version}.jar %{buildroot}%{_javadir}/%{name}/asm-all.jar - -# pom -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm.pom -%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar +install -m 644 output/dist/lib/*jar %{buildroot}/%{_javadir}/%{name} +(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}.jar; do ln -sf ${jar} ${jar/-%{version}/}; done) -install -m 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-analysis.pom -%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar +install -m 644 output/dist/lib/all/asm-all-%{version}.jar \ + %{buildroot}%{_javadir}/%{name}-all-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) -install -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-commons.pom -%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} -install -m 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-tree.pom -%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar +install -pm 644 output/dist/lib/all/asm-all-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}-all-%{version}.pom +%add_maven_depmap %{name}-all-%{version}.pom %{name}-all-%{version}.jar -install -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-util.pom -%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar +install -pm 644 output/dist/lib/asm-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/asm-%{version}.pom +%add_maven_depmap %{name}/asm-%{version}.pom %{name}/asm-%{version}.jar -install -m 644 %{SOURCE6} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-xml.pom -%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar +install -pm 644 output/dist/lib/asm-parent-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/asm-parent-%{version}.pom +%add_maven_depmap %{name}/asm-parent-%{version}.pom -install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom -%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar +for i in analysis commons tree util xml; do + install -pm 644 output/dist/lib/asm-$i-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/asm-$i-%{version}.pom + %add_maven_depmap %{name}/asm-$i-%{version}.pom %{name}/asm-$i-%{version}.jar +done -install -m 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-parent.pom -%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar +# javadoc +install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version} +cp -pr output/dist/doc/javadoc/user/* %{buildroot}/%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name} +%fdupes -s %{buildroot} +%fdupes -s examples/ %files -%defattr(0644,root,root,0755) -%doc LICENSE.txt README.txt -%dir %{_javadir}/%{name} -%{_javadir}/%{name}/*.jar -%{_mavenpomdir}/* +%license LICENSE.txt +%doc README.txt +%{_javadir}/%{name}-all*.jar +%{_javadir}/%{name} +%{_mavenpomdir}/%{name}-all-%{version}.pom +%{_mavenpomdir}/%{name} +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else %{_datadir}/maven-metadata/%{name}.xml* +%endif + +%files javadoc +%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} + +%files examples +%doc examples/* %changelog ++++++ generate-tarball.sh ++++++ #!/bin/bash set -e name=objectweb-asm version="$(sed -n 's/Version:\s*//p' *.spec)" gittag="ASM_${version//./_}" # RETRIEVE wget "https://gitlab.ow2.org/asm/asm/repository/${gittag}/archive.tar.gz#/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" rm -rf tarball-tmp mkdir tarball-tmp cd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # Rename dir not to contain commit mv asm-${gittag}-* ${name}-${version} # CLEAN TARBALL # Remove all jar files find -name '*.jar' -delete tar cJf "../${name}-${version}.tar.xz" * cd .. rm -r tarball-tmp "${name}-${version}.orig.tar.gz" ++++++ objectweb-asm-6.0-no_bnd.patch ++++++ --- objectweb-asm-6.0/archive/asm-all.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-all.xml 2018-12-11 10:20:37.851607047 +0100 @@ -34,14 +34,25 @@ <target name="build-jar"> <mkdir dir="${out.dist.lib}/all"/> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/> - <bnd - classpath="${out.build}" - eclipse="true" - failok="false" - exceptions="true" - files="archive/asm-all.bnd" - output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/**/*.class"/> + <exclude name="org/objectweb/asm/optimizer/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM all classes"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="ASM all classes"/> + <attribute name="Bundle-Vendor" value="France Telecom R&D"/> + <attribute name="Bundle-Version" value="${product.artifact}"/> + <attribute name="Bundle-DocURL" value="http://asm.objectweb.org"/> + <attribute name="Bundle-SymbolicName" value="org.objectweb.asm.all"/> + <attribute name="Export-Package" value="org.objectweb.asm;version=${product.artifact},org.objectweb.asm.signature;version=${product.artifact},org.objectweb.asm.commons;version=${product.artifact},org.objectweb.asm.tree;version=${product.artifact},org.objectweb.asm.tree.analysis;version=${product.artifact},org.objectweb.asm.util;version=${product.artifact},org.objectweb.asm.xml;version=${product.artifact}"/> + <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.3"/> + </manifest> + </jar> <copy file="${archive}/asm-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm-analysis.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-analysis.xml 2018-12-11 10:19:23.011226060 +0100 @@ -33,13 +33,15 @@ <target name="dist" depends="build-jar,build-snapshot"/> <target name="build-jar"> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/> - <bnd - classpath="${out.build}" - failok="false" - exceptions="true" - files="archive/asm-analysis.bnd" - output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/tree/analysis/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM static code analysis framework"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + </manifest> + </jar> <copy file="${archive}/asm-analysis.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm-commons.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-commons.xml 2018-12-11 10:19:23.011226060 +0100 @@ -33,13 +33,15 @@ <target name="dist" depends="build-jar,build-snapshot"/> <target name="build-jar"> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/> - <bnd - classpath="${out.build}" - failok="false" - exceptions="true" - files="archive/asm-commons.bnd" - output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/commons/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM commons"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + </manifest> + </jar> <copy file="${archive}/asm-commons.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm-debug-all.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-debug-all.xml 2018-12-11 10:21:41.675931989 +0100 @@ -34,14 +34,25 @@ <target name="build-jar"> <mkdir dir="${out.dist.lib}/all"/> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/> - <bnd - classpath="${out.build}/tmp" - eclipse="true" - failok="false" - exceptions="true" - files="archive/asm-debug-all.bnd" - output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/**/*.class"/> + <exclude name="org/objectweb/asm/optimizer/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM all classes with debug info"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="ASM all classes with debug info"/> + <attribute name="Bundle-Vendor" value="France Telecom R&D"/> + <attribute name="Bundle-Version" value="${product.artifact}"/> + <attribute name="Bundle-DocURL" value="http://asm.objectweb.org"/> + <attribute name="Bundle-SymbolicName" value="org.objectweb.asm.all"/> + <attribute name="Export-Package" value="org.objectweb.asm;version=${product.artifact},org.objectweb.asm.signature;version=${product.artifact},org.objectweb.asm.commons;version=${product.artifact},org.objectweb.asm.tree;version=${product.artifact},org.objectweb.asm.tree.analysis;version=${product.artifact},org.objectweb.asm.util;version=${product.artifact},org.objectweb.asm.xml;version=${product.artifact}"/> + <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.3"/> + </manifest> + </jar> <copy file="${archive}/asm-debug-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm-tree.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-tree.xml 2018-12-11 10:19:23.011226060 +0100 @@ -33,13 +33,15 @@ <target name="dist" depends="build-jar,build-snapshot"/> <target name="build-jar"> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/> - <bnd - classpath="${out.build}" - failok="false" - exceptions="true" - files="archive/asm-tree.bnd" - output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/tree/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM Tree class visitor"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + </manifest> + </jar> <copy file="${archive}/asm-tree.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm-util.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-util.xml 2018-12-11 10:19:23.011226060 +0100 @@ -34,12 +34,15 @@ <target name="build-jar"> <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/> - <bnd - classpath="${out.build}" - failok="false" - exceptions="true" - files="archive/asm-util.bnd" - output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/util/**/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM Utilities"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + </manifest> + </jar> <copy file="${archive}/asm-util.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm.xml 2018-12-11 10:19:23.011226060 +0100 @@ -33,13 +33,16 @@ <target name="dist" depends="build-jar,build-snapshot"/> <target name="build-jar"> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/> - <bnd - classpath="${out.build}" - failok="false" - exceptions="true" - files="archive/asm.bnd" - output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/*.class"/> + <include name="org/objectweb/asm/signature/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="France Telecom R&D"/> + </manifest> + </jar> <copy file="${archive}/asm.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/archive/asm-xml.xml 2018-12-11 10:19:05.855138717 +0100 +++ objectweb-asm-6.0/archive/asm-xml.xml 2018-12-11 10:19:23.015226080 +0100 @@ -33,13 +33,16 @@ <target name="dist" depends="build-jar,build-snapshot"/> <target name="build-jar"> - <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/${biz.aQute.bnd.path}"/> - <bnd - classpath="${out.build}" - failok="false" - exceptions="true" - files="archive/asm-xml.bnd" - output="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"/> + <jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar" + basedir="${out.build}/tmp"> + <include name="org/objectweb/asm/xml/*.class"/> + <manifest> + <attribute name="Implementation-Title" value="ASM XML classes"/> + <attribute name="Implementation-Version" value="${product.artifact}"/> + <attribute name="Implementation-Vendor" value="Eugene Kuleshov"/> + <attribute name="Main-class" value="org.objectweb.asm.xml.Processor"/> + </manifest> + </jar> <copy file="${archive}/asm-xml.pom" toFile="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom"/> <replace file="${out.dist.lib}/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> --- objectweb-asm-6.0/build.xml 2018-12-11 10:19:05.843138654 +0100 +++ objectweb-asm-6.0/build.xml 2018-12-11 10:22:41.928238728 +0100 @@ -79,7 +79,6 @@ <condition property="paths.configured"> <and> <isset property="objectweb.ant.tasks.path" /> - <isset property="biz.aQute.bnd.path" /> </and> </condition> @@ -131,7 +130,6 @@ <javac destdir="${out.build}/tmp" debug="on" source="${compile.source}" target="${compile.target}" encoding="ISO-8859-1"> <classpath> <pathelement location="${out.build}/tmp" /> - <pathelement location="${config}/${biz.aQute.bnd.path}" /> </classpath> <src path="${src}" /> <include name="**/*.java" /> @@ -256,14 +254,7 @@ </condition> </target> - <target name="bnd-module-plugin-jar" depends="compile"> - <jar destfile="${out.build}/bnd-module-plugin.jar" - basedir="${out.build}/tmp" - includes="org/objectweb/asm/**/*.class"> - </jar> - </target> - - <target name="jar" depends="dist.init,dist.version,compile,retrofit,bnd-module-plugin-jar"> + <target name="jar" depends="dist.init,dist.version,compile,retrofit"> <ant antfile="${archive}/asm.xml" /> <ant antfile="${archive}/asm-all.xml" /> <ant antfile="${archive}/asm-analysis.xml" /> ++++++ objectweb-asm-6.0-no_retrofit.patch ++++++ --- objectweb-asm-6.0/build.xml 2018-12-11 10:23:24.592455922 +0100 +++ objectweb-asm-6.0/build.xml 2018-12-11 10:25:57.477234079 +0100 @@ -137,19 +137,7 @@ </javac> </target> - <target name="retrofit" depends="compile-debug"> - <echo message="Retrofitting" /> - <java classname="org.objectweb.asm.tools.Retrofitter" failonerror="true"> - <classpath> - <pathelement location="${out.build}/tmp" /> - </classpath> - <arg value="${src}/org/objectweb/asm/tools/jdk1.5.0.12.txt.gz" /> - <arg value="${out.build}/tmp" /> - <arg value="${out.build}" /> - </java> - </target> - - <target name="compile" depends="compile-debug,retrofit" /> + <target name="compile" depends="compile-debug" /> <!-- =================================== --> <!-- ========== TEST ========== --> @@ -254,7 +242,7 @@ </condition> </target> - <target name="jar" depends="dist.init,dist.version,compile,retrofit"> + <target name="jar" depends="dist.init,dist.version,compile"> <ant antfile="${archive}/asm.xml" /> <ant antfile="${archive}/asm-all.xml" /> <ant antfile="${archive}/asm-analysis.xml" /> ++++++ objectweb-asm-6.0-sourcetarget.patch ++++++ --- objectweb-asm-6.0/build.xml 2018-12-11 10:17:16.622582636 +0100 +++ objectweb-asm-6.0/build.xml 2018-12-11 10:17:41.218707834 +0100 @@ -48,6 +48,9 @@ <property name="config" value="${basedir}/config" /> <property name="archive" value="${basedir}/archive" /> + <property name="compile.source" value="8"/> + <property name="compile.target" value="8"/> + <property name="out" value="${basedir}/output" /> <property name="out.build" value="${out}/build" /> <property name="out.instr" value="${out}/instr" /> @@ -125,7 +128,7 @@ </target> <target name="compile-debug" depends="init,compile-init"> - <javac destdir="${out.build}/tmp" debug="on" source="1.5" target="1.5"> + <javac destdir="${out.build}/tmp" debug="on" source="${compile.source}" target="${compile.target}" encoding="ISO-8859-1"> <classpath> <pathelement location="${out.build}/tmp" /> <pathelement location="${config}/${biz.aQute.bnd.path}" /> ++++++ objectweb-asm-6.0-uberjar.patch ++++++ --- objectweb-asm-6.0/archive/asm-all.bnd 1970-01-01 01:00:00.000000000 +0100 +++ objectweb-asm-6.0/archive/asm-all.bnd 2018-12-11 10:11:51.216926166 +0100 @@ -0,0 +1,60 @@ +############################################################################### +#ASM: a very small and fast Java bytecode manipulation framework +#Copyright (c) 2000-2011 INRIA, France Telecom +#All rights reserved. +# +#Redistribution and use in source and binary forms, with or without +#modification, are permitted provided that the following conditions +#are met: +#1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +#2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +#3. Neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +#THE POSSIBILITY OF SUCH DAMAGE. +############################################################################### + + +Implementation-Title: ASM all classes +Implementation-Version: ${product.artifact} +Implementation-Vendor: France Telecom R&D + +Bundle-Name: ASM all classes with debug info +Bundle-Vendor: France Telecom R&D +Bundle-Version: ${product.artifact} +Bundle-DocURL: http://asm.objectweb.org +Bundle-SymbolicName: org.objectweb.asm.all + +Export-Package: \ + !org.objectweb.asm.optimizer.*,\ + org.objectweb.asm.*;version=${product.artifact} + +Import-Package: \ + javax.xml.transform.*;resolution:="optional",\ + org.xml.sax.*;resolution:="optional" + +Bundle-RequiredExecutionEnvironment: J2SE-1.3 + +-removeheaders:\ + ANNV,\ + DSTAMP,\ + FRAMESV,\ + RESIZEV,\ + SIGV,\ + TODAY,\ + TSTAMP,\ + WRITERV --- objectweb-asm-6.0/archive/asm-all.pom 1970-01-01 01:00:00.000000000 +0100 +++ objectweb-asm-6.0/archive/asm-all.pom 2018-12-11 10:11:51.216926166 +0100 @@ -0,0 +1,45 @@ +<!-- + ! ASM: a very small and fast Java bytecode manipulation framework + ! Copyright (c) 2000-2011 INRIA, France Telecom + ! All rights reserved. + ! + ! Redistribution and use in source and binary forms, with or without + ! modification, are permitted provided that the following conditions + ! are met: + ! 1. Redistributions of source code must retain the above copyright + ! notice, this list of conditions and the following disclaimer. + ! 2. Redistributions in binary form must reproduce the above copyright + ! notice, this list of conditions and the following disclaimer in the + ! documentation and/or other materials provided with the distribution. + ! 3. Neither the name of the copyright holders nor the names of its + ! contributors may be used to endorse or promote products derived from + ! this software without specific prior written permission. + ! + ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + ! THE POSSIBILITY OF SUCH DAMAGE. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-parent</artifactId> + <version>@product.artifact@</version> + </parent> + + <name>ASM All</name> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-all</artifactId> + <packaging>jar</packaging> + +</project> --- objectweb-asm-6.0/archive/asm-all.xml 1970-01-01 01:00:00.000000000 +0100 +++ objectweb-asm-6.0/archive/asm-all.xml 2018-12-11 10:11:51.216926166 +0100 @@ -0,0 +1,62 @@ +<!-- + ! ASM: a very small and fast Java bytecode manipulation framework + ! Copyright (c) 2000-2011 INRIA, France Telecom + ! All rights reserved. + ! + ! Redistribution and use in source and binary forms, with or without + ! modification, are permitted provided that the following conditions + ! are met: + ! 1. Redistributions of source code must retain the above copyright + ! notice, this list of conditions and the following disclaimer. + ! 2. Redistributions in binary form must reproduce the above copyright + ! notice, this list of conditions and the following disclaimer in the + ! documentation and/or other materials provided with the distribution. + ! 3. Neither the name of the copyright holders nor the names of its + ! contributors may be used to endorse or promote products derived from + ! this software without specific prior written permission. + ! + ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + ! THE POSSIBILITY OF SUCH DAMAGE. +--> + +<project name="asm-all" default="dist"> + + <target name="dist" depends="build-jar,build-snapshot"/> + + <target name="build-jar"> + <mkdir dir="${out.dist.lib}/all"/> + <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/> + <bnd + classpath="${out.build}" + eclipse="true" + failok="false" + exceptions="true" + files="archive/asm-all.bnd" + output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/> + + <copy file="${archive}/asm-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/> + <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> + <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/> + + <echo file="${out.dist.lib}/all/README.txt">It is highly recommended to use only the necessary ASM jars for your +application instead of using the asm-all jar, unless you really need +all ASM packages.</echo> + </target> + + <target name="build-snapshot" if="product.snapshot"> + <mkdir dir="${out.dist.lib}/all"/> + <copy file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.jar"/> + <copy file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.pom"/> + <echo file="${out.dist.lib}/all/${ant.project.name}-snapshot-version" message="${product.build.time}"/> + </target> + +</project> \ No newline at end of file --- objectweb-asm-6.0/archive/asm-debug-all.bnd 1970-01-01 01:00:00.000000000 +0100 +++ objectweb-asm-6.0/archive/asm-debug-all.bnd 2018-12-11 10:13:34.301450902 +0100 @@ -0,0 +1,60 @@ +############################################################################### +#ASM: a very small and fast Java bytecode manipulation framework +#Copyright (c) 2000-2011 INRIA, France Telecom +#All rights reserved. +# +#Redistribution and use in source and binary forms, with or without +#modification, are permitted provided that the following conditions +#are met: +#1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +#2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +#3. Neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +#AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +#IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +#ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +#LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +#CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +#SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +#INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +#CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +#ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +#THE POSSIBILITY OF SUCH DAMAGE. +############################################################################### + + +Implementation-Title: ASM all classes with debug info +Implementation-Version: ${product.artifact} +Implementation-Vendor: France Telecom R&D + +Bundle-Name: ASM all classes with debug info +Bundle-Vendor: France Telecom R&D +Bundle-Version: ${product.artifact} +Bundle-DocURL: http://asm.objectweb.org +Bundle-SymbolicName: org.objectweb.asm.all.debug + +Export-Package: \ + !org.objectweb.asm.optimizer.*,\ + org.objectweb.asm.*;version=${product.artifact} + +Import-Package: \ + javax.xml.transform.*;resolution:="optional",\ + org.xml.sax.*;resolution:="optional" + +Bundle-RequiredExecutionEnvironment: J2SE-1.5 + +-removeheaders:\ + ANNV,\ + DSTAMP,\ + FRAMESV,\ + RESIZEV,\ + SIGV,\ + TODAY,\ + TSTAMP,\ + WRITERV --- objectweb-asm-6.0/archive/asm-debug-all.pom 1970-01-01 01:00:00.000000000 +0100 +++ objectweb-asm-6.0/archive/asm-debug-all.pom 2018-12-11 10:13:34.301450902 +0100 @@ -0,0 +1,45 @@ +<!-- + ! ASM: a very small and fast Java bytecode manipulation framework + ! Copyright (c) 2000-2011 INRIA, France Telecom + ! All rights reserved. + ! + ! Redistribution and use in source and binary forms, with or without + ! modification, are permitted provided that the following conditions + ! are met: + ! 1. Redistributions of source code must retain the above copyright + ! notice, this list of conditions and the following disclaimer. + ! 2. Redistributions in binary form must reproduce the above copyright + ! notice, this list of conditions and the following disclaimer in the + ! documentation and/or other materials provided with the distribution. + ! 3. Neither the name of the copyright holders nor the names of its + ! contributors may be used to endorse or promote products derived from + ! this software without specific prior written permission. + ! + ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + ! THE POSSIBILITY OF SUCH DAMAGE. +--> + +<project> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-parent</artifactId> + <version>@product.artifact@</version> + </parent> + + <name>ASM Debug All</name> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-debug-all</artifactId> + <packaging>jar</packaging> + +</project> --- objectweb-asm-6.0/archive/asm-debug-all.xml 1970-01-01 01:00:00.000000000 +0100 +++ objectweb-asm-6.0/archive/asm-debug-all.xml 2018-12-11 10:13:34.301450902 +0100 @@ -0,0 +1,62 @@ +<!-- + ! ASM: a very small and fast Java bytecode manipulation framework + ! Copyright (c) 2000-2011 INRIA, France Telecom + ! All rights reserved. + ! + ! Redistribution and use in source and binary forms, with or without + ! modification, are permitted provided that the following conditions + ! are met: + ! 1. Redistributions of source code must retain the above copyright + ! notice, this list of conditions and the following disclaimer. + ! 2. Redistributions in binary form must reproduce the above copyright + ! notice, this list of conditions and the following disclaimer in the + ! documentation and/or other materials provided with the distribution. + ! 3. Neither the name of the copyright holders nor the names of its + ! contributors may be used to endorse or promote products derived from + ! this software without specific prior written permission. + ! + ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + ! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + ! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + ! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + ! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + ! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + ! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + ! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + ! THE POSSIBILITY OF SUCH DAMAGE. +--> + +<project name="asm-debug-all" default="dist"> + + <target name="dist" depends="build-jar,build-snapshot"/> + + <target name="build-jar"> + <mkdir dir="${out.dist.lib}/all"/> + <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${config}/biz.aQute.bnd.jar"/> + <bnd + classpath="${out.build}/tmp" + eclipse="true" + failok="false" + exceptions="true" + files="archive/asm-debug-all.bnd" + output="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"/> + + <copy file="${archive}/asm-debug-all.pom" toFile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom"/> + <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.name@" value="${ant.project.name}"/> + <replace file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" token="@product.artifact@" value="${product.artifact}"/> + + <echo file="${out.dist.lib}/all/README.txt">It is highly recommended to use only the necessary ASM jars for your +application instead of using the asm-all jar, unless you really need +all ASM packages.</echo> + </target> + + <target name="build-snapshot" if="product.snapshot"> + <mkdir dir="${out.dist.lib}/all"/> + <copy file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.jar"/> + <copy file="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.pom" toFile="${out.dist.lib}/${ant.project.name}-SNAPSHOT.pom"/> + <echo file="${out.dist.lib}/all/${ant.project.name}-snapshot-version" message="${product.build.time}"/> + </target> + +</project> \ No newline at end of file --- objectweb-asm-6.0/build.xml 2017-09-23 08:20:04.000000000 +0200 +++ objectweb-asm-6.0/build.xml 2018-12-11 10:15:11.449945414 +0100 @@ -262,8 +262,10 @@ <target name="jar" depends="dist.init,dist.version,compile,retrofit,bnd-module-plugin-jar"> <ant antfile="${archive}/asm.xml" /> + <ant antfile="${archive}/asm-all.xml" /> <ant antfile="${archive}/asm-analysis.xml" /> <ant antfile="${archive}/asm-commons.xml" /> + <ant antfile="${archive}/asm-debug-all.xml" /> <ant antfile="${archive}/asm-parent.xml" /> <ant antfile="${archive}/asm-tree.xml" /> <ant antfile="${archive}/asm-util.xml" /> @@ -613,6 +615,30 @@ <arg value="-Djavadoc=${out.zip}/${product.name}-${product.version}-javadoc.jar" /> <arg value="-Dsources=${out.zip}/${product.name}-${product.version}-sources.jar" /> <arg value="-Pow2-release" /> + <arg value="-Dgpg.passphrase=${passphrase}" /> + </m2:mvn> + + <m2:mvn> + <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file" /> + <arg value="-Durl=${maven-staging-repository-url}" /> + <arg value="-DrepositoryId=${maven-staging-repository-id}" /> + <arg value="-DpomFile=${out.dist.lib}/all/asm-all-${product.artifact}.pom" /> + <arg value="-Dfile=${out.dist.lib}/all/asm-all-${product.artifact}.jar" /> + <arg value="-Djavadoc=${out.zip}/${product.name}-${product.version}-javadoc.jar" /> + <arg value="-Dsources=${out.zip}/${product.name}-${product.version}-sources.jar" /> + <arg value="-Pow2-release" /> + <arg value="-Dgpg.passphrase=${passphrase}" /> + </m2:mvn> + + <m2:mvn> + <arg value="org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file" /> + <arg value="-Durl=${maven-staging-repository-url}" /> + <arg value="-DrepositoryId=${maven-staging-repository-id}" /> + <arg value="-DpomFile=${out.dist.lib}/all/asm-debug-all-${product.artifact}.pom" /> + <arg value="-Dfile=${out.dist.lib}/all/asm-debug-all-${product.artifact}.jar" /> + <arg value="-Djavadoc=${out.zip}/${product.name}-${product.version}-javadoc.jar" /> + <arg value="-Dsources=${out.zip}/${product.name}-${product.version}-sources.jar" /> + <arg value="-Pow2-release" /> <arg value="-Dgpg.passphrase=${passphrase}" /> </m2:mvn>