[SCM] jenkins packaging branch, master, updated. debian/1.480.2+dfsg-1_exp1-7-g776c98d

James Page james.page at ubuntu.com
Sun Feb 24 22:25:07 UTC 2013 

The following commit has been merged in the master branch:
commit e56d83654873c966c872daedc9d50ab0df898269
Author: James Page <james.page at ubuntu.com>
Date:   Sun Feb 17 18:05:53 2013 +0000

    New upstream release (Closes: #700761):
    
    * New upstream release (Closes: #700761):
      - d/control: Versioned BD jenkins-remoting >= 2.22.
      - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-42.
      - Refreshed patches.
      - Fixes the following security vulnerabilities:
        CVE-XXXX-YYYY, ...
    * d/control: Versioned BD trilead-putty-extension (>= 1.2)
      (Closes: #698834).

diff --git a/debian/changelog b/debian/changelog
index decc114..1fbbd4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+jenkins (1.480.3+dfsg-1~exp1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #700761):
+    - d/control: Versioned BD jenkins-remoting >= 2.22.
+    - d/control: Versioned BD jenkins-winstone >= 0.9.10-jenkins-42.
+    - Refreshed patches.
+    - Fixes the following security vulnerabilities:
+      CVE-XXXX-YYYY, ...
+  * d/control: Versioned BD trilead-putty-extension (>= 1.2)
+    (Closes: #698834).
+
+ -- James Page <james.page at ubuntu.com>  Sun, 17 Feb 2013 17:11:13 +0000
+
 jenkins (1.480.2+dfsg-1~exp1) experimental; urgency=low
 
   * New upstream release (Closes: #696816, #697617):
diff --git a/debian/control b/debian/control
index 950e546..b22eafa 100644
--- a/debian/control
+++ b/debian/control
@@ -53,9 +53,9 @@ Build-Depends-Indep:
  libjenkins-commons-jexl-java (>= 1.1-jenkins-20111212),
  libjenkins-htmlunit-java,
  libjenkins-json-java (>= 2.1-rev7),
- libjenkins-remoting-java (>= 2.16),
+ libjenkins-remoting-java (>= 2.22),
  libjenkins-trilead-ssh2-java (>= 214-jenkins-1),
- libjenkins-winstone-java (>= 0.9.10-jenkins-40),
+ libjenkins-winstone-java (>= 0.9.10-jenkins-42),
  libjenkins-xstream-java,
  libjetty-java,
  libjffi-java,
@@ -93,7 +93,7 @@ Build-Depends-Indep:
  libstapler-adjunct-codemirror-java,
  libstapler-adjunct-timeline-java,
  libstapler-java (>= 1.189),
- libtrilead-putty-extension-java,
+ libtrilead-putty-extension-java (>= 1.2),
  libtxw2-java,
  libxpp3-java,
  ttf-dejavu-core
diff --git a/debian/libjenkins-java.poms b/debian/libjenkins-java.poms
index 889880c..d3b9f34 100644
--- a/debian/libjenkins-java.poms
+++ b/debian/libjenkins-java.poms
@@ -27,3 +27,4 @@ pom.xml --has-package-version --no-parent
 core/pom.xml --has-package-version --ignore-pom
 war/pom.xml --has-package-version --ignore-pom
 cli/pom.xml --has-package-version --ignore-pom
+plugins/pom.xml --has-package-version --ignore-pom --no-parent
diff --git a/debian/patches/build/apt-stapler-processing.patch b/debian/patches/build/apt-stapler-processing.patch
index 28ca74e..52424b5 100644
--- a/debian/patches/build/apt-stapler-processing.patch
+++ b/debian/patches/build/apt-stapler-processing.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -651,6 +651,24 @@ THE SOFTWARE.
+@@ -652,6 +652,24 @@ THE SOFTWARE.
          </executions>
        </plugin>
        <plugin>
diff --git a/debian/patches/build/build.patch b/debian/patches/build/build.patch
index cb00fdc..405ace2 100644
--- a/debian/patches/build/build.patch
+++ b/debian/patches/build/build.patch
@@ -13,9 +13,9 @@ Forwarded: not-needed
      <module>war</module>
 -    <module>test</module>
      <module>cli</module>
+     <module>plugins</module>
    </modules>
- 
-@@ -580,9 +577,6 @@ THE SOFTWARE.
+@@ -581,9 +578,6 @@ THE SOFTWARE.
                  <requireJavaVersion>
                    <version>1.6.0-18</version>
                  </requireJavaVersion>
@@ -27,7 +27,7 @@ Forwarded: not-needed
            </execution>
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -325,6 +325,16 @@ THE SOFTWARE.
+@@ -326,6 +326,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 9f9656d..d8f5aac 100644
--- a/debian/patches/build/disable-plugins.patch
+++ b/debian/patches/build/disable-plugins.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/war/pom.xml
 +++ b/war/pom.xml
-@@ -154,6 +154,11 @@ THE SOFTWARE.
+@@ -174,6 +174,11 @@ THE SOFTWARE.
        <scope>system</scope>
        <systemPath>/usr/local/yjp/lib/yjp.jar</systemPath>
      </dependency-->
@@ -16,7 +16,7 @@ Forwarded: not-needed
    </dependencies>
  
    <build>
-@@ -241,66 +246,6 @@ THE SOFTWARE.
+@@ -261,66 +266,6 @@ THE SOFTWARE.
                    <outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
                    <destFileName>winstone.jar</destFileName>
                  </artifactItem>
diff --git a/debian/patches/build/openjdk6.patch b/debian/patches/build/openjdk6.patch
index 255f195..96eddbd 100644
--- a/debian/patches/build/openjdk6.patch
+++ b/debian/patches/build/openjdk6.patch
@@ -6,7 +6,7 @@ Forwarded: https://bugs.launchpad.net/ubuntu/+source/openjdk-6/+bug/716959
 
 --- 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
+@@ -1276,6 +1276,15 @@ public abstract class AbstractBuild<P ex
      }
  
      private static final Logger LOGGER = Logger.getLogger(AbstractBuild.class.getName());
diff --git a/debian/patches/build/remove-findbugs.patch b/debian/patches/build/remove-findbugs.patch
index e03e83c..757e39a 100644
--- a/debian/patches/build/remove-findbugs.patch
+++ b/debian/patches/build/remove-findbugs.patch
@@ -46,7 +46,7 @@ Forwarded: not-needed
      protected Jenkins(File root, ServletContext context, PluginManager pluginManager) throws IOException, InterruptedException, ReactorException {
          long start = System.currentTimeMillis();
          
-@@ -3018,7 +3017,6 @@ public class Jenkins extends AbstractCIB
+@@ -3019,7 +3018,6 @@ public class Jenkins extends AbstractCIB
      /**
       * For debugging. Expose URL to perform GC.
       */
diff --git a/debian/patches/build/use-stock-asm3.patch b/debian/patches/build/use-stock-asm3.patch
index 0a911b0..ef777f8 100644
--- a/debian/patches/build/use-stock-asm3.patch
+++ b/debian/patches/build/use-stock-asm3.patch
@@ -29,7 +29,7 @@ Forwarded: not-needed
   * Generates a new class that just defines constructors into the super types.
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -583,6 +583,13 @@ THE SOFTWARE.
+@@ -584,6 +584,13 @@ THE SOFTWARE.
      </dependency>
  
      <dependency>
diff --git a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
index 42590d6..4d45427 100644
--- a/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
+++ b/debian/patches/dependency-upgrades/jnr-posix-upgrade.patch
@@ -61,7 +61,7 @@ Forwarded: not-needed
  
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -117,6 +117,11 @@ THE SOFTWARE.
+@@ -118,6 +118,11 @@ THE SOFTWARE.
        <version>1.0.3</version>
      </dependency>
      <dependency>
diff --git a/debian/patches/native-integration/filter-native-integrations.patch b/debian/patches/native-integration/filter-native-integrations.patch
index d921151..6709eff 100644
--- a/debian/patches/native-integration/filter-native-integrations.patch
+++ b/debian/patches/native-integration/filter-native-integrations.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -676,6 +676,17 @@ THE SOFTWARE.
+@@ -677,6 +677,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 862e56a..18458db 100644
--- a/debian/patches/native-integration/purge-embedded-su4j.patch
+++ b/debian/patches/native-integration/purge-embedded-su4j.patch
@@ -12,7 +12,7 @@ Forwarded: not-needed
  import hudson.Launcher.LocalLauncher;
  import hudson.Util;
  import hudson.model.Computer;
-@@ -92,21 +91,6 @@ public abstract class SU {
+@@ -94,21 +93,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 37755c2..79aa9cf 100644
--- a/debian/patches/native-integration/purge-windows-support.patch
+++ b/debian/patches/native-integration/purge-windows-support.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- 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;
+@@ -36,7 +36,6 @@ import hudson.util.NullStream;
  import hudson.util.RingBufferLogHandler;
  import hudson.util.Futures;
  import hudson.FilePath;
@@ -14,11 +14,11 @@ Forwarded: not-needed
  import hudson.Util;
  import hudson.AbortException;
  import hudson.remoting.Launcher;
-@@ -370,7 +369,6 @@ public class SlaveComputer extends Compu
+@@ -389,7 +388,6 @@ public class SlaveComputer extends Compu
          channel.pinClassLoader(getClass().getClassLoader());
  
          channel.call(new SlaveInitializer());
--        channel.call(new WindowsSlaveInstaller(remoteFs));
+-//        channel.call(new WindowsSlaveInstaller(remoteFs));
          for (ComputerListener cl : ComputerListener.all())
              cl.preOnline(this,channel,root,taskListener);
  
diff --git a/debian/patches/native-integration/windows-service-disable.patch b/debian/patches/native-integration/windows-service-disable.patch
index 7abccfd..32a911a 100644
--- a/debian/patches/native-integration/windows-service-disable.patch
+++ b/debian/patches/native-integration/windows-service-disable.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/core/pom.xml
 +++ b/core/pom.xml
-@@ -733,32 +733,6 @@ THE SOFTWARE.
+@@ -734,32 +734,6 @@ THE SOFTWARE.
            </execution>
          </executions>
        </plugin>

-- 
jenkins packaging

More information about the pkg-java-commits mailing list