[jasypt] switch to XMvn
gil
gil at fedoraproject.org
Mon Jul 8 11:43:31 UTC 2013
commit 2d163024fb83b5f7f0c91364eb9293c1b313cd09
Author: gil <puntogil at libero.it>
Date: Mon Jul 8 13:43:01 2013 +0200
switch to XMvn
jasypt-1.9.0-depmap | 15 -----
jasypt-1.9.0-pom.patch | 77 -----------------------
jasypt-1.9.0-use-system-commons-codec.patch | 34 +++++-----
jasypt.spec | 88 ++++++++++++---------------
4 files changed, 55 insertions(+), 159 deletions(-)
---
diff --git a/jasypt-1.9.0-use-system-commons-codec.patch b/jasypt-1.9.0-use-system-commons-codec.patch
index 5545d11..9546d5e 100644
--- a/jasypt-1.9.0-use-system-commons-codec.patch
+++ b/jasypt-1.9.0-use-system-commons-codec.patch
@@ -1,21 +1,21 @@
diff -Nru jasypt-1.9.0/pom.xml jasypt-1.9.0-gil/pom.xml
---- jasypt-1.9.0/pom.xml 2012-08-29 00:16:13.686707103 +0200
-+++ jasypt-1.9.0-gil/pom.xml 2012-08-29 00:17:47.125044769 +0200
-@@ -235,7 +235,13 @@
- <optional>true</optional>
- <systemPath>${_javadir}/icu4j.jar</systemPath>
+--- jasypt-1.9.0/pom.xml 2011-12-18 10:34:50.000000000 +0100
++++ jasypt-1.9.0-gil/pom.xml 2013-07-08 13:33:58.033580327 +0200
+@@ -236,6 +236,14 @@
</dependency>
--
-+ <dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.4</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
- <dependency>
++
++ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.4</version>
diff -Nru jasypt-1.9.0/src/main/java/org/jasypt/contrib/org/apache/commons/codec_1_3/binary/Base64.java jasypt-1.9.0-gil/src/main/java/org/jasypt/contrib/org/apache/commons/codec_1_3/binary/Base64.java
--- jasypt-1.9.0/src/main/java/org/jasypt/contrib/org/apache/commons/codec_1_3/binary/Base64.java 2010-10-10 12:19:03.000000000 +0200
+++ jasypt-1.9.0-gil/src/main/java/org/jasypt/contrib/org/apache/commons/codec_1_3/binary/Base64.java 1970-01-01 01:00:00.000000000 +0100
@@ -861,7 +861,7 @@ diff -Nru jasypt-1.9.0/src/main/java/org/jasypt/contrib/org/apache/commons/codec
-
diff -Nru jasypt-1.9.0/src/main/java/org/jasypt/digest/StandardStringDigester.java jasypt-1.9.0-gil/src/main/java/org/jasypt/digest/StandardStringDigester.java
--- jasypt-1.9.0/src/main/java/org/jasypt/digest/StandardStringDigester.java 2010-10-25 22:52:23.000000000 +0200
-+++ jasypt-1.9.0-gil/src/main/java/org/jasypt/digest/StandardStringDigester.java 2012-08-29 00:11:55.785303352 +0200
++++ jasypt-1.9.0-gil/src/main/java/org/jasypt/digest/StandardStringDigester.java 2013-07-08 13:33:03.259512325 +0200
@@ -22,7 +22,7 @@
import java.security.Provider;
@@ -873,7 +873,7 @@ diff -Nru jasypt-1.9.0/src/main/java/org/jasypt/digest/StandardStringDigester.ja
import org.jasypt.exceptions.AlreadyInitializedException;
diff -Nru jasypt-1.9.0/src/main/java/org/jasypt/encryption/pbe/StandardPBEStringEncryptor.java jasypt-1.9.0-gil/src/main/java/org/jasypt/encryption/pbe/StandardPBEStringEncryptor.java
--- jasypt-1.9.0/src/main/java/org/jasypt/encryption/pbe/StandardPBEStringEncryptor.java 2011-12-08 03:15:37.000000000 +0100
-+++ jasypt-1.9.0-gil/src/main/java/org/jasypt/encryption/pbe/StandardPBEStringEncryptor.java 2012-08-29 00:11:55.787303258 +0200
++++ jasypt-1.9.0-gil/src/main/java/org/jasypt/encryption/pbe/StandardPBEStringEncryptor.java 2013-07-08 13:33:03.232513771 +0200
@@ -22,7 +22,7 @@
import java.security.Provider;
@@ -885,7 +885,7 @@ diff -Nru jasypt-1.9.0/src/main/java/org/jasypt/encryption/pbe/StandardPBEString
import org.jasypt.exceptions.AlreadyInitializedException;
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/digest/StandardStringDigesterInvertedSaltTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/digest/StandardStringDigesterInvertedSaltTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/digest/StandardStringDigesterInvertedSaltTest.java 2010-10-21 01:29:54.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/digest/StandardStringDigesterInvertedSaltTest.java 2012-08-29 00:11:55.788303210 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/digest/StandardStringDigesterInvertedSaltTest.java 2013-07-08 13:33:03.208515056 +0200
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
@@ -897,7 +897,7 @@ diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/digest/StandardStringDigesterInv
public class StandardStringDigesterInvertedSaltTest extends TestCase {
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/digest/StandardStringDigesterTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/digest/StandardStringDigesterTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/digest/StandardStringDigesterTest.java 2010-10-16 20:38:04.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/digest/StandardStringDigesterTest.java 2012-08-29 00:11:55.789303162 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/digest/StandardStringDigesterTest.java 2013-07-08 13:33:03.212514841 +0200
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
@@ -909,7 +909,7 @@ diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/digest/StandardStringDigesterTes
import org.jasypt.salt.FixedByteArraySaltGenerator;
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/password/BasicPasswordEncryptorTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/BasicPasswordEncryptorTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/util/password/BasicPasswordEncryptorTest.java 2010-10-16 20:38:04.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/BasicPasswordEncryptorTest.java 2012-08-29 00:11:55.790303114 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/BasicPasswordEncryptorTest.java 2013-07-08 13:33:03.208515056 +0200
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
@@ -921,7 +921,7 @@ diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/password/BasicPasswordEncry
public class BasicPasswordEncryptorTest extends TestCase {
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/password/ConfigurablePasswordEncryptorTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/ConfigurablePasswordEncryptorTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/util/password/ConfigurablePasswordEncryptorTest.java 2010-10-16 20:38:04.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/ConfigurablePasswordEncryptorTest.java 2012-08-29 00:11:55.791303066 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/ConfigurablePasswordEncryptorTest.java 2013-07-08 13:33:03.207515109 +0200
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
@@ -933,7 +933,7 @@ diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/password/ConfigurablePasswo
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/password/StrongPasswordEncryptorTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/StrongPasswordEncryptorTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/util/password/StrongPasswordEncryptorTest.java 2010-10-16 20:38:04.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/StrongPasswordEncryptorTest.java 2012-08-29 00:11:55.791303066 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/password/StrongPasswordEncryptorTest.java 2013-07-08 13:33:03.207515109 +0200
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
@@ -945,7 +945,7 @@ diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/password/StrongPasswordEncr
public class StrongPasswordEncryptorTest extends TestCase {
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/text/BasicTextEncryptorTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/util/text/BasicTextEncryptorTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/util/text/BasicTextEncryptorTest.java 2010-10-16 20:38:04.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/text/BasicTextEncryptorTest.java 2012-08-29 00:11:55.791303066 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/text/BasicTextEncryptorTest.java 2013-07-08 13:33:03.208515056 +0200
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
@@ -957,7 +957,7 @@ diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/text/BasicTextEncryptorTest
public class BasicTextEncryptorTest extends TestCase {
diff -Nru jasypt-1.9.0/src/test/java/org/jasypt/util/text/StrongTextEncryptorTest.java jasypt-1.9.0-gil/src/test/java/org/jasypt/util/text/StrongTextEncryptorTest.java
--- jasypt-1.9.0/src/test/java/org/jasypt/util/text/StrongTextEncryptorTest.java 2010-10-16 20:38:04.000000000 +0200
-+++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/text/StrongTextEncryptorTest.java 2012-08-29 00:11:55.792303018 +0200
++++ jasypt-1.9.0-gil/src/test/java/org/jasypt/util/text/StrongTextEncryptorTest.java 2013-07-08 13:33:03.208515056 +0200
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
diff --git a/jasypt.spec b/jasypt.spec
index f22f7d8..407ab1e 100644
--- a/jasypt.spec
+++ b/jasypt.spec
@@ -1,31 +1,20 @@
Name: jasypt
Version: 1.9.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Java Simplified Encryption
-Group: Development/Libraries
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
-# force tomcat-servlet-3.0-api use
-Source1: %{name}-%{version}-depmap
-# remove maven-gpg-plugin
-# fix encoding (changed US-ASCII in UTF-8)
-# fix bouncycastle: artifactId version
-# add commons-logging for test
-# add icu4j systemPath
-# fix compiler plugin target/source 1.5
-Patch0: %{name}-%{version}-pom.patch
# remove internal commons-codec 1.3
-Patch1: %{name}-%{version}-use-system-commons-codec.patch
+Patch0: %{name}-%{version}-use-system-commons-codec.patch
# tks to jhernand
# system commons-codec 1.4 support
-Patch2: %{name}-%{version}-StandardStringDigester.patch
-Patch3: %{name}-%{version}-StandardPBEStringEncryptor.patch
+Patch1: %{name}-%{version}-StandardStringDigester.patch
+Patch2: %{name}-%{version}-StandardPBEStringEncryptor.patch
BuildRequires: java-devel
-BuildRequires: jpackage-utils
# test deps
BuildRequires: apache-commons-lang
@@ -39,21 +28,9 @@ BuildRequires: tomcat-servlet-3.0-api
BuildRequires: maven-local
BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
-Requires: apache-commons-codec
-Requires: icu4j
-Requires: tomcat-servlet-3.0-api
-
-Requires: java
-Requires: jpackage-utils
BuildArch: noarch
%description
@@ -61,47 +38,58 @@ Java library which enables encryption
in java apps with minimum effort.
%package javadoc
-Group: Documentation
Summary: Javadoc for %{name}
-Requires: jpackage-utils
%description javadoc
This package contains javadoc for %{name}.
%prep
%setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p1
+%patch1 -p0
%patch2 -p0
-%patch3 -p0
-
-%build
-
-mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE1} -D_javadir=%{_javadir} install javadoc:aggregate
-%install
+%pom_remove_plugin :maven-gpg-plugin
+%pom_xpath_remove "pom:project/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:reportOutputDirectory"
+%pom_xpath_remove "pom:project/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-resources-plugin']/pom:configuration"
+%pom_xpath_inject "pom:project/pom:inject/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-resources-plugin']" "
+<configuration>
+ <encoding>UTF-8</encoding>
+</configuration>"
+%pom_xpath_remove "pom:project/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration"
+%pom_xpath_inject "pom:project/pom:inject/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']" "
+<configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>UTF-8</encoding>
+</configuration>"
+
+%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId='org.bouncycastle']/pom:artifactId" bcprov-jdk16
+%pom_xpath_inject "pom:project/pom:dependencies/pom:dependency[pom:groupId='org.bouncycastle']/pom:version" 1.46
+%pom_add_dep commons-logging:commons-logging::test
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+# force tomcat-servlet-3.0-api use
+%pom_remove_dep javax.servlet:servlet-api
+%pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%build
+%mvn_file :%{name} %{name}
+%mvn_file
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api/jasypt/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
%doc *.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%doc LICENSE.txt NOTICE.txt
%changelog
+* Mon Jul 08 2013 gil cattaneo <puntogil at libero.it> 1.9.0-5
+- switch to XMvn
+- minor changes to adapt to current guideline
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list