commit 133c4d259f3efd234bbe4001b4381577d4fa6ba6 Author: Michal Srb msrb@redhat.com Date: Tue Feb 3 22:40:35 2015 +0100
Update to upstream version 1.598
.gitignore | 1 + add-support-for-plugins-from-RPMs.patch | 10 +- jenkins.spec | 260 +++++++++++++++++-------------- sources | 2 +- 4 files changed, 149 insertions(+), 124 deletions(-) --- diff --git a/.gitignore b/.gitignore index 5ab9b7f..9efa0b0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /jenkins-1.581.tar.gz /jenkins-1.589.tar.gz /jenkins-1.590.tar.gz +/jenkins-1.598.tar.gz diff --git a/add-support-for-plugins-from-RPMs.patch b/add-support-for-plugins-from-RPMs.patch index c3be7d3..cb9b263 100644 --- a/add-support-for-plugins-from-RPMs.patch +++ b/add-support-for-plugins-from-RPMs.patch @@ -35,7 +35,7 @@ index 4cfbf6a..ceaaf7f 100644 names.add(fileName);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java -index d2918a7..88d02e4 100644 +index 41605ee..8fc9ccd 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -53,6 +53,7 @@ import jenkins.model.Jenkins; @@ -149,13 +149,7 @@ index d2918a7..88d02e4 100644 if (!pluginListed) { builder = new TaskGraphBuilder() { List<File> archives; -@@ -532,13 +587,29 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas - // normalization first, if the old file exists. - rename(new File(rootDir,legacyName),file); - rename(new File(rootDir,legacyName+".pinned"),pinFile); -- -+ - // update file if: +@@ -537,8 +592,24 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas // - no file exists today // - bundled version and current version differs (by timestamp), and the file isn't pinned. if (!file.exists() || (file.lastModified() != lastModified && !pinFile.exists())) { diff --git a/jenkins.spec b/jenkins.spec index eedf83d..10793d5 100644 --- a/jenkins.spec +++ b/jenkins.spec @@ -10,8 +10,8 @@ %global juid 175
Name: jenkins -Version: 1.590 -Release: 2%{?dist} +Version: 1.598 +Release: 1%{?dist} Summary: An extendable open source continuous integration server
# The project's primary license is MIT @@ -140,6 +140,9 @@ BuildRequires: mvn(org.kohsuke.stapler:stapler-adjunct-codemirror) BuildRequires: mvn(org.jenkins-ci.plugins.icon-shim:icon-set) BuildRequires: mvn(org.jenkins-ci:winstone) BuildRequires: mvn(net.jcip:jcip-annotations) +BuildRequires: jcifs +BuildRequires: atinject +BuildRequires: glassfish-annotation-api BuildRequires: systemd-units %if !%{bootstrap} #BuildRequires: mvn(org.jenkins-ci.lib:lib-jenkins-maven-embedder) @@ -322,6 +325,7 @@ Requires: springframework-webmvc Requires: springframework-aop Requires: spring-ldap Requires: slf4j +Requires: slf4j-jdk14 Requires: trilead-ssh2 Requires: springframework-batch Requires: jzlib @@ -368,6 +372,9 @@ Requires: jenkins-credentials-plugin Requires: js-yui2-jenkins Requires: jenkins-remoting-webapp Requires: jenkins-matrix-project-plugin +Requires: jcifs +Requires: jtidy +Requires: glassfish-annotation-api
%description webapp This package contains Jenkins Web Application. @@ -391,7 +398,7 @@ This package contains API documentation for %{name}. %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch13 -p1 +%patch13 -p1 -F1 %patch14 -p1
# Remove bundled JARs and classes @@ -430,88 +437,6 @@ cp %{SOURCE2} LICENSE-CDDL.txt %mvn_package :jenkins-war __noinstall %endif
-# Jenkins uses its own fork of xstream -%pom_change_dep -r org.kohsuke.stapler:json-lib : core ' -<exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> -</exclusions>' -%pom_change_dep org.kohsuke.stapler:stapler-groovy : core ' -<exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> -</exclusions>' -%pom_change_dep org.acegisecurity:acegi-security : core ' -<exclusions> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-remoting</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-support</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </exclusion> - <exclusion> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - </exclusion> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - </exclusion> -</exclusions>' - -# spring-aop pulls in a lot of tomcat libs, these will be provided by tomcat itself -%pom_change_dep org.springframework:spring-aop : core ' -<exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-catalina</artifactId> - </exclusion> -</exclusions>' - -%pom_change_dep org.springframework:spring-webmvc : core ' -<exclusions> - <exclusion> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy</artifactId> - </exclusion> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </exclusion> -</exclusions>' - - -# quick fix for newer version of jenkins-remoting -# this is already fixed upstream in newer Jenkins -sed -i 's|protected synchronized void terminate(|public synchronized void terminate(|g' core/src/main/java/hudson/Launcher.java -sed -i 's|protected synchronized void terminate(|public synchronized void terminate(|g' core/src/main/java/hudson/slaves/Channels.java - %pom_change_dep org.jenkins-ci:winstone :::compile war
# CLI uber JAR @@ -577,13 +502,7 @@ sed -i 's|protected synchronized void terminate(|public synchronized void termin %pom_remove_dep :cli war %pom_add_dep org.bouncycastle:bcprov-jdk16 war %pom_add_dep org.bouncycastle:bcpkix-jdk15on war -%pom_add_dep org.apache.sshd:sshd-core war ' -<exclusions> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-coyote</artifactId> - </exclusion> -</exclusions>' +%pom_add_dep org.apache.sshd:sshd-core war
# fix gId:aId # findbugs annotations @@ -603,24 +522,8 @@ sed -i 's|protected synchronized void terminate(|public synchronized void termin %pom_remove_dep jline:jline core %pom_add_dep jline:jline:1 core
-%pom_change_dep org.codehaus.groovy:groovy18 : core ' -<exclusions> - <exclusion> - <groupId>com.thoughtworks.xstream</groupId> - <artifactId>xstream</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jsp-api</artifactId> - </exclusion> -</exclusions>' - %build -%mvn_build -f -X +%mvn_build -f
%install %mvn_install @@ -649,21 +552,145 @@ install -m 644 %{SOURCE7} %{buildroot}/%{_libexecdir}/%{name}/%{name} # we don't have packaging guidelines for web applications yet. # just install exploded WAR to %{webroot} unzip -d %{buildroot}/%{webroot}/ war/target/jenkins.war +cp war/src/main/webapp/WEB-INF/web.xml %{buildroot}/%{webroot}/WEB-INF/ pushd %{buildroot}/%{webroot}/WEB-INF/lib - rm asm*-distroshaded-*.jar - rm groovy18*.jar - xmvn-subst . + rm * + ln -sf `build-classpath access-modifier-annotation/access-modifier-annotation` access-modifier-annotation.jar + ln -sf `build-classpath acegisecurity/acegi-security` acegi-security.jar + #ln -sf `build-classpath ` activation-1.1.1-hudson-1.jar + ln -sf `build-classpath akuma/akuma` akuma-1.9.jar + ln -sf `build-classpath annotation-indexer/annotation-indexer` annotation-indexer.jar + ln -sf `build-classpath ant/ant` ant.jar + ln -sf `build-classpath ant/ant-launcher` ant-launcher.jar + ln -sf `build-classpath antlr` antlr.jar + ln -sf `build-classpath aopalliance` aopalliance.jar + ln -sf `build-classpath args4j/args4j` args4j.jar + ln -sf `build-classpath bcpkix` bcpkix.jar + ln -sf `build-classpath bcprov` bcprov.jar + ln -sf `build-classpath bridge-method-injector/bridge-method-annotation` bridge-method-annotation.jar + ln -sf `build-classpath bytecode-compatibility-transformer/bytecode-compatibility-transformer` bytecode-compatibility-transformer.jar + ln -sf `build-classpath jenkins/cli` cli-%{version}.jar + ln -sf `build-classpath commons-beanutils` commons-beanutils.jar + ln -sf `build-classpath commons-codec` commons-codec.jar + ln -sf `build-classpath commons-collections` commons-collections.jar + ln -sf `build-classpath commons-digester` commons-digester.jar + ln -sf `build-classpath commons-discovery` commons-discovery.jar + ln -sf `build-classpath commons-fileupload` commons-fileupload.jar + ln -sf `build-classpath commons-httpclient3` commons-httpclient3.jar + ln -sf `build-classpath commons-io` commons-io.jar + ln -sf `build-classpath jenkins-commons-jelly/commons-jelly` commons-jelly.jar + ln -sf `build-classpath jenkins-commons-jelly/commons-jelly-tags-define` commons-jelly-tags-define.jar + ln -sf `build-classpath jenkins-commons-jelly/commons-jelly-tags-fmt` commons-jelly-tags-fmt.jar + ln -sf `build-classpath jenkins-commons-jelly/commons-jelly-tags-xml` commons-jelly-tags-xml.jar + ln -sf `build-classpath jenkins-jexl/commons-jexl` commons-jexl.jar + ln -sf `build-classpath commons-lang` commons-lang.jar + ln -sf `build-classpath commons-logging` commons-logging.jar + ln -sf `build-classpath constant-pool-scanner/constant-pool-scanner` constant-pool-scanner.jar + ln -sf `build-classpath jenkins-crypto-util/crypto-util` crypto-util.jar + ln -sf `build-classpath dom4j` dom4j.jar + #ln -sf `embedded_su4j` embedded_su4j.jar + ln -sf `build-classpath ezmorph` ezmorph.jar + ln -sf `build-classpath groovy18-1.8` groovy18-1.8.jar + ln -sf `build-classpath guava` guava.jar + ln -sf `build-classpath guice/google-guice-no_aop` guice.jar + ln -sf `build-classpath hamcrest/core` hamcrest-core.jar + ln -sf `build-classpath jenkins-icon-shim/icon-set` icon-set.jar + ln -sf `build-classpath jenkins-instance-identity/instance-identity` instance-identity.jar + ln -sf `build-classpath jansi/jansi` jansi.jar + ln -sf `build-classpath glassfish-annotation-api` javax.annotation-api.jar + ln -sf `build-classpath atinject` javax.inject.jar + ln -sf `build-classpath jaxen` jaxen.jar + ln -sf `build-classpath jBCrypt/jBCrypt` jbcrypt.jar + ln -sf `build-classpath jcifs` jcifs.jar + ln -sf `build-classpath jcommon/jcommon` jcommon.jar + ln -sf `build-classpath jenkins/jenkins-core` jenkins-core-%{version}.jar + ln -sf `build-classpath jffi` jffi.jar + #ln -sf `jffi-1.2.7-native` .jar + ln -sf `build-classpath jfreechart/jfreechart` jfreechart.jar + #ln -sf `j-interop-2.0.6-kohsuke-1.jar` .jar + #ln -sf `j-interopdeps-2.0.6-kohsuke-1.jar` .jar + ln -sf `build-classpath jline1/jline-1.0` jline.jar + ln -sf `build-classpath jmdns/jmdns` jmdns.jar + ln -sf `build-classpath jna` jna-4.1.0.jar + #ln -sf `jna-posix-1.0.3-jenkins-1.jar` .jar + ln -sf `build-classpath jnr-constants` jnr-constants.jar + ln -sf `build-classpath jnr-ffi/jnr-ffi` jnr-ffi.jar + ln -sf `build-classpath jnr-posix` jnr-posix.jar + ln -sf `build-classpath jnr-x86asm` jnr-x86asm.jar + ln -sf `build-classpath jenkins-json-lib` json-lib.jar + ln -sf `build-classpath jsr-305` jsr305.jar + ln -sf `build-classpath jakarta-taglibs-core` jstl.jar + ln -sf `build-classpath jtidy` jtidy.jar + ln -sf `build-classpath junit` junit.jar + ln -sf `build-classpath jzlib` jzlib.jar + #ln -sf `launchd-slave-installer-1.2.jar` .jar + ln -sf `build-classpath libpam4j/libpam4j` libpam4j.jar + #ln -sf `libzfs-0.5.jar` .jar + ln -sf `build-classpath localizer/localizer` localizer.jar + ln -sf `build-classpath log4j12-1.2.17` log4j.jar + ln -sf `build-classpath javamail/mail` mail.jar + ln -sf `build-classpath jenkins-extras-memory-monitor/memory-monitor` memory-monitor.jar + ln -sf `build-classpath apache-mina/mina-core` mina-core.jar + ln -sf `build-classpath oro` oro.jar + ln -sf `build-classpath relaxngDatatype` relaxngDatatype.jar + ln -sf `build-classpath jenkins-remoting/remoting` remoting.jar + ln -sf `build-classpath robust-http-client/robust-http-client` robust-http-client.jar + ln -sf `build-classpath sezpoz/sezpoz` sezpoz.jar + #ln -sf `slave-installer-1.5.jar` .jar + ln -sf `build-classpath slf4j/slf4j-api` slf4j-api.jar + ln -sf `build-classpath slf4j/slf4j-jdk14` slf4j-jdk14.jar + ln -sf `build-classpath jenkins-ssh-cli-auth/ssh-cli-auth` ssh-cli-auth.jar + ln -sf `build-classpath jenkins-sshd/sshd` sshd.jar + ln -sf `build-classpath apache-sshd/sshd-core` sshd-core.jar + ln -sf `build-classpath stapler/stapler` stapler.jar + ln -sf `build-classpath stapler-adjunct-codemirror/stapler-adjunct-codemirror` stapler-adjunct-codemirror.jar + ln -sf `build-classpath stapler-adjunct-timeline/stapler-adjunct-timeline` stapler-adjunct-timeline.jar + #ln -sf `stapler-adjunct-zeroclipboard-1.3.5-1.jar` .jar + ln -sf `build-classpath stapler/stapler-groovy` stapler-groovy.jar + ln -sf `build-classpath stapler/stapler-jelly` stapler-jelly.jar + #ln -sf `stapler-jrebel-1.234.jar` .jar + ln -sf `build-classpath bea-stax-api` bea-stax-api.jar + #ln -sf `stax-api-1.0.2.jar` .jar + #ln -sf `systemd-slave-installer-1.1.jar` .jar + ln -sf `build-classpath jenkins-task-reactor/task-reactor` task-reactor.jar + ln -sf `build-classpath tiger-types` tiger-types.jar + ln -sf `build-classpath trilead-putty-extension/trilead-putty-extension` trilead-putty-extension.jar + ln -sf `build-classpath trilead-ssh2/trilead-ssh2` trilead-ssh2.jar + ln -sf `build-classpath txw2` txw2.jar + #ln -sf `upstart-slave-installer-1.1.jar` .jar + ln -sf `build-classpath jenkins-version-number/version-number` version-number.jar + #ln -sf `windows-package-checker-1.0.jar` .jar + #ln -sf `windows-slave-installer-1.4.jar` .jar + #ln -sf `winp-1.22.jar` .jar + ln -sf `build-classpath woodstox-core-asl` woodstox-core-asl.jar + ln -sf `build-classpath xpp3` xpp3.jar + ln -sf `build-classpath jenkins-xstream/xstream` xstream.jar ln -sf `build-classpath objectweb-asm3/asm-tree-distroshaded` asm-tree-distroshaded-any.jar ln -sf `build-classpath objectweb-asm3/asm-util-distroshaded` asm-util-distroshaded-any.jar ln -sf `build-classpath objectweb-asm3/asm-distroshaded` asm-distroshaded-any.jar ln -sf `build-classpath objectweb-asm3/asm-commons-distroshaded` asm-commons-distroshaded-any.jar ln -sf `build-classpath objectweb-asm3/asm-analysis-distroshaded` asm-analysis-distroshaded-any.jar - ln -sf `build-classpath groovy18-1.8` groovy18-1.8.jar - ln -sf `build-classpath hsqldb1-1.jar` hsqldb-1.jar + ln -sf `build-classpath objectweb-asm/asm-analysis` asm-analysis.jar + ln -sf `build-classpath objectweb-asm/asm-commons` asm-commons.jar + ln -sf `build-classpath objectweb-asm/asm` asm.jar + ln -sf `build-classpath objectweb-asm/asm-tree` asm-tree.jar + ln -sf `build-classpath objectweb-asm/asm-util` asm-util.jar ln -sf `build-classpath jenkins/cli` cli-%{version}.jar - ln -sf `build-classpath jenkins/jenkins-core` jenkins-core-%{version}.jar ln -sf `build-classpath jenkins-winstone/winstone` ../../winstone.jar ln -sf `build-classpath jenkins-executable-war/executable-war` ../../executable-war.jar + # spring + ln -sf `build-classpath springframework/spring-aop` spring-aop.jar + ln -sf `build-classpath springframework/spring-beans` spring-beans.jar + ln -sf `build-classpath springframework/spring-context` spring-context.jar + ln -sf `build-classpath springframework/spring-context-support` spring-context-support.jar + ln -sf `build-classpath springframework/spring-core` spring-core.jar + ln -sf `build-classpath springframework/spring-expression` spring-expression.jar + ln -sf `build-classpath springframework/spring-instrument` spring-instrument.jar + ln -sf `build-classpath springframework/spring-jdbc` spring-jdbc.jar + ln -sf `build-classpath springframework/spring-oxm` spring-oxm.jar + ln -sf `build-classpath springframework/spring-tx` spring-tx.jar + ln -sf `build-classpath springframework/spring-web` spring-web.jar + ln -sf `build-classpath springframework/spring-webmvc` spring-webmvc.jar popd
cp %{SOURCE8} %{buildroot}/%{webroot}/WEB-INF/classes/dependencies.txt @@ -729,6 +756,9 @@ exit 0 %doc LICENSE.txt
%changelog +* Tue Feb 03 2015 Michal Srb msrb@redhat.com - 1.598-1 +- Update to upstream version 1.598 + * Mon Feb 02 2015 Michal Srb msrb@redhat.com - 1.590-2 - Require jna >= 4.1.0-7
diff --git a/sources b/sources index 447a02a..9a249c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -7cd0e9a7f19b271758cec022df4d8602 jenkins-1.590.tar.gz +edd42f18b35bf9289993f0495b7a2109 jenkins-1.598.tar.gz
java-sig-commits@lists.fedoraproject.org