[voms-api-java/el5] Update to version 2.0.8 (EMI 2 version)
Mattias Ellert
ellert at fedoraproject.org
Fri May 25 07:23:38 UTC 2012
commit 87975c5b32d87860c977ae1f79b0015b6ab3fd91
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Fri May 25 09:23:15 2012 +0200
Update to version 2.0.8 (EMI 2 version)
maven-build.properties | 9 +++++----
maven-build.xml | 20 +++++++++++++-------
voms-api-java.spec | 17 ++++++++++-------
3 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/maven-build.properties b/maven-build.properties
index 744662c..691fa68 100644
--- a/maven-build.properties
+++ b/maven-build.properties
@@ -1,7 +1,8 @@
#Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Thu Mar 22 00:41:13 CET 2012
+#Thu May 24 23:15:55 CEST 2012
+bouncycastle.version=1.46
maven.settings.offline=true
-maven.build.finalName=voms-api-java-2.0.7
+maven.build.finalName=voms-api-java-2.0.8
maven.build.resourceDir.0=src/main/resources
maven.build.testOutputDir=${maven.build.dir}/test-classes
maven.build.testResourceDir.0=src/test/resources
@@ -13,10 +14,10 @@ maven.test.reports=${maven.build.dir}/test-reports
maven.build.dir=target
project.build.outputDirectory=${maven.build.outputDir}
assembly.javadoc.dir=/usr/share/javadoc/voms-api-java
-assembly.doc.dir=/usr/share/doc/voms-api-java-2.0.7
+assembly.doc.dir=/usr/share/doc/voms-api-java-2.0.8
project.reporting.outputEncoding=UTF-8
maven.build.testDir.0=src/test/java
maven.settings.interactiveMode=true
assembly.java.dir=/usr/share/java
-maven.repo.local=/home/ellert/Packaging/vomsjapi/voms-api-java-2.0.7/.m2
+maven.repo.local=/home/ellert/Fedora-GIT/voms-api-java/voms-api-java-2.0.8/.m2
maven.build.outputDir=${maven.build.dir}/classes
diff --git a/maven-build.xml b/maven-build.xml
index 39deccb..ac429f2 100644
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -10,7 +10,7 @@
<!-- -->
<!-- Any modifications will be overwritten. -->
<!-- -->
-<!-- Generated by Maven Ant Plugin on 3/22/12 12:41 AM -->
+<!-- Generated by Maven Ant Plugin on 5/24/12 11:15 PM -->
<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
<!-- -->
<!-- ====================================================================== -->
@@ -24,7 +24,7 @@
<property file="${user.home}/.m2/maven.properties"/>
<property file="maven-build.properties"/>
- <property name="maven.build.finalName" value="voms-api-java-2.0.7"/>
+ <property name="maven.build.finalName" value="voms-api-java-2.0.8"/>
<property name="maven.build.dir" value="target"/>
<property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
<property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -44,14 +44,15 @@
<!-- ====================================================================== -->
<path id="build.classpath">
- <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45.jar"/>
+ <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/>
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.1/commons-cli-1.1.jar"/>
<pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
</path>
<path id="build.test.classpath">
<pathelement location="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45.jar"/>
+ <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <pathelement location="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"/>
<pathelement location="${maven.repo.local}/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.1/commons-cli-1.1.jar"/>
<pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
@@ -243,9 +244,14 @@
dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar"
usetimestamp="false"
ignoreerrors="true"/>
- <mkdir dir="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.45"/>
- <get src="http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45.jar"
- dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45.jar"
+ <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
+ <get src="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"
+ dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"
+ usetimestamp="false"
+ ignoreerrors="true"/>
+ <mkdir dir="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46"/>
+ <get src="http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"
+ dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar"
usetimestamp="false"
ignoreerrors="true"/>
<mkdir dir="${maven.repo.local}/log4j/log4j/1.2.14"/>
diff --git a/voms-api-java.spec b/voms-api-java.spec
index 5b17f9f..abdcef7 100644
--- a/voms-api-java.spec
+++ b/voms-api-java.spec
@@ -6,8 +6,8 @@
%endif
Name: voms-api-java
-Version: 2.0.7
-Release: 2%{?dist}
+Version: 2.0.8
+Release: 1%{?dist}
Summary: Virtual Organization Membership Service Java API
Group: Development/Libraries
@@ -16,8 +16,8 @@ URL: http://glite.web.cern.ch/glite/
# This source tarball is created from a git checkout:
# git clone git://github.com/italiangrid/voms-api-java.git
# cd voms-api-java
-# git archive --format tar --prefix voms-api-java-2.0.7/ 2_0_7 \
-# | gzip - > ../voms-api-java-2.0.7.tar.gz
+# git archive --format tar --prefix voms-api-java-2.0.8/ 2_0_8 \
+# | gzip - > ../voms-api-java-2.0.8.tar.gz
Source0: %{name}-%{version}.tar.gz
# These are build instructions for ant generated from the maven
# build instrutions using the maven ant plugin.
@@ -97,14 +97,14 @@ install -m 644 %SOURCE1 .
install -m 644 %SOURCE2 .
install -m 644 %SOURCE3 .
-sed s/bcprov-ext-jdk15/bcprov-jdk16/ -i pom.xml
+sed -e s/bcprov-ext-jdk16/bcprov-jdk16/ -e s/1.45/1.46/ -i pom.xml
%build
%if %{maven}
mvn-rpmbuild install javadoc:aggregate
%else
-CLASSPATH=$(build-classpath bcprov log4j jakarta-commons-cli \
- jakarta-commons-lang) ant package javadoc
+export CLASSPATH=$(build-classpath bcprov log4j commons-cli commons-lang)
+ant package javadoc
%endif
%install
@@ -144,6 +144,9 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_javadocdir}/%{name}
%changelog
+* Thu May 24 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.8-1
+- Update to version 2.0.8 (EMI 2 version)
+
* Mon Apr 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.7-2
- Fix compatibility maven fragment
More information about the scm-commits
mailing list