From 425ce1fb43f18e9ab8f0abe544a3ea41519508a2 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 2 Aug 2010 16:44:09 +0000 Subject: [PATCH] Merged revisions 33392,33438,33440,33444 via svnmerge from https://www.dev.java.net/svn/hudson/branches/rc ........ r33392 | mindless | 2010-07-30 08:50:29 -0700 (Fri, 30 Jul 2010) | 2 lines [HUDSON-7100] merge into rc branch for inclusion in 1.369 ........ r33438 | kohsuke | 2010-07-30 20:11:01 -0700 (Fri, 30 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_369 ........ r33440 | kohsuke | 2010-07-30 20:11:17 -0700 (Fri, 30 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r33444 | kohsuke | 2010-07-30 21:07:15 -0700 (Fri, 30 Jul 2010) | 1 line updated changelog as a part of the release ........ git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33521 71c3de6d-444a-0410-be80-ed276b4c234a --- cli/pom.xml | 2 +- core/pom.xml | 2 +- debian/debian/changelog | 6 ++++++ maven-agent/pom.xml | 2 +- maven-interceptor/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- pom.xml | 2 +- remoting/pom.xml | 2 +- test/pom.xml | 2 +- ui-samples-plugin/pom.xml | 2 +- war/pom.xml | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/cli/pom.xml b/cli/pom.xml index ba53d17478..3d299d5708 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.369-SNAPSHOT + 1.370-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 174ac927f4..8e6b0e65f2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/debian/debian/changelog b/debian/debian/changelog index 544cd6de96..bff19998f1 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.369) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi Fri, 30 Jul 2010 21:05:12 -0700 + hudson (1.368) unstable; urgency=low * See http://hudson.dev.java.net/changelog.html for more details. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 6a50df2165..d3418c4ea1 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index e2eeed39a7..e71b15d3b9 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 7f77b8b1fc..1af741483f 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 0ca51e01fa..3d1148f8b4 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index 4fcee5ec71..d19b53d2b0 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index aa2184dd45..7b3cb85093 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.369-SNAPSHOT + 1.370-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 31debf3fba..514cb99cb0 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index 33b9c717ec..792516ef76 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.369-SNAPSHOT + 1.370-SNAPSHOT ../pom.xml -- GitLab