[jenkins] Allow symlinking
by Michal Srb
commit 3d111b039457c59ab8ec41e706da0485a8bbb52c
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Apr 1 13:54:58 2014 +0200
Allow symlinking
context.xml | 3 +++
jenkins.spec | 8 +++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/context.xml b/context.xml
new file mode 100644
index 0000000..3ac5284
--- /dev/null
+++ b/context.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context path="/jenkins" allowLinking="true">
+</Context>
diff --git a/jenkins.spec b/jenkins.spec
index d7af4ea..cc80d23 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -5,7 +5,7 @@
Name: jenkins
Version: 1.557
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -26,6 +26,7 @@ Source2: CDDL-LICENSE
# taken from core/src/main/java/hudson/markup/EbayPolicy.java
Source3: BSD-LICENSE
Source4: jenkins-sysconfig
+Source5: context.xml
# we don't have legacy acegi security framework in Fedora
#Patch0: use-spring-security.patch
@@ -549,6 +550,8 @@ popd
install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
+
+cp -p %{SOURCE5} %{buildroot}/%{homedir}/webapp/META-INF/context.xml
%endif # bootstrap
@@ -575,6 +578,9 @@ cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
%doc LICENSE.txt
%changelog
+* Tue Apr 01 2014 Michal Srb <msrb(a)redhat.com> - 1.557-2
+- Allow symlinking
+
* Tue Apr 01 2014 Michal Srb <msrb(a)redhat.com> - 1.557-1
- Update to upstream version 1.557
10 years, 1 month
[jenkins] Update to upstream version 1.557
by Michal Srb
commit 0672ad3683a4a358ee110701d662fb9a23d2cc97
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Apr 1 13:40:22 2014 +0200
Update to upstream version 1.557
jenkins.spec | 16 +-
upgrade-to-commons-io-2.4.patch | 433 ---------------------------------------
use-original-trilead-ssh2.patch | 49 ++---
3 files changed, 21 insertions(+), 477 deletions(-)
---
diff --git a/jenkins.spec b/jenkins.spec
index dfee998..d7af4ea 100644
--- a/jenkins.spec
+++ b/jenkins.spec
@@ -4,8 +4,8 @@
%global jenkins_catalina_base %{_localstatedir}/lib/tomcats/%{name}
Name: jenkins
-Version: 1.549
-Release: 8%{?dist}
+Version: 1.557
+Release: 1%{?dist}
Summary: An extendable open source continuous integration server
# The project's primary license is MIT
@@ -45,8 +45,6 @@ Patch6: drop-jna-posix-compatibility.patch
Patch7: use-jline2.patch
# build against newer commons fileupload
Patch8: use-commons-fileupload-1.3.patch
-# backported upstream patch, this can be removed in version > 1.551
-Patch9: upgrade-to-commons-io-2.4.patch
# newer args4j
Patch10: use-args4j-2.0.25.patch
# switch to spring security in groovy scripts
@@ -72,7 +70,6 @@ BuildRequires: mvn(antlr:antlr)
BuildRequires: mvn(args4j:args4j)
BuildRequires: mvn(com.github.jnr:jnr-posix)
BuildRequires: mvn(com.google.code.findbugs:jsr305)
-BuildRequires: mvn(com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer)
BuildRequires: mvn(com.google.guava:guava)
BuildRequires: mvn(com.google.inject:guice::no_aop:)
BuildRequires: mvn(com.infradna.tool:bridge-method-annotation)
@@ -247,7 +244,6 @@ Requires: bytecode-compatibility-transformer
Requires: apache-commons-pool
Requires: apache-commons-codec
Requires: bouncycastle
-Requires: owasp-java-html-sanitizer
Requires: springframework-beans
Requires: jfreechart
Requires: spring-ldap
@@ -381,7 +377,6 @@ This package contains API documentation for %{name}.
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch10 -p1
#%%patch11 -p1
%patch12 -p1
@@ -466,6 +461,7 @@ cp %{SOURCE3} LICENSE-BSD.txt
%pom_remove_dep org.jenkins-ci.modules:windows-slave-installer war
%pom_remove_dep org.jenkins-ci.modules:launchd-slave-installer war
%pom_remove_dep org.jenkins-ci.modules:upstart-slave-installer war
+%pom_remove_dep org.jenkins-ci.modules:systemd-slave-installer war
%pom_remove_dep :winstone war
%pom_remove_dep :maven-plugin war
%pom_remove_dep :test-annotations
@@ -495,9 +491,6 @@ cp %{SOURCE3} LICENSE-BSD.txt
# jfreechart
%pom_remove_dep jfree:jfreechart core
%pom_add_dep org.jfree:jfreechart
-# owasp-html-sanitizer
-%pom_remove_dep org.kohsuke:owasp-html-sanitizer core
-%pom_add_dep com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer core
# jelly-tags
%pom_remove_dep org.jvnet.hudson:commons-jelly-tags-define core
%pom_add_dep commons-jelly:commons-jelly-tags-define core
@@ -582,6 +575,9 @@ cp -p %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/tomcat@%{name}
%doc LICENSE.txt
%changelog
+* Tue Apr 01 2014 Michal Srb <msrb(a)redhat.com> - 1.557-1
+- Update to upstream version 1.557
+
* Mon Mar 31 2014 Michal Srb <msrb(a)redhat.com> - 1.549-8
- First acegisecurity experiment
diff --git a/use-original-trilead-ssh2.patch b/use-original-trilead-ssh2.patch
index b9aeb96..89e6fd0 100644
--- a/use-original-trilead-ssh2.patch
+++ b/use-original-trilead-ssh2.patch
@@ -1,50 +1,31 @@
-From 496aa4cdf93840fd9cff3e74b63125dfe52516c1 Mon Sep 17 00:00:00 2001
+From 14b12438562b8af83996217b6d4df05ea9f77ba5 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb(a)redhat.com>
-Date: Tue, 1 Oct 2013 08:28:07 +0200
+Date: Tue, 1 Apr 2014 13:30:53 +0200
Subject: [PATCH] Port to original trilead-ssh2
---
- cli/src/main/java/hudson/cli/CLI.java | 12 +++++++++++-
- core/src/main/java/hudson/WebAppMain.java | 7 +++++--
- 2 files changed, 16 insertions(+), 3 deletions(-)
+ cli/src/main/java/hudson/cli/PrivateKeyProvider.java | 7 ++++++-
+ core/src/main/java/hudson/WebAppMain.java | 7 +++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
-diff --git a/cli/src/main/java/hudson/cli/CLI.java b/cli/src/main/java/hudson/cli/CLI.java
-index 6549c39..4469ece 100644
---- a/cli/src/main/java/hudson/cli/CLI.java
-+++ b/cli/src/main/java/hudson/cli/CLI.java
-@@ -24,6 +24,7 @@
- package hudson.cli;
-
- import com.trilead.ssh2.crypto.PEMDecoder;
-+
- import hudson.cli.client.Messages;
- import hudson.remoting.Channel;
- import hudson.remoting.PingThread;
-@@ -40,6 +41,7 @@ import javax.net.ssl.HttpsURLConnection;
- import javax.net.ssl.SSLContext;
- import javax.net.ssl.SSLSession;
- import javax.net.ssl.TrustManager;
-+
- import java.io.BufferedInputStream;
- import java.io.BufferedOutputStream;
- import java.io.BufferedReader;
-@@ -68,6 +70,8 @@ import java.security.SecureRandom;
- import java.security.Signature;
+diff --git a/cli/src/main/java/hudson/cli/PrivateKeyProvider.java b/cli/src/main/java/hudson/cli/PrivateKeyProvider.java
+index 834bb72..259359e 100644
+--- a/cli/src/main/java/hudson/cli/PrivateKeyProvider.java
++++ b/cli/src/main/java/hudson/cli/PrivateKeyProvider.java
+@@ -35,6 +35,8 @@ import java.security.KeyFactory;
+ import java.security.KeyPair;
import java.security.spec.DSAPrivateKeySpec;
import java.security.spec.DSAPublicKeySpec;
+import java.security.spec.RSAPrivateKeySpec;
+import java.security.spec.RSAPublicKeySpec;
import java.util.ArrayList;
- import java.util.Arrays;
import java.util.Collections;
-@@ -557,7 +561,13 @@ public class CLI {
+ import java.util.List;
+@@ -144,7 +146,10 @@ public class PrivateKeyProvider {
+ if (key instanceof com.trilead.ssh2.signature.RSAPrivateKey) {
com.trilead.ssh2.signature.RSAPrivateKey x = (com.trilead.ssh2.signature.RSAPrivateKey)key;
- // System.out.println("ssh-rsa " + new String(Base64.encode(RSASHA1Verify.encodeSSHRSAPublicKey(x.getPublicKey()))));
- return x.toJCEKeyPair();
-+ /*
-+ * Convert to a JCE API representation of the RSA key pair.
-+ */
+ KeyFactory kf = KeyFactory.getInstance("RSA");
+ return new KeyPair(
+ kf.generatePublic(new RSAPublicKeySpec(x.getN(), x.getE())),
@@ -78,5 +59,5 @@ index 1f332e9..f8d0d60 100644
}
--
-1.8.3.1
+1.9.0
10 years, 1 month
[javapackages] Use make -C instead of pushd/popd
by Mikolaj Izdebski
commit d45b3420b5a6cf781ba51f7048e90c50b7d35edd
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Apr 1 12:50:31 2014 +0200
Use make -C instead of pushd/popd
build | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/build b/build
index 6519fb5..ad30b75 100755
--- a/build
+++ b/build
@@ -113,6 +113,4 @@ manpage build-jar-repository
manpage rebuild-jar-repository
manpage shade-jar
-pushd doc
-make clean all
-popd
+make -C doc clean all
10 years, 1 month
[Bug 1078967] New: mvn-build generates bad reactor file from maven-jar-plugin with classifier
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1078967
Bug ID: 1078967
Summary: mvn-build generates bad reactor file from
maven-jar-plugin with classifier
Product: Fedora
Version: rawhide
Component: javapackages-tools
Assignee: sochotni(a)redhat.com
Reporter: pmackinn(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msimacek(a)redhat.com,
msrb(a)redhat.com, sochotni(a)redhat.com
Created attachment 876929
--> https://bugzilla.redhat.com/attachment.cgi?id=876929&action=edit
effective pom generated from mvn help:effective-pom -f <path-to-pom>
A maven-jar-plugin configuration that includes a classifier like this:
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<classifier>hadoop${hadoop.profile}</classifier>
</configuration>
</plugin>
leads to a bad file entry being generated in the .xmvn-reactor file:
<artifact>
<groupId>org.apache.sqoop</groupId>
<artifactId>execution</artifactId>
<extension>pom</extension>
<version>1.99.3</version>
<rawPomPath>/home/pmackinn/rpmbuild/BUILD/sqoop-1.99.3/execution/pom.xml</rawPomPath>
<effectivePomPath>/tmp/xmvn6133786444662127620.pom.xml</effectivePomPath>
</artifact>
<artifact>
<groupId>org.apache.sqoop.execution</groupId>
<artifactId>sqoop-execution-mapreduce</artifactId>
<version>1.99.3</version>
<file>/home/pmackinn/rpmbuild/BUILD/sqoop-1.99.3/execution/mapreduce/target/classes</file>
<rawPomPath>/home/pmackinn/rpmbuild/BUILD/sqoop-1.99.3/execution/mapreduce/pom.xml</rawPomPath>
<effectivePomPath>/tmp/xmvn6994462136357679764.pom.xml</effectivePomPath>
</artifact>
<artifact>
<groupId>org.apache.sqoop.execution</groupId>
<artifactId>sqoop-execution-mapreduce</artifactId>
<classifier>hadoop200</classifier>
<version>1.99.3</version>
<file>/home/pmackinn/rpmbuild/BUILD/sqoop-1.99.3/execution/mapreduce/target/sqoop-execution-mapreduce-1.99.3-hadoop200.jar</file>
</artifact>
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=0mMYiwSc3A&a=cc_unsubscribe
10 years, 1 month
[jenkins-credentials-plugin] Remove unneeded patch
by Michal Srb
commit 2e9c803e2e7c7062c7c000120a3530d800ac629b
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Apr 1 08:33:36 2014 +0200
Remove unneeded patch
0001-Port-to-spring-security.patch | 85 ------------------------------------
jenkins-credentials-plugin.spec | 10 ++--
2 files changed, 5 insertions(+), 90 deletions(-)
---
diff --git a/jenkins-credentials-plugin.spec b/jenkins-credentials-plugin.spec
index 193d1f9..ecc25b3 100644
--- a/jenkins-credentials-plugin.spec
+++ b/jenkins-credentials-plugin.spec
@@ -3,7 +3,7 @@
Name: jenkins-credentials-plugin
Version: 1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Jenkins Credentials Plugin
License: MIT
@@ -19,8 +19,7 @@ BuildRequires: mvn(org.jenkins-ci.main:jenkins-core)
BuildRequires: mvn(org.jenkins-ci.plugins:plugin:pom:)
BuildRequires: mvn(org.jenkins-ci.tools:maven-hpi-plugin)
BuildRequires: mvn(org.mockito:mockito-core)
-
-Patch0: 0001-Port-to-spring-security.patch
+BuildRequires: mvn(org.acegisecurity:acegi-security)
BuildArch: noarch
@@ -36,8 +35,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{mod_name}-%{short_name}-%{version}
-%patch0 -p1
-
%pom_remove_dep :findbugs-annotations
%pom_remove_plugin :findbugs-maven-plugin
@@ -58,6 +55,9 @@ This package contains the API documentation for %{name}.
%doc LICENSE.txt
%changelog
+* Tue Apr 01 2014 Michal Srb <msrb(a)redhat.com> - 1.10-2
+- Remove unneeded patch
+
* Thu Mar 20 2014 Michal Srb <msrb(a)redhat.com> - 1.10-1
- Update to upstream version 1.10
10 years, 1 month