[bcel] Update to upstream snapshot compatible with Java 8
Michael Šimáček
msimacek at fedoraproject.org
Fri May 9 08:19:29 UTC 2014
commit e2b21b14b7a789905ef2890952e7df1dd521fc8c
Author: Michael Simacek <msimacek at redhat.com>
Date: Fri May 9 10:06:20 2014 +0200
Update to upstream snapshot compatible with Java 8
.gitignore | 1 +
bcel-pom.xml | 12 +++++++++---
bcel.spec | 22 ++++++++++++++++++----
sources | 2 +-
4 files changed, 29 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 165d760..b5e72d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/bcel-5.2-src.tar.gz
+/bcel-1592769.tar.xz
diff --git a/bcel-pom.xml b/bcel-pom.xml
index a2aaad5..d3a119a 100644
--- a/bcel-pom.xml
+++ b/bcel-pom.xml
@@ -1,21 +1,27 @@
-<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>
<version>1.2</version>
</dependency>
</dependencies>
<build>
- <sourceDirectory>src/java</sourceDirectory>
+ <sourceDirectory>src/main/java</sourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
diff --git a/bcel.spec b/bcel.spec
index baecdb4..4d28567 100644
--- a/bcel.spec
+++ b/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 at 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 at lists.fedoraproject.org> - 0:5.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 2d4bc00..8ce4687 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-905b7e718e30e7ca726530ecf106e532 bcel-5.2-src.tar.gz
+1ad6d683fa3f6fb611673bbaf1f34c1a bcel-1592769.tar.xz
More information about the scm-commits
mailing list