[SCM] jenkins packaging branch, master, updated. debian/1.466.2+dfsg-1-13-gf2fe1f8
James Page
james.page at ubuntu.com
Thu Jan 10 10:11:53 UTC 2013
The following commit has been merged in the master branch:
commit da2ac834c75f044f2a27318fb87410112c2419fa
Author: James Page <james.page at ubuntu.com>
Date: Wed Jan 9 16:17:44 2013 +0000
Initial packaging updates for 1.480.1
diff --git a/debian/changelog b/debian/changelog
index f916e6a..7c5a717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.480.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- James Page <james.page at ubuntu.com> Wed, 05 Dec 2012 21:56:17 +0000
+
jenkins (1.466.2+dfsg-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/patches/build/apt-stapler-processing.patch b/debian/patches/build/apt-stapler-processing.patch
index 8200f4f..28ca74e 100644
--- a/debian/patches/build/apt-stapler-processing.patch
+++ b/debian/patches/build/apt-stapler-processing.patch
@@ -8,11 +8,9 @@ Description: Jenkins 1.409.x upstream uses an older version of stapler and
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2012-07-24 16:33:04.738053812 +0100
-+++ jenkins/core/pom.xml 2012-07-24 16:33:05.898057949 +0100
-@@ -638,6 +638,24 @@
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -651,6 +651,24 @@ THE SOFTWARE.
</executions>
</plugin>
<plugin>
diff --git a/debian/patches/build/build.patch b/debian/patches/build/build.patch
index e2a3562..cb00fdc 100644
--- a/debian/patches/build/build.patch
+++ b/debian/patches/build/build.patch
@@ -2,11 +2,9 @@ Description: Misc patches to main POM file to disable some modules
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/pom.xml
-===================================================================
---- jenkins.orig/pom.xml 2012-07-24 16:32:51.990008351 +0100
-+++ jenkins/pom.xml 2012-07-24 16:33:04.738053812 +0100
-@@ -48,10 +48,7 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -48,10 +48,7 @@ THE SOFTWARE.
<modules>
<module>core</module>
@@ -17,7 +15,7 @@ Index: jenkins/pom.xml
<module>cli</module>
</modules>
-@@ -575,9 +572,6 @@
+@@ -580,9 +577,6 @@ THE SOFTWARE.
<requireJavaVersion>
<version>1.6.0-18</version>
</requireJavaVersion>
@@ -27,11 +25,9 @@ Index: jenkins/pom.xml
</rules>
</configuration>
</execution>
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2012-07-24 16:32:51.990008351 +0100
-+++ jenkins/core/pom.xml 2012-07-24 16:33:04.738053812 +0100
-@@ -319,6 +319,16 @@
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -325,6 +325,16 @@ THE SOFTWARE.
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>1.0</version>
diff --git a/debian/patches/build/disable-plugins.patch b/debian/patches/build/disable-plugins.patch
index 65316e3..9f9656d 100644
--- a/debian/patches/build/disable-plugins.patch
+++ b/debian/patches/build/disable-plugins.patch
@@ -2,11 +2,9 @@ Description: Disables packagaging of plugins with core Jenkins
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/war/pom.xml
-===================================================================
---- jenkins.orig/war/pom.xml 2012-07-24 16:32:51.758007525 +0100
-+++ jenkins/war/pom.xml 2012-07-24 16:33:05.618056952 +0100
-@@ -149,6 +149,11 @@
+--- a/war/pom.xml
++++ b/war/pom.xml
+@@ -154,6 +154,11 @@ THE SOFTWARE.
<scope>system</scope>
<systemPath>/usr/local/yjp/lib/yjp.jar</systemPath>
</dependency-->
@@ -18,7 +16,7 @@ Index: jenkins/war/pom.xml
</dependencies>
<build>
-@@ -236,48 +241,6 @@
+@@ -241,66 +246,6 @@ THE SOFTWARE.
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>winstone.jar</destFileName>
</artifactItem>
@@ -37,7 +35,7 @@ Index: jenkins/war/pom.xml
- <artifactItem>
- <groupId>org.jenkins-ci.plugins</groupId>
- <artifactId>subversion</artifactId>
-- <version>1.34</version>
+- <version>1.39</version>
- <type>hpi</type>
- </artifactItem>
- <artifactItem>
@@ -64,6 +62,24 @@ Index: jenkins/war/pom.xml
- <version>1.8</version>
- <type>hpi</type>
- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>external-monitor-job</artifactId>
+- <version>1.1</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>ldap</artifactId>
+- <version>1.1</version>
+- <type>hpi</type>
+- </artifactItem>
+- <artifactItem>
+- <groupId>org.jenkins-ci.plugins</groupId>
+- <artifactId>pam-auth</artifactId>
+- <version>1.0</version>
+- <type>hpi</type>
+- </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/plugins</outputDirectory>
<stripVersion>true</stripVersion>
diff --git a/debian/patches/build/jenkins-version-number.patch b/debian/patches/build/jenkins-version-number.patch
index f7b40c2..a3dfd88 100644
--- a/debian/patches/build/jenkins-version-number.patch
+++ b/debian/patches/build/jenkins-version-number.patch
@@ -8,10 +8,8 @@ Author: James Page <james.page at ubuntu.com>
Origin: https://github.com/jenkinsci/lib-version-number
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/util/VersionNumber.java
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ jenkins/core/src/main/java/hudson/util/VersionNumber.java 2012-07-24 16:33:06.170058918 +0100
+--- /dev/null
++++ b/core/src/main/java/hudson/util/VersionNumber.java
@@ -0,0 +1,486 @@
+package hudson.util;
+
diff --git a/debian/patches/build/openjdk6.patch b/debian/patches/build/openjdk6.patch
index ee2dbed..255f195 100644
--- a/debian/patches/build/openjdk6.patch
+++ b/debian/patches/build/openjdk6.patch
@@ -4,11 +4,9 @@ Description: Misc patches to get Jenkins to compile using OpenJDK 6. This
Author: James Page <james.page at ubuntu.com>
Forwarded: https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959
-Index: jenkins/core/src/main/java/hudson/model/AbstractBuild.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/model/AbstractBuild.java 2012-07-24 16:32:51.874007937 +0100
-+++ jenkins/core/src/main/java/hudson/model/AbstractBuild.java 2012-07-24 16:33:05.018054811 +0100
-@@ -1267,6 +1267,15 @@
+--- a/core/src/main/java/hudson/model/AbstractBuild.java
++++ b/core/src/main/java/hudson/model/AbstractBuild.java
+@@ -1274,6 +1274,15 @@ public abstract class AbstractBuild<P ex
}
private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.getName());
@@ -24,11 +22,9 @@ Index: jenkins/core/src/main/java/hudson/model/AbstractBuild.java
}
-Index: jenkins/core/src/main/java/hudson/DescriptorExtensionList.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/DescriptorExtensionList.java 2012-07-24 16:32:51.874007937 +0100
-+++ jenkins/core/src/main/java/hudson/DescriptorExtensionList.java 2012-07-24 16:33:05.018054811 +0100
-@@ -81,8 +81,9 @@
+--- a/core/src/main/java/hudson/DescriptorExtensionList.java
++++ b/core/src/main/java/hudson/DescriptorExtensionList.java
+@@ -81,8 +81,9 @@ public class DescriptorExtensionList<T e
* @deprecated as of 1.416
* Use {@link #create(Jenkins, Class)}
*/
diff --git a/debian/patches/build/remove-findbugs.patch b/debian/patches/build/remove-findbugs.patch
index 723edc5..e6c8814 100644
--- a/debian/patches/build/remove-findbugs.patch
+++ b/debian/patches/build/remove-findbugs.patch
@@ -6,11 +6,9 @@ Description: The Debian build process does not run findbugs as
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/logging/LogRecorderManager.java 2012-07-24 17:48:11.807867241 +0100
-+++ jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java 2012-07-24 17:48:22.495901489 +0100
-@@ -112,7 +112,6 @@
+--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
++++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
+@@ -112,7 +112,6 @@ public class LogRecorderManager extends
/**
* Configure the logging level.
*/
@@ -18,11 +16,9 @@ Index: jenkins/core/src/main/java/hudson/logging/LogRecorderManager.java
public HttpResponse doConfigLogger(@QueryParameter String name, @QueryParameter String level) {
Jenkins.getInstance().checkPermission(Jenkins.ADMINISTER);
Level lv;
-Index: jenkins/core/src/main/java/hudson/util/PluginServletFilter.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/PluginServletFilter.java 2012-07-24 17:48:11.807867241 +0100
-+++ jenkins/core/src/main/java/hudson/util/PluginServletFilter.java 2012-07-24 17:48:22.495901489 +0100
-@@ -58,7 +58,6 @@
+--- a/core/src/main/java/hudson/util/PluginServletFilter.java
++++ b/core/src/main/java/hudson/util/PluginServletFilter.java
+@@ -58,7 +58,6 @@ public class PluginServletFilter impleme
public PluginServletFilter() {
}
@@ -30,11 +26,9 @@ Index: jenkins/core/src/main/java/hudson/util/PluginServletFilter.java
public void init(FilterConfig filterConfig) throws ServletException {
PluginServletFilter.filterConfig = filterConfig;
synchronized (LIST) {
-Index: jenkins/core/src/main/java/hudson/WebAppMain.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/WebAppMain.java 2012-07-24 17:48:11.807867241 +0100
-+++ jenkins/core/src/main/java/hudson/WebAppMain.java 2012-07-24 17:48:22.495901489 +0100
-@@ -251,7 +251,6 @@
+--- a/core/src/main/java/hudson/WebAppMain.java
++++ b/core/src/main/java/hudson/WebAppMain.java
+@@ -251,7 +251,6 @@ public final class WebAppMain implements
/**
* Installs log handler to monitor all Hudson logs.
*/
@@ -42,11 +36,9 @@ Index: jenkins/core/src/main/java/hudson/WebAppMain.java
private void installLogger() {
Jenkins.logRecords = handler.getView();
Logger.getLogger("hudson").addHandler(handler);
-Index: jenkins/core/src/main/java/jenkins/model/Jenkins.java
-===================================================================
---- jenkins.orig/core/src/main/java/jenkins/model/Jenkins.java 2012-07-24 17:48:11.807867241 +0100
-+++ jenkins/core/src/main/java/jenkins/model/Jenkins.java 2012-07-24 17:48:22.499901502 +0100
-@@ -699,7 +699,6 @@
+--- a/core/src/main/java/jenkins/model/Jenkins.java
++++ b/core/src/main/java/jenkins/model/Jenkins.java
+@@ -727,7 +727,6 @@ public class Jenkins extends AbstractCIB
* @param pluginManager
* If non-null, use existing plugin manager. create a new one.
*/
@@ -54,7 +46,7 @@ Index: jenkins/core/src/main/java/jenkins/model/Jenkins.java
protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
long start = System.currentTimeMillis();
-@@ -2963,7 +2962,6 @@
+@@ -2989,7 +2988,6 @@ public class Jenkins extends AbstractCIB
/**
* For debugging. Expose URL to perform GC.
*/
@@ -62,11 +54,9 @@ Index: jenkins/core/src/main/java/jenkins/model/Jenkins.java
public void doGc(StaplerResponse rsp) throws IOException {
checkPermission(Jenkins.ADMINISTER);
System.gc();
-Index: jenkins/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
-===================================================================
---- jenkins.orig/maven-plugin/src/main/java/hudson/maven/MavenUtil.java 2012-07-24 17:48:11.803867228 +0100
-+++ jenkins/maven-plugin/src/main/java/hudson/maven/MavenUtil.java 2012-07-24 17:48:22.499901502 +0100
-@@ -53,7 +53,6 @@
+--- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
++++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+@@ -53,7 +53,6 @@ import org.apache.maven.artifact.version
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingException;
@@ -74,7 +64,7 @@ Index: jenkins/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
/**
* @author Kohsuke Kawaguchi
-@@ -140,7 +139,6 @@
+@@ -140,7 +139,6 @@ public class MavenUtil {
* Creates a fresh {@link MavenEmbedder} instance.
*
*/
@@ -82,11 +72,9 @@ Index: jenkins/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
public static MavenEmbedder createEmbedder(MavenEmbedderRequest mavenEmbedderRequest) throws MavenEmbedderException, IOException {
-Index: jenkins/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
-===================================================================
---- jenkins.orig/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java 2012-07-24 17:48:11.803867228 +0100
-+++ jenkins/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java 2012-07-24 17:48:22.499901502 +0100
-@@ -170,7 +170,6 @@
+--- a/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
++++ b/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchiver.java
+@@ -170,7 +170,6 @@ public class SurefireArchiver extends Ma
return true;
}
@@ -94,11 +82,9 @@ Index: jenkins/maven-plugin/src/main/java/hudson/maven/reporters/SurefireArchive
private void markBuildAsSuccess(Throwable mojoError, MavenBuildInformation buildInfo) {
if(mojoError == null // in the success case we don't get any exception in Maven 3.0.2+; Maven < 3.0.2 returns no exception anyway
|| mojoError instanceof MojoFailureException) {
-Index: jenkins/core/src/main/java/hudson/cli/GroovyshCommand.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/cli/GroovyshCommand.java 2012-07-24 16:27:16.102613000 +0100
-+++ jenkins/core/src/main/java/hudson/cli/GroovyshCommand.java 2012-07-24 17:49:02.640030167 +0100
-@@ -87,7 +87,6 @@
+--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
++++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
+@@ -87,7 +87,6 @@ public class GroovyshCommand extends CLI
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
@@ -106,7 +92,7 @@ Index: jenkins/core/src/main/java/hudson/cli/GroovyshCommand.java
public Object doCall(Object[] args) {
assert(args.length == 1);
assert(args[0] instanceof Shell);
-@@ -110,7 +109,6 @@
+@@ -110,7 +109,6 @@ public class GroovyshCommand extends CLI
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
diff --git a/debian/patches/build/remove-licensing-report.patch b/debian/patches/build/remove-licensing-report.patch
index 44dc18c..a005c86 100644
--- a/debian/patches/build/remove-licensing-report.patch
+++ b/debian/patches/build/remove-licensing-report.patch
@@ -3,11 +3,9 @@ Description: Upstream generates a licensing report for Jenkins deps.
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly
-===================================================================
---- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.jelly 2012-07-24 16:32:51.818007739 +0100
-+++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly 2012-07-24 16:33:05.318055881 +0100
-@@ -31,13 +31,6 @@
+--- a/core/src/main/resources/hudson/AboutJenkins/index.jelly
++++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly
+@@ -31,13 +31,6 @@ THE SOFTWARE.
<p>
${%blurb}
</p>
@@ -21,10 +19,8 @@ Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.jelly
</l:main-panel>
</l:layout>
</j:jelly>
-Index: jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties
-===================================================================
---- jenkins.orig/core/src/main/resources/hudson/AboutJenkins/index.properties 2012-07-24 16:32:51.818007739 +0100
-+++ jenkins/core/src/main/resources/hudson/AboutJenkins/index.properties 2012-07-24 16:33:05.318055881 +0100
+--- a/core/src/main/resources/hudson/AboutJenkins/index.properties
++++ b/core/src/main/resources/hudson/AboutJenkins/index.properties
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
diff --git a/debian/patches/build/use-stock-asm3.patch b/debian/patches/build/use-stock-asm3.patch
index 595e70d..0a911b0 100644
--- a/debian/patches/build/use-stock-asm3.patch
+++ b/debian/patches/build/use-stock-asm3.patch
@@ -7,11 +7,9 @@ Description: Upstream use a remapped version of asm3 to ensure
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/util/SubClassGenerator.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/SubClassGenerator.java 2012-07-24 16:27:16.000000000 +0100
-+++ jenkins/core/src/main/java/hudson/util/SubClassGenerator.java 2012-07-24 17:12:02.125151475 +0100
-@@ -25,13 +25,13 @@
+--- a/core/src/main/java/hudson/util/SubClassGenerator.java
++++ b/core/src/main/java/hudson/util/SubClassGenerator.java
+@@ -25,13 +25,13 @@ package hudson.util;
import hudson.PluginManager.UberClassLoader;
import jenkins.model.Jenkins;
@@ -29,11 +27,9 @@ Index: jenkins/core/src/main/java/hudson/util/SubClassGenerator.java
/**
* Generates a new class that just defines constructors into the super types.
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2012-07-24 16:33:21.826114780 +0100
-+++ jenkins/core/pom.xml 2012-07-24 17:16:17.865891211 +0100
-@@ -577,6 +577,13 @@
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -583,6 +583,13 @@ THE SOFTWARE.
</dependency>
<dependency>
diff --git a/debian/patches/build/use-stock-jmdns.patch b/debian/patches/build/use-stock-jmdns.patch
index beaca59..f47b595 100644
--- a/debian/patches/build/use-stock-jmdns.patch
+++ b/debian/patches/build/use-stock-jmdns.patch
@@ -7,11 +7,9 @@ Description: Jenkins upstream ships with a forked version of
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/DNSMultiCast.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/DNSMultiCast.java 2012-07-24 16:32:51.194005512 +0100
-+++ jenkins/core/src/main/java/hudson/DNSMultiCast.java 2012-07-24 16:33:08.474067138 +0100
-@@ -67,12 +67,12 @@
+--- a/core/src/main/java/hudson/DNSMultiCast.java
++++ b/core/src/main/java/hudson/DNSMultiCast.java
+@@ -67,12 +67,12 @@ public class DNSMultiCast implements Clo
public void close() {
if (jmdns!=null) {
diff --git a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
index cf436c2..42590d6 100644
--- a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
@@ -3,10 +3,8 @@ Description: Transitional patch from jna-posix to jnr-posix as
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/PosixAPI.java 2012-07-24 16:32:51.226005626 +0100
-+++ jenkins/core/src/main/java/hudson/os/PosixAPI.java 2012-07-24 16:33:08.182066097 +0100
+--- a/core/src/main/java/hudson/os/PosixAPI.java
++++ b/core/src/main/java/hudson/os/PosixAPI.java
@@ -1,10 +1,9 @@
package hudson.os;
@@ -19,7 +17,7 @@ Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
import java.io.File;
import java.io.InputStream;
-@@ -34,11 +33,11 @@
+@@ -35,11 +34,11 @@ public class PosixAPI {
* used a fallback java implementation which does not support many operations.
*/
public static boolean supportsNative() {
@@ -33,10 +31,8 @@ Index: jenkins/core/src/main/java/hudson/os/PosixAPI.java
throw new PosixException(s,errors);
}
-Index: jenkins/core/src/main/java/hudson/os/PosixException.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/PosixException.java 2012-07-24 16:32:51.226005626 +0100
-+++ jenkins/core/src/main/java/hudson/os/PosixException.java 2012-07-24 16:33:08.182066097 +0100
+--- a/core/src/main/java/hudson/os/PosixException.java
++++ b/core/src/main/java/hudson/os/PosixException.java
@@ -1,6 +1,6 @@
package hudson.os;
@@ -45,7 +41,7 @@ Index: jenkins/core/src/main/java/hudson/os/PosixException.java
/**
* Indicates an error during POSIX API call.
-@@ -8,14 +8,14 @@
+@@ -8,14 +8,14 @@ import org.jruby.ext.posix.POSIX.ERRORS;
* @author Kohsuke Kawaguchi
*/
public class PosixException extends RuntimeException {
@@ -63,11 +59,9 @@ Index: jenkins/core/src/main/java/hudson/os/PosixException.java
return errors;
}
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2012-07-24 16:33:07.086062188 +0100
-+++ jenkins/core/pom.xml 2012-07-24 16:33:08.182066097 +0100
-@@ -117,6 +117,11 @@
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -117,6 +117,11 @@ THE SOFTWARE.
<version>1.0.3</version>
</dependency>
<dependency>
@@ -78,4 +72,4 @@ Index: jenkins/core/pom.xml
+ <dependency>
<groupId>org.kohsuke</groupId>
<artifactId>trilead-putty-extension</artifactId>
- <version>1.0</version>
+ <version>1.2</version>
diff --git a/debian/patches/native-integration/filter-native-integrations.patch b/debian/patches/native-integration/filter-native-integrations.patch
index 2ef11b2..d921151 100644
--- a/debian/patches/native-integration/filter-native-integrations.patch
+++ b/debian/patches/native-integration/filter-native-integrations.patch
@@ -3,11 +3,9 @@ Description: Filter non-Linux based native integrations from
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2012-07-24 16:33:06.810061201 +0100
-+++ jenkins/core/pom.xml 2012-07-24 16:33:07.086062188 +0100
-@@ -663,6 +663,17 @@
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -676,6 +676,17 @@ THE SOFTWARE.
<configuration>
<fork>${staplerFork}</fork><!-- the source code is big enough now that otherwise it fails with OutOfMemoryError -->
<maxmem>128m</maxmem>
diff --git a/debian/patches/native-integration/purge-embedded-su4j.patch b/debian/patches/native-integration/purge-embedded-su4j.patch
index 0f3874c..862e56a 100644
--- a/debian/patches/native-integration/purge-embedded-su4j.patch
+++ b/debian/patches/native-integration/purge-embedded-su4j.patch
@@ -2,10 +2,8 @@ Description: Purge embeddedsu4j from Jenkins - only required for Solaris
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/os/SU.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/os/SU.java 2012-07-24 16:32:51.310005927 +0100
-+++ jenkins/core/src/main/java/hudson/os/SU.java 2012-07-24 16:33:07.354063144 +0100
+--- a/core/src/main/java/hudson/os/SU.java
++++ b/core/src/main/java/hudson/os/SU.java
@@ -23,7 +23,6 @@
*/
package hudson.os;
@@ -14,7 +12,7 @@ Index: jenkins/core/src/main/java/hudson/os/SU.java
import hudson.Launcher.LocalLauncher;
import hudson.Util;
import hudson.model.Computer;
-@@ -92,21 +91,6 @@
+@@ -92,21 +91,6 @@ public abstract class SU {
}
}.start(listener,rootPassword);
diff --git a/debian/patches/native-integration/purge-windows-support.patch b/debian/patches/native-integration/purge-windows-support.patch
index c07210d..fa32d0a 100644
--- a/debian/patches/native-integration/purge-windows-support.patch
+++ b/debian/patches/native-integration/purge-windows-support.patch
@@ -4,11 +4,9 @@ Description: Purges native windows integration for slave from Jenkins.
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/slaves/SlaveComputer.java 2012-07-24 16:32:51.254005727 +0100
-+++ jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java 2012-07-24 16:33:07.914065141 +0100
-@@ -35,7 +35,6 @@
+--- a/core/src/main/java/hudson/slaves/SlaveComputer.java
++++ b/core/src/main/java/hudson/slaves/SlaveComputer.java
+@@ -35,7 +35,6 @@ import hudson.util.NullStream;
import hudson.util.RingBufferLogHandler;
import hudson.util.Futures;
import hudson.FilePath;
@@ -16,7 +14,7 @@ Index: jenkins/core/src/main/java/hudson/slaves/SlaveComputer.java
import hudson.Util;
import hudson.AbortException;
import hudson.remoting.Launcher;
-@@ -365,7 +364,6 @@
+@@ -365,7 +364,6 @@ public class SlaveComputer extends Compu
channel.pinClassLoader(getClass().getClassLoader());
channel.call(new SlaveInitializer());
diff --git a/debian/patches/native-integration/purge-winp.patch b/debian/patches/native-integration/purge-winp.patch
index feb1988..1a9611f 100644
--- a/debian/patches/native-integration/purge-winp.patch
+++ b/debian/patches/native-integration/purge-winp.patch
@@ -3,11 +3,9 @@ Description: Purges windows process integration from Jenkins
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
-===================================================================
---- jenkins.orig/core/src/main/java/hudson/util/ProcessTree.java 2012-07-24 16:32:51.282005826 +0100
-+++ jenkins/core/src/main/java/hudson/util/ProcessTree.java 2012-07-24 16:33:07.630064127 +0100
-@@ -37,8 +37,6 @@
+--- a/core/src/main/java/hudson/util/ProcessTree.java
++++ b/core/src/main/java/hudson/util/ProcessTree.java
+@@ -37,8 +37,6 @@ import hudson.util.ProcessTree.OSProcess
import hudson.util.ProcessTreeRemoting.IOSProcess;
import hudson.util.ProcessTreeRemoting.IProcessTree;
import org.apache.commons.io.FileUtils;
@@ -16,7 +14,7 @@ Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
-@@ -331,9 +329,6 @@
+@@ -331,9 +329,6 @@ public abstract class ProcessTree implem
return DEFAULT;
try {
@@ -26,7 +24,7 @@ Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
String os = Util.fixNull(System.getProperty("os.name"));
if(os.equals("Linux"))
return new Linux();
-@@ -390,81 +385,6 @@
+@@ -390,81 +385,6 @@ public abstract class ProcessTree implem
}
};
@@ -108,7 +106,7 @@ Index: jenkins/core/src/main/java/hudson/util/ProcessTree.java
static abstract class Unix extends Local {
@Override
public OSProcess get(Process proc) {
-@@ -1227,4 +1147,4 @@
+@@ -1227,4 +1147,4 @@ public abstract class ProcessTree implem
*/
public static boolean enabled = !Boolean.getBoolean(ProcessTreeKiller.class.getName()+".disable")
&& !Boolean.getBoolean(ProcessTree.class.getName()+".disable");
diff --git a/debian/patches/native-integration/windows-service-disable.patch b/debian/patches/native-integration/windows-service-disable.patch
index e096dc8..7abccfd 100644
--- a/debian/patches/native-integration/windows-service-disable.patch
+++ b/debian/patches/native-integration/windows-service-disable.patch
@@ -2,11 +2,9 @@ Description: Removes depenedency on windows specific components for Linux build
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/core/pom.xml
-===================================================================
---- jenkins.orig/core/pom.xml 2012-07-24 16:33:05.898057949 +0100
-+++ jenkins/core/pom.xml 2012-07-24 16:33:06.810061201 +0100
-@@ -720,32 +720,6 @@
+--- a/core/pom.xml
++++ b/core/pom.xml
+@@ -733,32 +733,6 @@ THE SOFTWARE.
</execution>
</executions>
</plugin>
diff --git a/debian/patches/ubuntu/ubuntu-font.patch b/debian/patches/ubuntu/ubuntu-font.patch
index 19f7f20..c2c4423 100644
--- a/debian/patches/ubuntu/ubuntu-font.patch
+++ b/debian/patches/ubuntu/ubuntu-font.patch
@@ -2,11 +2,9 @@ Description: Add 'Ubuntu' font to styling for Jenkins
Author: James Page <james.page at ubuntu.com>
Forwarded: not-needed
-Index: jenkins/war/src/main/webapp/css/style.css
-===================================================================
---- jenkins.orig/war/src/main/webapp/css/style.css 2012-07-24 16:32:51.166005413 +0100
-+++ jenkins/war/src/main/webapp/css/style.css 2012-07-24 16:33:08.642067737 +0100
-@@ -29,7 +29,7 @@
+--- a/war/src/main/webapp/css/style.css
++++ b/war/src/main/webapp/css/style.css
+@@ -29,7 +29,7 @@ body {
body, table, form, input, td, th, p, textarea, select
{
@@ -15,7 +13,7 @@ Index: jenkins/war/src/main/webapp/css/style.css
font-size: 11px;
}
-@@ -357,7 +357,7 @@
+@@ -357,7 +357,7 @@ th.pane {
padding: 4px 0;
margin-left: 0;
border-bottom: 1px solid #090;
diff --git a/debian/rules b/debian/rules
index 0b8ed00..a05436a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,8 +57,6 @@ clean::
[ ! -f dummy.keystore ] || rm dummy.keystore
rm -rf debian/*.upstart
rm -rf debian/plugin-debian.pom
- rm -f core/src/main/java/jenkins/util/MarkFindingOutputStream.java \
- core/src/main/java/jenkins/util/ServerTcpPort.java
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
@@ -72,10 +70,6 @@ before-mvn-build:: dummy.keystore
for module in jenkins-core cli pom jenkins-war; do \
find debian/maven-repo/org/jenkins-ci/main/$${module} -type l -delete || true ;\
done
- # Hack in java files from groovy source folder - no idea why they are there
- # might be maven3 related.
- cp core/src/main/groovy/jenkins/util/MarkFindingOutputStream.java core/src/main/java/jenkins/util
- cp core/src/main/groovy/jenkins/util/ServerTcpPort.java core/src/main/java/jenkins/util
dummy.keystore:
keytool -genkeypair -dname "cn=Jenkins, ou=Jenkins Project, o=Debian, c=US" \
--
jenkins packaging
More information about the pkg-java-commits
mailing list