[ehcache-core] try to fix java8 build problems
by gil
commit 003cf3770f5234896cef48ac7e7483ab3c84106e
Author: gil <puntogil(a)libero.it>
Date: Mon Apr 7 12:37:43 2014 +0200
try to fix java8 build problems
ehcache-core-2.6.7-java8.patch | 29 +++++++++++++++++++++++++++++
ehcache-core.spec | 2 ++
2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/ehcache-core-2.6.7-java8.patch b/ehcache-core-2.6.7-java8.patch
new file mode 100644
index 0000000..361fead
--- /dev/null
+++ b/ehcache-core-2.6.7-java8.patch
@@ -0,0 +1,29 @@
+--- src/main/java/net/sf/ehcache/config/CacheConfiguration.java 2013-01-17 08:54:30.000000000 +0100
++++ src/main/java/net/sf/ehcache/config/CacheConfiguration.java-ebourg 2014-04-07 12:33:12.176458079 +0200
+@@ -2543,7 +2543,7 @@
+ /**
+ * Accessor
+ */
+- public List getCacheEventListenerConfigurations() {
++ public List<CacheEventListenerFactoryConfiguration> getCacheEventListenerConfigurations() {
+ return cacheEventListenerConfigurations;
+ }
+
+@@ -2552,7 +2552,7 @@
+ *
+ * @return the configuration
+ */
+- public List getCacheExtensionConfigurations() {
++ public List<CacheExtensionFactoryConfiguration> getCacheExtensionConfigurations() {
+ return cacheExtensionConfigurations;
+ }
+
+@@ -2561,7 +2561,7 @@
+ *
+ * @return the configuration
+ */
+- public List getCacheLoaderConfigurations() {
++ public List<CacheLoaderFactoryConfiguration> getCacheLoaderConfigurations() {
+ return cacheLoaderConfigurations;
+ }
+
diff --git a/ehcache-core.spec b/ehcache-core.spec
index a926892..271bb35 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -11,6 +11,7 @@ URL: http://ehcache.org/
# find ehcache-core-2.6.7 -name '*.class' -delete
# tar czf ehcache-core-2.6.7-clean-src-svn.tar.gz ehcache-core-2.6.7
Source0: %{name}-%{version}-clean-src-svn.tar.gz
+Patch0: %{name}-2.6.7-java8.patch
BuildRequires: ehcache-parent
BuildRequires: java-devel
@@ -63,6 +64,7 @@ This package contains javadoc for %{name}.
%prep
%setup -q
+%patch0 -p0
%pom_remove_plugin org.codehaus.gmaven:gmaven-plugin
%pom_remove_plugin org.eclipse.m2e:lifecycle-mapping
10 years, 1 month
[jenkins] Remove forgotten BSD license references
by Michal Srb
commit 331628cd3ae062ae9ad28864eba4f85388c3d9cf
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Apr 7 06:52:46 2014 +0200
Remove forgotten BSD license references
jenkins.spec | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 2479534..9bbc1b8 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -21,8 +21,6 @@ Source0: https://github.com/jenkinsci/jenkins/archive/%{name}-%{version}.
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
# taken from https://netbeans.org/cddl-gplv2.html
Source2: CDDL-LICENSE
-# taken from core/src/main/java/hudson/markup/EbayPolicy.java
-Source3: BSD-LICENSE
Source4: jenkins-sysconfig
Source5: context.xml
@@ -380,7 +378,6 @@ find . -name "*.class" -delete
cp %{SOURCE1} LICENSE-ASL-2.0.txt
cp %{SOURCE2} LICENSE-CDDL.txt
-cp %{SOURCE3} LICENSE-BSD.txt
# packaging layout
%mvn_package :jenkins-core core
@@ -543,7 +540,7 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%files core -f .mfiles-core
%dir %{_javadir}/%{name}
-%doc LICENSE.txt LICENSE-ASL-2.0.txt LICENSE-CDDL.txt LICENSE-BSD.txt
+%doc LICENSE.txt LICENSE-ASL-2.0.txt LICENSE-CDDL.txt
%files plugins-pom -f .mfiles-plugins-pom
@@ -564,6 +561,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%doc LICENSE.txt
%changelog
+* Mon Apr 07 2014 Michal Srb <msrb(a)redhat.com> - 1.557-10
+- Remove forgotten BSD license references
+
* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-9
- Update license tag to reflect changes in 1.557
10 years, 1 month
[sshj] fix test failure
by gil
commit d2507c536a6be962a059d907d2435291d8cb2431
Author: gil <puntogil(a)libero.it>
Date: Sun Apr 6 04:15:33 2014 +0200
fix test failure
sshj-0.8.1-port-to-bouncycastle-1.50.patch | 5 ++---
sshj.spec | 3 +++
2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/sshj-0.8.1-port-to-bouncycastle-1.50.patch b/sshj-0.8.1-port-to-bouncycastle-1.50.patch
index f6ef7da..0951ddf 100644
--- a/sshj-0.8.1-port-to-bouncycastle-1.50.patch
+++ b/sshj-0.8.1-port-to-bouncycastle-1.50.patch
@@ -1,7 +1,7 @@
diff -Nru sshj-0.8.1/pom.xml sshj-0.8.1-msrb/pom.xml
--- sshj-0.8.1/pom.xml 2012-07-08 15:55:22.000000000 +0200
-+++ sshj-0.8.1-msrb/pom.xml 2014-04-06 03:31:54.504838462 +0200
-@@ -41,8 +41,14 @@
++++ sshj-0.8.1-msrb/pom.xml 2014-04-06 04:07:24.338791306 +0200
+@@ -41,8 +41,13 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
@@ -9,7 +9,6 @@ diff -Nru sshj-0.8.1/pom.xml sshj-0.8.1-msrb/pom.xml
- <version>1.46</version>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.50</version>
-+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
diff --git a/sshj.spec b/sshj.spec
index 1077bef..8663fa3 100644
--- a/sshj.spec
+++ b/sshj.spec
@@ -47,6 +47,9 @@ This package contains javadoc for %{name}.
# SmokeTest.setUp:37 ? NoClassDefFound org/apache/mina/core/service/IoHandler
%pom_add_dep org.apache.mina:mina-core::test
+# NoClassDefFound org/bouncycastle/openssl/PEMReader apache sshd
+rm -r src/test/java/net/schmizz/sshj/SmokeTest.java
+
# Some classes moved from JUnit to hamcrest
sed -i -e 's/org.junit.internal.matchers/org.hamcrest.core/' src/test/java/net/schmizz/sshj/transport/verification/OpenSSHKnownHostsTest.java
%mvn_file :%{name} %{name}
10 years, 1 month
[sshj] update bouncycastle to 1.50
by gil
commit 590f242759d1802012a4b55620e3a2ad60874885
Author: gil <puntogil(a)libero.it>
Date: Sun Apr 6 03:48:19 2014 +0200
update bouncycastle to 1.50
sshj-0.8.1-port-to-bouncycastle-1.50.patch | 66 ++++++++++++++++++++++++++++
sshj.spec | 7 +++-
2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/sshj-0.8.1-port-to-bouncycastle-1.50.patch b/sshj-0.8.1-port-to-bouncycastle-1.50.patch
new file mode 100644
index 0000000..f6ef7da
--- /dev/null
+++ b/sshj-0.8.1-port-to-bouncycastle-1.50.patch
@@ -0,0 +1,66 @@
+diff -Nru sshj-0.8.1/pom.xml sshj-0.8.1-msrb/pom.xml
+--- sshj-0.8.1/pom.xml 2012-07-08 15:55:22.000000000 +0200
++++ sshj-0.8.1-msrb/pom.xml 2014-04-06 03:31:54.504838462 +0200
+@@ -41,8 +41,14 @@
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+- <artifactId>bcprov-jdk16</artifactId>
+- <version>1.46</version>
++ <artifactId>bcpkix-jdk15on</artifactId>
++ <version>1.50</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bcprov-jdk15on</artifactId>
++ <version>1.50</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+diff -Nru sshj-0.8.1/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java sshj-0.8.1-msrb/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java
+--- sshj-0.8.1/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java 2012-07-08 15:55:22.000000000 +0200
++++ sshj-0.8.1-msrb/src/main/java/net/schmizz/sshj/userauth/keyprovider/PKCS8KeyFile.java 2014-04-06 03:42:43.248047889 +0200
+@@ -23,7 +23,12 @@
+ import net.schmizz.sshj.userauth.password.PrivateKeyStringResource;
+ import net.schmizz.sshj.userauth.password.Resource;
+ import org.bouncycastle.openssl.EncryptionException;
+-import org.bouncycastle.openssl.PEMReader;
++import org.bouncycastle.openssl.PEMDecryptorProvider;
++import org.bouncycastle.openssl.PEMEncryptedKeyPair;
++import org.bouncycastle.openssl.PEMKeyPair;
++import org.bouncycastle.openssl.PEMParser;
++import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
++import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+
+@@ -119,14 +124,26 @@
+ throws IOException {
+ KeyPair kp = null;
+ org.bouncycastle.openssl.PasswordFinder pFinder = makeBouncyPasswordFinder();
+- PEMReader r = null;
++ PEMParser r = null;
+ Object o = null;
+ try {
+ for (; ; ) {
+ // while the PasswordFinder tells us we should retry
+ try {
+- r = new PEMReader(resource.getReader(), pFinder);
++ r = new PEMParser(resource.getReader());
+ o = r.readObject();
++
++ JcaPEMKeyConverter pemConverter = new JcaPEMKeyConverter();
++ pemConverter.setProvider("BC");
++ if (pFinder != null && o instanceof PEMEncryptedKeyPair) {
++ JcePEMDecryptorProviderBuilder decryptorBuilder = new JcePEMDecryptorProviderBuilder();
++ PEMDecryptorProvider pemDecryptor = decryptorBuilder.build(pFinder.getPassword());
++ o = pemConverter.getKeyPair(((PEMEncryptedKeyPair) o).decryptKeyPair(pemDecryptor));
++ }
++ if (o instanceof PEMKeyPair) {
++ o = pemConverter.getKeyPair((PEMKeyPair) o);
++ }
++
+ } catch (EncryptionException e) {
+ if (pwdf.shouldRetry(resource))
+ continue;
diff --git a/sshj.spec b/sshj.spec
index 9712078..1077bef 100644
--- a/sshj.spec
+++ b/sshj.spec
@@ -5,10 +5,14 @@ Summary: SSHv2 library for Java
License: ASL 2.0
URL: http://schmizz.net/sshj/
Source0: https://github.com/shikhar/sshj/archive/v%{version}.tar.gz
+# Thanks to Michal Srb
+# Update bouncycastle to 1.50
+Patch0: sshj-0.8.1-port-to-bouncycastle-1.50.patch
BuildRequires: java-devel
BuildRequires: mvn(com.jcraft:jzlib) >= 1.1.0-2
-BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
+BuildRequires: mvn(org.bouncycastle:bcprov-jdk15on)
+BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
BuildRequires: mvn(org.slf4j:slf4j-api)
# test deps
@@ -38,6 +42,7 @@ This package contains javadoc for %{name}.
%prep
%setup -q
+%patch0 -p1
# SmokeTest.setUp:37 ? NoClassDefFound org/apache/mina/core/service/IoHandler
%pom_add_dep org.apache.mina:mina-core::test
10 years, 1 month
[jdom2] make JDOM sort methods public
by gil
commit 8c50ab98364c9c2012e39e4a76e1e15790bee5c6
Author: gil <puntogil(a)libero.it>
Date: Sat Apr 5 01:23:08 2014 +0200
make JDOM sort methods public
jdom-2.0.5-java8.patch | 33 +++++++++++++++++++++++++++++++++
jdom2.spec | 6 ++++--
2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/jdom-2.0.5-java8.patch b/jdom-2.0.5-java8.patch
new file mode 100644
index 0000000..9399b81
--- /dev/null
+++ b/jdom-2.0.5-java8.patch
@@ -0,0 +1,33 @@
+diff -Nru jdom-JDOM-2.0.5/core/src/java/org/jdom2/AttributeList.java jdom-JDOM-2.0.5-gil/core/src/java/org/jdom2/AttributeList.java
+--- jdom-JDOM-2.0.5/core/src/java/org/jdom2/AttributeList.java 2013-04-17 00:00:39.000000000 +0200
++++ jdom-JDOM-2.0.5-gil/core/src/java/org/jdom2/AttributeList.java 2014-04-05 01:16:17.473795389 +0200
+@@ -606,7 +606,7 @@
+ *
+ * @param comp The Comparator to use for sorting.
+ */
+- void sort(Comparator<? super Attribute> comp) {
++ public void sort(Comparator<? super Attribute> comp) {
+ final int sz = size;
+ int[] indexes = new int[sz];
+ for (int i = 0 ; i < sz; i++) {
+diff -Nru jdom-JDOM-2.0.5/core/src/java/org/jdom2/ContentList.java jdom-JDOM-2.0.5-gil/core/src/java/org/jdom2/ContentList.java
+--- jdom-JDOM-2.0.5/core/src/java/org/jdom2/ContentList.java 2013-04-17 00:00:39.000000000 +0200
++++ jdom-JDOM-2.0.5-gil/core/src/java/org/jdom2/ContentList.java 2014-04-05 01:17:24.004508188 +0200
+@@ -628,7 +628,7 @@
+ return left;
+ }
+
+- final void sort(final Comparator<? super Content> comp) {
++ public final void sort(final Comparator<? super Content> comp) {
+ final int sz = size;
+ int[] indexes = new int[sz];
+ for (int i = 0 ; i < sz; i++) {
+@@ -1238,7 +1238,7 @@
+ }
+
+
+- final void sort(final Comparator<? super F> comp) {
++ public final void sort(final Comparator<? super F> comp) {
+ // this size() forces a full scan/update of the list.
+ final int sz = size();
+ final int[] indexes = new int[sz];
diff --git a/jdom2.spec b/jdom2.spec
index bdf6b11..78ff78c 100644
--- a/jdom2.spec
+++ b/jdom2.spec
@@ -12,6 +12,9 @@ Source2: jdom-junit-template.pom
# Disable gpg signatures
# Process contrib and junit pom files
Patch0: jdom-2.0.5-build.patch
+# Resolve conflict with java8
+# make JDOM sort methods public
+Patch1: jdom-2.0.5-java8.patch
BuildRequires: java-devel
BuildRequires: java-javadoc
@@ -62,14 +65,13 @@ find . -name "*.jar" -print -delete
%patch0 -p0
sed -i "s|%{_javadir}/objectweb-asm|%{_javadir}/objectweb-asm3|" build.xml
+%patch1 -p1
cp -p %{SOURCE1} maven/contrib.pom
cp -p %{SOURCE2} maven/junit.pom
sed -i 's/\r//' LICENSE.txt README.txt
-sed -i "s|final void sort(final Comparator<? super Content> comp) {|public final void sort(final Comparator<? super Content> comp) {|" core/src/java/org/jdom2/ContentList.java
-
%build
ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven
10 years, 1 month
[jenkins] Update license tag to reflect changes in 1.557
by Michal Srb
commit 54725edbec7122e0622901f554c7e310834cddb0
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 4 14:05:22 2014 +0200
Update license tag to reflect changes in 1.557
BSD-LICENSE | 27 ---------------------------
jenkins.spec | 9 +++++----
2 files changed, 5 insertions(+), 31 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 61096b4..2479534 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,19 +5,17 @@
Name: jenkins
Version: 1.557
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
# ASL 2.0:
# few files in core/src/main/java/hudson/
-# BSD:
-# core/src/main/java/hudson/markup/EbayPolicy.java
# CDDL:
# core/src/main/java/hudson/util/EditDistance.java
# LGPLv2+:
# few files in core/src/main/java/hudson/util/jna/
-License: MIT and ASL 2.0 and BSD and LGPLv2+ and CDDL
+License: MIT and ASL 2.0 and LGPLv2+ and CDDL
URL: http://jenkins-ci.org
Source0: https://github.com/jenkinsci/jenkins/archive/%{name}-%{version}.tar.gz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
@@ -566,6 +564,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%doc LICENSE.txt
%changelog
+* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-9
+- Update license tag to reflect changes in 1.557
+
* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-8
- Drop unneeded trilead-ssh2 patch
10 years, 1 month
[jenkins] Drop unneeded trilead-ssh2 patch
by Michal Srb
commit 0fcd6b62f0a0cbf4852085905c9db19c8d28ef27
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Apr 4 13:50:29 2014 +0200
Drop unneeded trilead-ssh2 patch
jenkins.spec | 13 ++-----
use-original-trilead-ssh2.patch | 63 ---------------------------------------
2 files changed, 4 insertions(+), 72 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index 7c0bb10..61096b4 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -30,8 +30,6 @@ Source5: context.xml
# animal sniffer is not really useful in Fedora
Patch1: remove-animal-sniffer-annotations.patch
-# build agaist pristine trilead-ssh2 library
-Patch2: use-original-trilead-ssh2.patch
# remove support for Solaris for now (missing deps and unclear licensing)
Patch3: remove-support-for-solaris.patch
# fix asm4 namespace
@@ -362,7 +360,6 @@ This package contains API documentation for %{name}.
%setup -q -n %{name}-%{name}-%{version}
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -463,11 +460,6 @@ cp %{SOURCE3} LICENSE-BSD.txt
%endif
# fix gId:aId
-# trilead-ssh
-%pom_remove_dep :trilead-ssh2 cli
-%pom_add_dep org.tmatesoft.svnkit:trilead-ssh2:215 cli
-%pom_remove_dep :trilead-ssh2 core
-%pom_add_dep org.tmatesoft.svnkit:trilead-ssh2:215 core
# findbugs annotations
%pom_remove_dep findbugs:annotations core
%pom_add_dep com.google.code.findbugs:jsr305 core
@@ -574,6 +566,9 @@ cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%doc LICENSE.txt
%changelog
+* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-8
+- Drop unneeded trilead-ssh2 patch
+
* Fri Apr 04 2014 Michal Srb <msrb(a)redhat.com> - 1.557-7
- Spec file cleanup
10 years, 1 month