[glassfish-pfl] use objectweb-asm3

gil gil at fedoraproject.org
Thu Nov 14 05:27:03 UTC 2013


commit 78dd9b280130cf78517eadb1b0f3e7ad789bdb54
Author: gil <puntogil at libero.it>
Date:   Thu Nov 14 06:27:16 2013 +0100

    use objectweb-asm3

 glassfish-pfl-3.2.0-b001-00-build.xml |   16 ++++++++--------
 glassfish-pfl.spec                    |   25 ++++++++++++++-----------
 2 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/glassfish-pfl-3.2.0-b001-00-build.xml b/glassfish-pfl-3.2.0-b001-00-build.xml
index bd60fb2..6446282 100644
--- a/glassfish-pfl-3.2.0-b001-00-build.xml
+++ b/glassfish-pfl-3.2.0-b001-00-build.xml
@@ -33,10 +33,10 @@ GlassFish Primitive Function Library.
     <javac srcdir="${src}" destdir="${build}" debug="${javac.debug}" source="1.5" target="1.5">
       <classpath>
         <fileset dir="/usr/share/java">
-          <include name="objectweb-asm/asm.jar"/>
-          <include name="objectweb-asm/asm-commons.jar"/>
-          <include name="objectweb-asm/asm-tree.jar"/>
-          <include name="objectweb-asm/asm-util.jar"/>
+          <include name="objectweb-asm3/asm.jar"/>
+          <include name="objectweb-asm3/asm-commons.jar"/>
+          <include name="objectweb-asm3/asm-tree.jar"/>
+          <include name="objectweb-asm3/asm-util.jar"/>
           <include name="junit.jar"/>
         </fileset>
       </classpath>
@@ -152,10 +152,10 @@ GlassFish Primitive Function Library.
         <pathelement location="${dist}/${jar.name}-test.jar"/>
         <pathelement location="${project.cp}"/>
         <fileset dir="/usr/share/java">
-          <include name="objectweb-asm/asm.jar"/>
-          <include name="objectweb-asm/asm-commons.jar"/>
-          <include name="objectweb-asm/asm-tree.jar"/>
-          <include name="objectweb-asm/asm-util.jar"/>
+          <include name="objectweb-asm3/asm.jar"/>
+          <include name="objectweb-asm3/asm-commons.jar"/>
+          <include name="objectweb-asm3/asm-tree.jar"/>
+          <include name="objectweb-asm3/asm-util.jar"/>
           <include name="junit.jar"/>
         </fileset>
       </classpath>
diff --git a/glassfish-pfl.spec b/glassfish-pfl.spec
index f164513..aef1370 100644
--- a/glassfish-pfl.spec
+++ b/glassfish-pfl.spec
@@ -2,7 +2,7 @@
 %global namedversion %{version}%{?namedreltag}
 Name:          glassfish-pfl
 Version:       3.2.0
-Release:       0.3.b001%{?dist}
+Release:       0.4.b001%{?dist}
 Summary:       GlassFish Primitive Function Library
 Group:         Development/Libraries
 # Few files in src/org/glassfish/pfl/test/ is under ASL 2.0
@@ -42,13 +42,13 @@ BuildRequires: jpackage-utils
 BuildRequires: ant
 BuildRequires: aqute-bnd
 
-BuildRequires: objectweb-asm
+BuildRequires: objectweb-asm3
 
 # test deps
 BuildRequires: geronimo-ejb
 BuildRequires: junit4
 
-Requires:      objectweb-asm
+Requires:      objectweb-asm3
 
 Requires:      java
 Requires:      jpackage-utils
@@ -85,12 +85,12 @@ cp -p %{SOURCE4} pom-dynamic.xml
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-util</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>" pom-dynamic.xml
 
 cp -p %{SOURCE6} pom-tf.xml
@@ -99,17 +99,17 @@ cp -p %{SOURCE6} pom-tf.xml
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-util</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>" pom-tf.xml
 
 cp -p %{SOURCE7} pom-tf-tools.xml
@@ -118,17 +118,17 @@ cp -p %{SOURCE7} pom-tf-tools.xml
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-tree</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
       <artifactId>asm-util</artifactId>
-      <version>3.3.1</version>
+      <version>3</version>
     </dependency>" pom-tf-tools.xml
 
 cp -p %{SOURCE9} LICENSE.txt
@@ -181,6 +181,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc LICENSE.txt LICENSE-2.0.txt
 
 %changelog
+* Thu Nov 14 2013 gil cattaneo <puntogil at libero.it> 3.2.0-0.4.b001
+- use objectweb-asm3
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-0.3.b001
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list