[not-yet-commons-ssl] Update to upstream 0.3.15.

[Alexander Kurtakov]

commit ae436c0b12e1d03a9c09a31772ce8ebdbe41e6d5
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Sep 9 09:48:24 2014 +0300

    Update to upstream 0.3.15.
    
    - Fixes CVE-2014-3604 .

 .gitignore                                         |    1 +
 ...sl-0.3.11.pom => not-yet-commons-ssl-0.3.15.pom |    6 +++---
 not-yet-commons-ssl-MANIFEST.MF                    |    2 +-
 not-yet-commons-ssl.spec                           |   18 +++++++++++-------
 sources                                            |    2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fb0aa6a..478681c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 not-yet-commons-ssl-0.3.11.zip
+/not-yet-commons-ssl-0.3.15.zip
diff --git a/not-yet-commons-ssl-0.3.11.pom b/not-yet-commons-ssl-0.3.15.pom
similarity index 93%
rename from not-yet-commons-ssl-0.3.11.pom
rename to not-yet-commons-ssl-0.3.15.pom
index 63c7845..7849c72 100644
--- a/not-yet-commons-ssl-0.3.11.pom
+++ b/not-yet-commons-ssl-0.3.15.pom
@@ -21,7 +21,7 @@
   <groupId>ca.juliusdavies</groupId>
   <artifactId>not-yet-commons-ssl</artifactId>
   <name>Not Yet Commons SSL</name>
-  <version>0.3.11</version>
+  <version>0.3.15</version>
   <description>A Java SSL component library</description>
   <url>http://juliusdavies.ca/commons-ssl</url>
   <licenses>
@@ -31,7 +31,7 @@
     </license>
   </licenses>
   <scm>
-    <connection>http://juliusdavies.ca/svn/not-yet-commons-ssl/tags/commons-ssl-0.3.11/</connection>
-    <url>http://juliusdavies.ca/svn/viewvc.cgi/not-yet-commons-ssl/tags/commons-ssl-0.3.11/</url>
+    <connection>http://juliusdavies.ca/svn/not-yet-commons-ssl/tags/commons-ssl-0.3.15/</connection>
+    <url>http://juliusdavies.ca/svn/viewvc.cgi/not-yet-commons-ssl/tags/commons-ssl-0.3.15/</url>
   </scm>
 </project>
\ No newline at end of file
diff --git a/not-yet-commons-ssl-MANIFEST.MF b/not-yet-commons-ssl-MANIFEST.MF
index 0500657..00770c8 100644
--- a/not-yet-commons-ssl-MANIFEST.MF
+++ b/not-yet-commons-ssl-MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Not-yet Commons SSL
 Bundle-SymbolicName: org.apache.commons.ssl
-Bundle-Version: 0.3.11
+Bundle-Version: 0.3.15
 Export-Package: org.apache.commons.httpclient.contrib.ssl,
  org.apache.commons.ssl,
  org.apache.commons.ssl.asn1,
diff --git a/not-yet-commons-ssl.spec b/not-yet-commons-ssl.spec
index 56b4209..181ca43 100644
--- a/not-yet-commons-ssl.spec
+++ b/not-yet-commons-ssl.spec
@@ -1,14 +1,14 @@
 Name:           not-yet-commons-ssl
-Version:        0.3.11
-Release:        12%{?dist}
+Version:        0.3.15
+Release:        1%{?dist}
 Summary:        Library to make SSL and Java Easier
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://juliusdavies.ca/commons-ssl
-Source0:        http://juliusdavies.ca/commons-ssl/not-yet-commons-ssl-0.3.11.zip
+Source0:        http://juliusdavies.ca/commons-ssl/not-yet-commons-ssl-%{version}.zip
 Source1:        %{name}-MANIFEST.MF
-Source2:		%{name}-%{version}.pom
+Source2:        %{name}-%{version}.pom
 BuildArch:      noarch
 
 BuildRequires:  ant
@@ -17,10 +17,10 @@ BuildRequires:  log4j
 BuildRequires:  jakarta-commons-httpclient
 BuildRequires:  bouncycastle
 BuildRequires:  ant-junit
+BuildRequires:  mockito
 BuildRequires:  zip
 Requires:       log4j
 Requires:       jakarta-commons-httpclient
-Requires:       jpackage-utils
 
 %description
 Commons-SSL lets you control the SSL options you need in an 
@@ -31,7 +31,6 @@ bleed into the rest of your system.
 Summary:        API documentation for %{name}
 Group:          Documentation
 Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -42,9 +41,10 @@ This package contains the API documentation for %{name}.
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 rm -fr javadocs/
+sed -i -e 's|optimize="false"|optimize="false" encoding="UTF-8"|g' build.xml
 
 %build
-export CLASSPATH=$(build-classpath log4j commons-httpclient bcprov)
+export CLASSPATH=$(build-classpath log4j commons-httpclient bcprov mockito)
 ant -Dbuild.sysclasspath=first jar test javadoc
 
 # inject OSGi manifests
@@ -74,6 +74,10 @@ install -pm 644 %{SOURCE2} \
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Sep 9 2014 Alexander Kurtakov <akurtako at redhat.com> 0.3.15-1
+- Update to upstream 0.3.15.
+- Fixes CVE-2014-3604 .
+
 * Mon Jun 9 2014 Alexander Kurtakov <akurtako at redhat.com> 0.3.11-12
 - Fix FTBFS.
 
diff --git a/sources b/sources
index c3d2e02..e37c7c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-716ac79b162dc5a964d6c7ac863def46  not-yet-commons-ssl-0.3.11.zip
+f62d7f7f890ac03a0210d1be7571b21e  not-yet-commons-ssl-0.3.15.zip