mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-10 02:26:18 +00:00
Merged revisions 32496,32499,32501,32505 via svnmerge from
https://svn.dev.java.net/svn/hudson/branches/rc ........ r32496 | kohsuke | 2010-07-05 11:27:25 -0700 (Mon, 05 Jul 2010) | 1 line integrated a fix for SECURITY-4 ........ r32499 | kohsuke | 2010-07-05 14:19:34 -0700 (Mon, 05 Jul 2010) | 1 line [maven-release-plugin] prepare release hudson-1_365 ........ r32501 | kohsuke | 2010-07-05 14:19:48 -0700 (Mon, 05 Jul 2010) | 1 line [maven-release-plugin] prepare for next development iteration ........ r32505 | kohsuke | 2010-07-05 15:29:51 -0700 (Mon, 05 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@32558 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
b2664abddd
commit
8cb24423cc
11 files changed
+18
-12
No files matched your search
+1
-1
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<artifactId>pom</artifactId>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>cli</artifactId>
|
||||
<name>Hudson CLI</name>
|
||||
|
||||
+2
-2
@@ -28,7 +28,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -356,7 +356,7 @@ THE SOFTWARE.
|
||||
<dependency>
|
||||
<groupId>org.kohsuke.stapler</groupId>
|
||||
<artifactId>stapler-jelly</artifactId>
|
||||
<version>1.144</version>
|
||||
<version>1.145</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>commons-jelly</groupId>
|
||||
|
||||
Vendored
+6
@@ -1,3 +1,9 @@
|
||||
hudson (1.365) unstable; urgency=low
|
||||
|
||||
* See http://hudson.dev.java.net/changelog.html for more details.
|
||||
|
||||
-- Kohsuke Kawaguchi <kk@kohsuke.org> Mon, 05 Jul 2010 15:26:25 -0700
|
||||
|
||||
hudson (1.364) unstable; urgency=low
|
||||
|
||||
* See http://hudson.dev.java.net/changelog.html for more details.
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>maven-plugin</artifactId>
|
||||
|
||||
@@ -33,7 +33,7 @@ THE SOFTWARE.
|
||||
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>Hudson main module</name>
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<artifactId>pom</artifactId>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
|
||||
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ui-samples-plugin</artifactId>
|
||||
|
||||
+2
-2
@@ -27,7 +27,7 @@ THE SOFTWARE.
|
||||
<parent>
|
||||
<groupId>org.jvnet.hudson.main</groupId>
|
||||
<artifactId>pom</artifactId>
|
||||
<version>1.365-SNAPSHOT</version>
|
||||
<version>1.366-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -126,7 +126,7 @@ THE SOFTWARE.
|
||||
<resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/remoting.jar" />
|
||||
<resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" />
|
||||
<resolveArtifact groupId="${project.groupId}" artifactId="cli" classifier="jar-with-dependencies" version="${project.version}" type="jar" tofile="${basedir}/target/generated-resources/WEB-INF/hudson-cli.jar" />
|
||||
<resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-20" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />
|
||||
<resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-21" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />
|
||||
|
||||
<!-- bundled plugins -->
|
||||
<resolveArtifact type="hpi" groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
|
||||
|
||||
Reference in new issue
Block a user