[jasypt] update to 1.9.2

[gil]

commit cf5cfdcd7cd10f713cc519d164c024f5f7dcc416
Author: gil <puntogil at libero.it>
Date:   Fri Feb 20 13:35:30 2015 +0100

    update to 1.9.2

 .gitignore  |  1 +
 jasypt.spec | 37 ++++++++++++++++++++++---------------
 sources     |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e27c2d3..be2f2b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jasypt-1.9.0-src-svn.tar.gz
+/jasypt-1.9.2.tar.xz
diff --git a/jasypt.spec b/jasypt.spec
index 64fa041..b313df2 100644
--- a/jasypt.spec
+++ b/jasypt.spec
@@ -1,18 +1,18 @@
 Name:          jasypt
-Version:       1.9.0
-Release:       9%{?dist}
+Version:       1.9.2
+Release:       1%{?dist}
 Summary:       Java Simplified Encryption
 License:       ASL 2.0
 Url:           http://www.jasypt.org/
-# svn export https://jasypt.svn.sourceforge.net/svnroot/jasypt/tags/jasypt/jasypt-1.9.0 jasypt-1.9.0
-# tar czf jasypt-1.9.0-src-svn.tar.gz jasypt-1.9.0
-Source0:       %{name}-%{version}-src-svn.tar.gz
+# svn export https://jasypt.svn.sourceforge.net/svnroot/jasypt/tags/jasypt/jasypt-1.9.2 jasypt-1.9.2
+# tar cJf jasypt-1.9.2.tar.xz jasypt-1.9.2
+Source0:       %{name}-%{version}.tar.xz
 # remove internal commons-codec 1.3
-Patch0:        %{name}-%{version}-use-system-commons-codec.patch
+Patch0:        %{name}-1.9.0-use-system-commons-codec.patch
 # tks to jhernand
 # system commons-codec 1.4 support
-Patch1:        %{name}-%{version}-StandardStringDigester.patch
-Patch2:        %{name}-%{version}-StandardPBEStringEncryptor.patch
+Patch1:        %{name}-1.9.0-StandardStringDigester.patch
+Patch2:        %{name}-1.9.0-StandardPBEStringEncryptor.patch
 
 # test deps
 BuildRequires: apache-commons-lang
@@ -25,8 +25,6 @@ BuildRequires: icu4j
 BuildRequires: tomcat-servlet-3.0-api
 
 BuildRequires: maven-local
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-source-plugin
 
 BuildArch:     noarch
 
@@ -47,22 +45,28 @@ This package contains javadoc for %{name}.
 %patch2 -p0
 
 %pom_remove_plugin :maven-gpg-plugin
-%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:reportOutputDirectory"
+%pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin :maven-source-plugin
+%pom_remove_plugin :maven-assembly-plugin
+
+%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
 %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-resources-plugin']/pom:configuration"
 %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-resources-plugin']" "
 <configuration>
   <encoding>UTF-8</encoding>
 </configuration>"
+
 %pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration"
 %pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']" "
 <configuration>
-  <source>1.5</source>
-  <target>1.5</target>
+  <source>1.6</source>
+  <target>1.6</target>
   <encoding>UTF-8</encoding>
 </configuration>"
 
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='org.bouncycastle']/pom:artifactId" bcprov-jdk16
-%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='org.bouncycastle']/pom:version" 1.46
+%pom_remove_dep bouncycastle:bcprov-jdk12
+%pom_add_dep org.bouncycastle:bcprov-jdk16:1.46:test
+
 %pom_add_dep commons-logging:commons-logging::test
 
 # force tomcat-servlet-3.0-api use
@@ -86,6 +90,9 @@ This package contains javadoc for %{name}.
 %license LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Feb 20 2015 gil cattaneo <puntogil at libero.it> 1.9.2-1
+- update to 1.9.2
+
 * Fri Feb 06 2015 gil cattaneo <puntogil at libero.it> 1.9.0-9
 - introduce license macro
 
diff --git a/sources b/sources
index 31da7d9..37b91ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1853b1fa020d3b5ee0cd7a4e82ab3d91  jasypt-1.9.0-src-svn.tar.gz
+0c5bf391f2f253df36ca1d7e69639924  jasypt-1.9.2.tar.xz