Compare commits

...

No commits in common. "c8-stream-201801" and "c8-stream-201902" have entirely different histories.

13 changed files with 107 additions and 208 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/objectweb-asm-6.2.tar.gz
SOURCES/objectweb-asm-7.2.tar.gz

View File

@ -1 +1 @@
d1da63034defb845ccedc1dea6fd8602e9e7f4b8 SOURCES/objectweb-asm-6.2.tar.gz
35d476b1dace20fd180269067a06f7c7b1c1932a SOURCES/objectweb-asm-7.2.tar.gz

View File

@ -9,10 +9,10 @@
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.2</version>
<version>7.2</version>
<name>asm</name>
<description>ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.ow2.io/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
@ -20,8 +20,8 @@
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<name>BSD-3-Clause</name>
<url>https://asm.ow2.io/license.html</url>
</license>
</licenses>
<developers>
@ -77,19 +77,19 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -36,11 +36,6 @@
<artifactId>asm-tree</artifactId>
<version>@VERSION@</version>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-xml</artifactId>
<version>@VERSION@</version>
</dependency>
</dependencies>
<build>
<plugins>

View File

@ -9,10 +9,10 @@
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>6.2</version>
<version>7.2</version>
<name>asm-analysis</name>
<description>Static code analysis API of ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.ow2.io/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
@ -20,8 +20,8 @@
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<name>BSD-3-Clause</name>
<url>https://asm.ow2.io/license.html</url>
</license>
</licenses>
<developers>
@ -77,25 +77,25 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -9,10 +9,10 @@
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId>
<version>6.2</version>
<version>7.2</version>
<name>asm-commons</name>
<description>Usefull class adapters based on ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.ow2.io/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
@ -20,8 +20,8 @@
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<name>BSD-3-Clause</name>
<url>https://asm.ow2.io/license.html</url>
</license>
</licenses>
<developers>
@ -77,43 +77,43 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -9,10 +9,10 @@
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<name>asm-test</name>
<description>Utilities for testing ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.ow2.io/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
@ -20,8 +20,8 @@
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<name>BSD-3-Clause</name>
<url>https://asm.ow2.io/license.html</url>
</license>
</licenses>
<developers>
@ -77,19 +77,19 @@
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -9,10 +9,10 @@
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>6.2</version>
<version>7.2</version>
<name>asm-tree</name>
<description>Tree API of ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.ow2.io/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
@ -20,8 +20,8 @@
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<name>BSD-3-Clause</name>
<url>https://asm.ow2.io/license.html</url>
</license>
</licenses>
<developers>
@ -77,25 +77,25 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -9,10 +9,10 @@
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>6.2</version>
<version>7.2</version>
<name>asm-util</name>
<description>Utilities for ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.ow2.io/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
@ -20,8 +20,8 @@
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<name>BSD-3-Clause</name>
<url>https://asm.ow2.io/license.html</url>
</license>
</licenses>
<developers>
@ -77,43 +77,43 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-analysis</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.0.7</version>
<version>3.0.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<version>7.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<version>5.3.2</version>
<scope>test</scope>
</dependency>
</dependencies>

View File

@ -1,108 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2</groupId>
<artifactId>ow2</artifactId>
<version>1.5</version>
</parent>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-xml</artifactId>
<version>6.2</version>
<name>asm-xml</name>
<description>XML API of ASM, a very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<inceptionYear>2000</inceptionYear>
<organization>
<name>OW2</name>
<url>http://www.ow2.org/</url>
</organization>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
</license>
</licenses>
<developers>
<developer>
<id>ebruneton</id>
<name>Eric Bruneton</name>
<email>ebruneton@free.fr</email>
<roles>
<role>Creator</role>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>eu</id>
<name>Eugene Kuleshov</name>
<email>eu@javatx.org</email>
<roles>
<role>Java Developer</role>
</roles>
</developer>
<developer>
<id>forax</id>
<name>Remi Forax</name>
<email>forax@univ-mlv.fr</email>
<roles>
<role>Java Developer</role>
</roles>
</developer>
</developers>
<mailingLists>
<mailingList>
<name>ASM Users List</name>
<subscribe>https://mail.ow2.org/wws/subscribe/asm</subscribe>
<post>asm@objectweb.org</post>
<archive>https://mail.ow2.org/wws/arc/asm/</archive>
</mailingList>
<mailingList>
<name>ASM Team List</name>
<subscribe>https://mail.ow2.org/wws/subscribe/asm-team</subscribe>
<post>asm-team@objectweb.org</post>
<archive>https://mail.ow2.org/wws/arc/asm-team/</archive>
</mailingList>
</mailingLists>
<scm>
<connection>scm:git:https://gitlab.ow2.org/asm/asm/</connection>
<developerConnection>scm:git:https://gitlab.ow2.org/asm/asm/</developerConnection>
<url>https://gitlab.ow2.org/asm/asm/</url>
</scm>
<issueManagement>
<url>https://gitlab.ow2.org/asm/asm/issues</url>
</issueManagement>
<dependencies>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
<version>6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-util</artifactId>
<version>6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-test</artifactId>
<version>6.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>

View File

@ -17,8 +17,10 @@ tar xf "../${name}-${version}.orig.tar.gz"
mv asm-${gittag}-* ${name}-${version}
# CLEAN TARBALL
# Remove all jar files
find -name '*.jar' -delete
find -name '*.class' -delete
# Remove all class files except those in asm-test, which are shipped alongside appropriately licensed source
find */asm{,-analysis,-commons} -name '*.class' -delete
rm -r */gradle
tar cf "../${name}-${version}.tar.gz" *

View File

@ -16,7 +16,6 @@
<module>asm-test</module>
<module>asm-tree</module>
<module>asm-util</module>
<module>asm-xml</module>
<module>asm-all</module>
</modules>
</project>

View File

@ -1,9 +1,6 @@
%bcond_without junit5
%bcond_without osgi
Name: objectweb-asm
Version: 6.2
Release: 5%{?dist}
Version: 7.2
Release: 2%{?dist}
Summary: Java bytecode manipulation and analysis framework
License: BSD
URL: http://asm.ow2.org/
@ -18,31 +15,21 @@ Source4: http://repo1.maven.org/maven2/org/ow2/asm/asm-commons/%{version}
Source5: http://repo1.maven.org/maven2/org/ow2/asm/asm-test/%{version}/asm-test-%{version}.pom
Source6: http://repo1.maven.org/maven2/org/ow2/asm/asm-tree/%{version}/asm-tree-%{version}.pom
Source7: http://repo1.maven.org/maven2/org/ow2/asm/asm-util/%{version}/asm-util-%{version}.pom
Source8: http://repo1.maven.org/maven2/org/ow2/asm/asm-xml/%{version}/asm-xml-%{version}.pom
# We still want to create an "all" uberjar, so this is a custom pom to generate it
# TODO: Fix other packages to no longer depend on "asm-all" so we can drop this
Source9: asm-all.pom
Source8: asm-all.pom
# The source contains binary jars that cannot be verified for licensing and could be proprietary
Source10: generate-tarball.sh
Source9: generate-tarball.sh
BuildRequires: maven-local
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
BuildRequires: mvn(org.ow2:ow2:pom:)
%if %{with junit5}
BuildRequires: mvn(org.codehaus.janino:janino)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params)
BuildRequires: mvn(org.junit.platform:junit-platform-surefire-provider)
%endif
%if %{with osgi}
# asm-all needs to be in pluginpath for BND. If this self-dependency
# becomes a problem then ASM core will have to be build from source
# with javac before main maven build, just like bnd-module-plugin
BuildRequires: objectweb-asm >= 6
%endif
# Explicit javapackages-tools requires since asm-processor script uses
# /usr/share/java-utils/java-functions
@ -67,26 +54,12 @@ This package provides %{summary}.
# A custom parent pom to aggregate the build
cp -p %{SOURCE1} pom.xml
%if %{without junit5}
%pom_disable_module asm-test
%endif
# Insert poms into modules
for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do
for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util; do
cp -p $RPM_SOURCE_DIR/${pom}-%{version}.pom $pom/pom.xml
# Fix junit5 configuration
%if %{with junit5}
%pom_add_dep org.junit.jupiter:junit-jupiter-engine:5.1.0:test $pom
%pom_add_plugin org.apache.maven.plugins:maven-surefire-plugin:2.21.0 $pom \
" <dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.2.0-RC1</version>
</dependency>
</dependencies>"
%endif
%if %{with osgi}
if [ "$pom" != "asm-test" ] ; then
# Make into OSGi bundles
bsn="org.objectweb.${pom//-/.}"
@ -103,12 +76,31 @@ for pom in asm asm-analysis asm-commons asm-test asm-tree asm-util asm-xml; do
</instructions>
</configuration>"
fi
%endif
done
# Disable tests that use unlicensed class files
sed -i -e '/testToByteArray_computeMaxs_largeSubroutines/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm/src/test/java/org/objectweb/asm/ClassWriterTest.java
sed -i -e '/testAnalyze_mergeWithJsrReachableFromTwoDifferentPaths/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithBasicInterpreterTest.java
sed -i -e '/testSortLocalVariablesAndInstantiate()/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java
sed -i -e '/testAllMethods_issue317586/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/LocalVariablesSorterTest.java
sed -i -e '/testAllMethods_anonymousInnerClass/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
sed -i -e '/testAllMethods_emptyInterface/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
sed -i -e '/testAllMethods_enum/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
sed -i -e '/testAllMethods_class/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
sed -i -e '/testAllMethods_interface/i@org.junit.jupiter.api.Disabled("missing class file")' \
asm-commons/src/test/java/org/objectweb/asm/commons/SerialVersionUidAdderTest.java
# Insert asm-all pom
mkdir -p asm-all
sed 's/@VERSION@/%{version}/g' %{SOURCE9} > asm-all/pom.xml
sed 's/@VERSION@/%{version}/g' %{SOURCE8} > asm-all/pom.xml
# Remove invalid self-dependency
%pom_remove_dep org.ow2.asm:asm-test asm-test
@ -128,16 +120,12 @@ javac -sourcepath ../../asm/src/main/java/ -cp $(build-classpath aqute-bnd) $(fi
jar cf bnd-module-plugin.jar -C src/main/java org
popd
%if %{with junit5}
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%else
%mvn_build -f -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
%endif
%install
%mvn_install
%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true
%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util %{name}-processor true
%files -f .mfiles
%license LICENSE.txt
@ -147,6 +135,29 @@ popd
%license LICENSE.txt
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.2-2
- Mass rebuild for javapackages-tools 201902
* Thu Oct 17 2019 Marian Koncek <mkoncek@redhat.com> - 7.2-1
- Update to upstream version 7.2
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.1-2
- Mass rebuild for javapackages-tools 201901
* Mon May 06 2019 Severin Gehwolf <sgehwolf@redhat.com> - 7.1-1
- Update to latest upstream 7.1 release.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Nov 21 2018 Severin Gehwolf <sgehwolf@redhat.com> - 7.0-1
- Update to latest upstream 7.0 release.
- Removes package asm-xml (deprecated since 6.1).
* Tue Sep 11 2018 Mat Booth <mat.booth@redhat.com> - 6.2.1-1
- Update to latest upstream release
- Fix test suite execution
* Fri Aug 03 2018 Michael Simacek <msimacek@redhat.com> - 6.2-5
- Repack the tarball without binaries