[bouncycastle-pg] update to 1.48

gil gil at fedoraproject.org
Fri Feb 22 15:13:39 UTC 2013


commit ee3c3d8be06f6bf68685c7b0d7873ad5b5c2c93f
Author: gil <puntogil at libero.it>
Date:   Fri Feb 22 16:13:08 2013 +0100

    update to 1.48

 .gitignore                     |    1 +
 bcpg-jdk15on-1.48.pom          |   41 ++++++++
 bouncycastle-pg-1.48-OSGi.bnd  |   44 ++++++++
 bouncycastle-pg-1.48-build.xml |  218 ++++++++++++++++++++++++++++++++++++++++
 bouncycastle-pg.spec           |   15 ++-
 sources                        |    2 +-
 6 files changed, 314 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dac4dcd..e40547f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /bcpg-jdk15on-146.tar.gz
 /bcpg-jdk16-146.tar.gz
+/bcpg-jdk15on-148.tar.gz
diff --git a/bcpg-jdk15on-1.48.pom b/bcpg-jdk15on-1.48.pom
new file mode 100644
index 0000000..773589b
--- /dev/null
+++ b/bcpg-jdk15on-1.48.pom
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcpg-jdk15on</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle OpenPGP API</name>
+  <version>1.48</version>
+  <description>The Bouncy Castle Java API for handling the OpenPGP protocol. This jar contains the OpenPGP API for JDK 1.5 to JDK 1.7. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs.</description>
+  <url>http://www.bouncycastle.org/java.html</url>
+  <licenses>
+    <license>
+      <name>Bouncy Castle Licence</name>
+      <url>http://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+    <license>
+      <name>Apache Software License, Version 1.1</name>
+      <url>http://www.apache.org/licenses/LICENSE-1.1</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+  </scm>
+  <developers>
+    <developer>
+      <id>feedback-crypto</id>
+      <name>The Legion of the Bouncy Castle</name>
+      <email>feedback-crypto at bouncycastle.org</email>
+    </developer>
+  </developers>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.48</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/bouncycastle-pg-1.48-OSGi.bnd b/bouncycastle-pg-1.48-OSGi.bnd
new file mode 100644
index 0000000..6070a19
--- /dev/null
+++ b/bouncycastle-pg-1.48-OSGi.bnd
@@ -0,0 +1,44 @@
+# BND/OSGI Properties by gil
+Import-Package: \
+ javax.crypto;resolution:=optional, \
+ javax.crypto.spec;resolution:=optional, \
+ org.bouncycastle.asn1;resolution:=optional, \
+ org.bouncycastle.crypto;resolution:=optional, \
+ org.bouncycastle.crypto.digests;resolution:=optional, \
+ org.bouncycastle.crypto.encodings;resolution:=optional, \
+ org.bouncycastle.crypto.engines;resolution:=optional, \
+ org.bouncycastle.crypto.io;resolution:=optional, \
+ org.bouncycastle.crypto.modes;resolution:=optional, \
+ org.bouncycastle.crypto.params;resolution:=optional, \
+ org.bouncycastle.crypto.signers;resolution:=optional, \
+ org.bouncycastle.jcajce;resolution:=optional, \
+ org.bouncycastle.jce.interfaces;resolution:=optional, \
+ org.bouncycastle.jce.provider;resolution:=optional, \
+ org.bouncycastle.jce.spec;resolution:=optional, \
+ org.bouncycastle.util;resolution:=optional, \
+ org.bouncycastle.util.encoders;resolution:=optional, \
+ org.bouncycastle.util.io;resolution:=optional
+Export-Package: \
+ org.bouncycastle.apache.bzip2, \
+ org.bouncycastle.bcpg, \
+ org.bouncycastle.bcpg.attr, \
+ org.bouncycastle.bcpg.sig, \
+ org.bouncycastle.openpgp, \
+ org.bouncycastle.openpgp.examples, \
+ org.bouncycastle.openpgp.operator, \
+ org.bouncycastle.openpgp.operator.bc, \
+ org.bouncycastle.openpgp.operator.jcajce
+Bundle-ManifestVersion: 2
+Bundle-Name: bcpg
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7
+Bundle-SymbolicName: bcpg
+Bundle-Version: 1.46
+Built-By: ${user.name}
+Extension-Name: org.bouncycastle.bcpg
+Implementation-Vendor: BouncyCastle.org
+Implementation-Vendor-Id: org.bouncycastle
+Implementation-Version: 1.48.0
+Originally-Created-By: ${java.version} (${java.vendor})
+Specification-Vendor: BouncyCastle.org
+Specification-Version: 1.1
+Trusted-Library: true
\ No newline at end of file
diff --git a/bouncycastle-pg-1.48-build.xml b/bouncycastle-pg-1.48-build.xml
new file mode 100644
index 0000000..a258ec6
--- /dev/null
+++ b/bouncycastle-pg-1.48-build.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- bcpg 1.46 by gil -->
+<!-- bcpg 1.48 by gil -->
+<!-- ====================================================================== -->
+
+<project name="build-bcpg" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+
+  <property name="build.version" value="1.48"/>
+  <property name="jar.name" value="bcpg"/>
+  <property name="build.dir" value="build"/>
+  <property name="build.classes" value="${build.dir}/classes"/>
+  <property name="build.src" value="src/java"/>
+  <property name="build.test.classes" value="${build.dir}/test-classes"/>
+  <property name="build.test.src" value="src/test"/>
+  <property name="test.reports" value="${build.dir}/test-reports"/>
+  <property name="reporting.apis" value="${build.dir}/apidocs"/>
+
+  <property name="j2se.api" value="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="/usr/share/java">
+      <include name="bcprov.jar"/>
+    </fileset>
+  </path>
+  <path id="build.test.classpath">
+    <path refid="build.classpath"/>
+    <fileset dir="/usr/share/java">
+      <include name="junit.jar"/>
+      <include name="ant/ant-junit.jar"/>
+    </fileset>
+  </path>
+  <path id="javadoc.classpath">
+    <path refid="build.classpath"/>
+    <fileset dir="${build.dir}" includes="${jar.name}.jar"/>
+  </path>
+  
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.classes}"/>
+    <javac destdir="${build.classes}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${build.src}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="test.skip">
+    <mkdir dir="${build.test.classes}"/>
+    <javac destdir="${build.test.classes}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="1.5" 
+           verbose="false" 
+           fork="false" 
+           source="1.5">
+      <src>
+        <pathelement location="${build.test.src}"/>
+      </src>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${build.classes}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${build.classes}"/>
+        <pathelement location="${build.test.classes}"/>
+      </classpath>
+      <formatter type="brief" usefile="no"/>
+      <batchtest haltonfailure="yes">
+        <fileset dir="${build.test.src}">
+          <include name="**/AllTests.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available file="/usr/share/java/junit4.jar" property="junit.present"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.src}"
+             packagenames="*" 
+             destdir="${reporting.apis}" 
+             access="protected" 
+             old="false" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             source="1.4" 
+             linksource="false" 
+             breakiterator="false">
+             <classpath refid="javadoc.classpath"/>
+             <doctitle><![CDATA[<h1>Bouncy Castle Cryptography Library ${build.version} API</h1>]]></doctitle>
+             <link href="${j2se.api}"/>
+    </javadoc>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" >
+    <classpath>
+     <fileset dir="/usr/share/java" includes="aqute-bnd.jar" />
+    </classpath>
+  </taskdef>
+  
+  <target name="package" depends="compile,test" description="Package the application">
+    <bnd
+         classpath="${build.classes}"
+         failok="false"
+         exceptions="false"
+         files="bcpg.bnd"
+         output="${build.dir}/${jar.name}.jar"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
diff --git a/bouncycastle-pg.spec b/bouncycastle-pg.spec
index ca02556..ffccb94 100644
--- a/bouncycastle-pg.spec
+++ b/bouncycastle-pg.spec
@@ -1,15 +1,15 @@
-%global ver 146
-%global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
+%global ver 148
+%global archivever  jdk15on-%(echo %{ver}|sed 's|\\\.||')
 Name:          bouncycastle-pg
-Version:       1.46
-Release:       9%{?dist}
+Version:       1.48
+Release:       1%{?dist}
 Summary:       Bouncy Castle OpenPGP API
 Group:         Development/Libraries
 License:       MIT
 URL:           http://www.bouncycastle.org/
 Source0:       http://www.bouncycastle.org/download/bcpg-%{archivever}.tar.gz
-Source1:       http://repo2.maven.org/maven2/org/bouncycastle/bcpg-jdk16/%{version}/bcpg-jdk16-%{version}.pom
-Source2:       bouncycastle-pg-%{version}-01-build.xml
+Source1:       http://repo2.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/%{version}/bcpg-jdk15on-%{version}.pom
+Source2:       bouncycastle-pg-%{version}-build.xml
 Source3:       bouncycastle-pg-%{version}-OSGi.bnd
 
 BuildRequires: java-devel
@@ -95,6 +95,9 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcpg.pom
 %doc LICENSE.html
 
 %changelog
+* Fri Feb 22 2013 gil cattaneo <puntogil at libero.it> 1.48-1
+- update to 1.48
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.46-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 453ea47..fa6fe47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8c3b1c4f1e1474da8edf1caf8c193cb  bcpg-jdk16-146.tar.gz
+a29d5545b47c5a9aa6268ccf60e84e03  bcpg-jdk15on-148.tar.gz


More information about the scm-commits mailing list