You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/11/23 18:03:27 UTC
svn commit: r1038203 - in /jackrabbit/trunk: jackrabbit-jcr-rmi/pom.xml
jackrabbit-jcr-servlet/pom.xml jackrabbit-parent/pom.xml pom.xml
Author: jukka
Date: Tue Nov 23 17:03:26 2010
New Revision: 1038203
URL: http://svn.apache.org/viewvc?rev=1038203&view=rev
Log:
[maven-release-plugin] prepare branch 2.2
Modified:
jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml
jackrabbit/trunk/jackrabbit-parent/pom.xml
jackrabbit/trunk/pom.xml
Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?rev=1038203&r1=1038202&r2=1038203&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Tue Nov 23 17:03:26 2010
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jackrabbit</groupId>
@@ -55,9 +52,7 @@
<phase>process-classes</phase>
<configuration>
<tasks>
- <rmic base="${project.build.outputDirectory}"
- verify="true"
- classpathref="maven.compile.classpath"/>
+ <rmic base="${project.build.outputDirectory}" verify="true" classpathref="maven.compile.classpath" />
</tasks>
</configuration>
<goals>
Modified: jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml?rev=1038203&r1=1038202&r2=1038203&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-servlet/pom.xml Tue Nov 23 17:03:26 2010
@@ -17,10 +17,7 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
- http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1038203&r1=1038202&r2=1038203&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Tue Nov 23 17:03:26 2010
@@ -28,7 +28,7 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>parent</artifactId>
<version>5</version>
- <relativePath/>
+ <relativePath />
</parent>
<artifactId>jackrabbit-parent</artifactId>
@@ -327,4 +327,10 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/parent/branches/2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/parent/branches/2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/jackrabbit/parent/branches/2.2</url>
+ </scm>
</project>
Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?rev=1038203&r1=1038202&r2=1038203&view=diff
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Tue Nov 23 17:03:26 2010
@@ -58,9 +58,9 @@
</modules>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/jackrabbit/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/jackrabbit/branches/2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/jackrabbit/branches/2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/jackrabbit/branches/2.2</url>
</scm>
<build>
@@ -80,7 +80,7 @@
<properties>
<username>${user.name}</username>
<keyfile>${user.home}/.ssh/id_rsa</keyfile>
- <passphrase></passphrase>
+ <passphrase />
</properties>
<build>
<plugins>
@@ -111,31 +111,29 @@
<phase>deploy</phase>
<configuration>
<tasks>
- <mkdir dir="${basedir}/target/${project.version}"/>
- <copy todir="${basedir}/target/${project.version}"
- flatten="true">
+ <mkdir dir="${basedir}/target/${project.version}" />
+ <copy todir="${basedir}/target/${project.version}" flatten="true">
<fileset dir="${basedir}">
- <include name="RELEASE-NOTES.txt"/>
- <include name="target/*-src.zip*"/>
- <include name="jackrabbit-standalone/target/*-${project.version}.jar*"/>
- <include name="jackrabbit-webapp/target/*-${project.version}.war*"/>
- <include name="jackrabbit-jca/target/*-${project.version}.rar*"/>
+ <include name="RELEASE-NOTES.txt" />
+ <include name="target/*-src.zip*" />
+ <include name="jackrabbit-standalone/target/*-${project.version}.jar*" />
+ <include name="jackrabbit-webapp/target/*-${project.version}.war*" />
+ <include name="jackrabbit-jca/target/*-${project.version}.rar*" />
</fileset>
</copy>
<checksum algorithm="MD5" fileext=".md5">
<fileset dir="${basedir}/target/${project.version}">
- <include name="*.zip"/>
- <include name="*.?ar"/>
+ <include name="*.zip" />
+ <include name="*.?ar" />
</fileset>
</checksum>
<checksum algorithm="SHA1" fileext=".sha">
<fileset dir="${basedir}/target/${project.version}">
- <include name="*.zip"/>
- <include name="*.?ar"/>
+ <include name="*.zip" />
+ <include name="*.?ar" />
</fileset>
</checksum>
- <checksum file="${basedir}/target/${project.version}/jackrabbit-${project.version}-src.zip"
- algorithm="SHA1" property="checksum"/>
+ <checksum file="${basedir}/target/${project.version}/jackrabbit-${project.version}-src.zip" algorithm="SHA1" property="checksum" />
<echo file="${basedir}/target/vote.txt">
From: ${username}@apache.org
To: dev@jackrabbit.apache.org
@@ -158,7 +156,7 @@ least three +1 Jackrabbit PMC votes are
[ ] +1 Release this package as Apache Jackrabbit ${project.version}
[ ] -1 Do not release this package because...${line.separator}
</echo>
- <echo/>
+ <echo />
<echo>
The release candidate has been prepared in:
@@ -172,7 +170,7 @@ A release vote template has been generat
file://${basedir}/target/vote.txt
</echo>
- <echo/>
+ <echo />
</tasks>
</configuration>
</execution>