[wss4j] update to 1.6.18

gil gil at fedoraproject.org
Thu Feb 12 04:30:05 UTC 2015


commit 27a1f818e53c4faa64d0eff51c85f582624ee61e
Author: gil <puntogil at libero.it>
Date:   Thu Feb 12 05:29:49 2015 +0100

    update to 1.6.18

 .gitignore |    1 +
 sources    |    2 +-
 wss4j.spec |   21 +++++++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d21d5b..1acceeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /wss4j-src-1.6.10.zip
 /wss4j-src-1.6.15.zip
 /wss4j-src-1.6.17.zip
+/wss4j-src-1.6.18.zip
diff --git a/sources b/sources
index 5cb9590..8ccdc58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5646dcfc23b6f4eb2e4917877cca9b1b  wss4j-src-1.6.17.zip
+1e3e6cb202eeb706b7aad6d3f6f8253f  wss4j-src-1.6.18.zip
diff --git a/wss4j.spec b/wss4j.spec
index 4c02552..ec5bda4 100644
--- a/wss4j.spec
+++ b/wss4j.spec
@@ -1,10 +1,10 @@
 Name:           wss4j 
-Version:        1.6.17
-Release:        2%{?dist}
+Version:        1.6.18
+Release:        1%{?dist}
 Summary:        Apache WS-Security implementation
 License:        ASL 2.0
 URL:            http://ws.apache.org/wss4j/
-Source0:        http://archive.apache.org/dist/ws/wss4j/1_6_17/wss4j-src-%{version}.zip
+Source0:        http://archive.apache.org/dist/ws/wss4j/1_6_18/wss4j-src-%{version}.zip
 
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(junit:junit)
@@ -21,12 +21,8 @@ BuildRequires:  dos2unix
 BuildRequires:  maven-local
 BuildRequires:  maven-shared
 BuildRequires:  maven-remote-resources-plugin
-BuildRequires:  maven-surefire-provider-junit
-
-%if 0%{?fedora} > 17
 BuildRequires:  plexus-pom
 BuildRequires:  plexus-components-pom
-%endif
 
 BuildArch:      noarch
 
@@ -49,11 +45,17 @@ This package contains the API documentation for %{name}.
 # Reporting mojo's can only be called from ReportDocumentRender
 %pom_remove_plugin "org.apache.maven.plugins:maven-pmd-plugin"
 
+%pom_remove_plugin :maven-source-plugin
+%pom_xpath_remove "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:executions"
+%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:source" 1.6
+%pom_xpath_set "pom:build/pom:pluginManagement/pom:plugins/pom:plugin[pom:artifactId = 'maven-compiler-plugin']/pom:configuration/pom:target" 1.6
+
 dos2unix NOTICE
 
 # Fails on java8
 rm -r src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java \
- src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
+ src/test/java/org/apache/ws/security/message/SignatureCRLTest.java \
+ src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java
 
 %build
 %mvn_build
@@ -70,6 +72,9 @@ rm -r src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java \
 %license LICENSE.txt NOTICE
 
 %changelog
+* Thu Feb 12 2015 gil cattaneo <puntogil at libero.it> 1.6.18-1
+- update to 1.6.18
+
 * Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 1.6.17-2
 - introduce license macro
 


More information about the scm-commits mailing list