Update to upstream snapshot compatible with Java 8

.gitignore

@@ -1 +1,2 @@
 /bcel-5.2-src.tar.gz
+/bcel-1592769.tar.xz

bcel-pom.xml

@@ -1,13 +1,19 @@
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.bcel</groupId>
   <artifactId>bcel</artifactId>
-  <version>5.2</version>
+  <version>6.0</version>
   <packaging>bundle</packaging>
   <properties>
     <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>any</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>regexp</groupId>
       <artifactId>regexp</artifactId>
@@ -15,7 +21,7 @@
     </dependency>
   </dependencies>
   <build>
-    <sourceDirectory>src/java</sourceDirectory>
+      <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>

bcel.spec

@@ -1,11 +1,18 @@
+%global svnrev 1592769
+
 Name:           bcel
-Version:        5.2
-Release:        17%{?dist}
+Version:        6.0
+Release:        0.1.20140406svn%{svnrev}%{?dist}
 Epoch:          0
 Summary:        Byte Code Engineering Library
 License:        ASL 2.0
 URL:            http://commons.apache.org/proper/commons-bcel/
-Source0:        http://archive.apache.org/dist/commons/bcel/source/bcel-5.2-src.tar.gz
+# Source for releases:
+# Source0:        http://archive.apache.org/dist/commons/bcel/source/bcel-%{version}-src.tar.gz
+
+# svn export http://svn.apache.org/repos/asf/commons/proper/bcel/trunk bcel
+# tar cJf bcel-1592769.tar.xz bcel
+Source0:        bcel-%{svnrev}.tar.xz
 # Upstream uses Maven 1, which is not available in Fedora.
 # The following is upstream project.xml converted to Maven 2/3.
 Source1:        %{name}-pom.xml
@@ -39,11 +46,15 @@ Obsoletes:      %{name}-manual < %{version}-%{release}
 This package provides %{summary}.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 cp -p %{SOURCE1} pom.xml
 %mvn_alias : bcel:
 %mvn_file : %{name}
 
+# different path in test
+sed -i '\|lib/dt\.jar|s|javaHome|javaHome.substring(0, javaHome.length() - 4)|' \
+        src/test/java/org/apache/bcel/PerformanceTest.java
+
 %build
 %mvn_build
 
@@ -58,6 +69,9 @@ cp -p %{SOURCE1} pom.xml
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue May 06 2014 Michael Simacek <msimacek@redhat.com> - 0:6.0-0.1.20140406svn1592769
+- Update to upstream snapshot compatible with Java 8
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

sources

@@ -1 +1 @@
-905b7e718e30e7ca726530ecf106e532  bcel-5.2-src.tar.gz
+1ad6d683fa3f6fb611673bbaf1f34c1a  bcel-1592769.tar.xz