updated parent pom

git-svn-id: https://svn.apache.org/repos/asf/maven/release/trunk@1590413 13f79535-47bb-0310-9956-ffa450edef68

README.TXT

@@ -1,24 +1,4 @@
 Deploying web site
 -------------------
-You can use the deploySite(.sh|.bat) script
-Without any profile, the site will be deployed to http://maven.apache.org/maven-release-archives/maven-release-${project.version}
-sh ./deploySite.sh -Preporting
-
-To deploy main version http://maven.apache.org/maven-release, use
-sh ./deploySite.sh -Preporting -Psite-release
-
-Note you can add arguments to the script to pass your svn credentials:
--Dusername=
--Dpassword=
-
-Workflow for site when releasing
---------------------------------
-Once release staged, you can publish a staged site.
-cd target/checkout
-sh ./deploySite.sh -Preporting
-content will be in http://maven.apache.org/maven-release-archives/maven-release-${project.version}
-
-Once vote passed, redeploy main site:
-cd target/checkout (or use the version tag)
-sh ./deploySite.sh -Preporting -Psite-release
 
+see http://maven.apache.org/developers/website/deploy-component-reference-documentation.html

deploySite.bat

@@ -17,4 +17,5 @@
 @REM under the License.
 @REM ----------------------------------------------------------------------------
 
-mvn clean site-deploy scm-publish:publish-scm %*
+mvn -Preporting site site:stage %*
+mvn scm-publish:publish-scm %*

deploySite.sh

@@ -19,4 +19,5 @@
 # under the License.
 #
 
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn -Preporting site site:stage $@
+mvn scm-publish:publish-scm $@

maven-release-manager/pom.xml

@@ -219,6 +219,7 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
+        <version>1.7</version>
         <executions>
           <execution>
             <goals>

maven-release-policies/maven-release-oddeven-policy/.classpath

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

maven-release-policies/maven-release-oddeven-policy/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>maven-release-oddeven-policy</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>23</version>
+    <version>24</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -56,6 +56,12 @@
     <system>Jenkins</system>
     <url>https://builds.apache.org/job/maven-release/</url>
   </ciManagement>
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+    </site>
+  </distributionManagement>
 
   <contributors>
     <contributor>
@@ -66,21 +72,9 @@
   <properties>
     <scmVersion>1.9</scmVersion>
     <mavenVersion>2.2.1</mavenVersion>
-
-    <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
-    <maven.release.siteFilePath>${maven.site.cache}/maven-release-${project.version}</maven.release.siteFilePath>
-    <maven.release.siteUrlDeployment>file://${maven.release.siteFilePath}</maven.release.siteUrlDeployment>
-    <maven.release.scmPubCheckoutDirectory>${maven.site.cache}/maven-release-site-content-${project.version}</maven.release.scmPubCheckoutDirectory>
-    <maven.release.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/maven-release-archives/maven-release-${project.version}</maven.release.scmPubUrl>
+    <maven.site.path>maven-release-archives/maven-release-LATEST</maven.site.path>
   </properties>
 
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>${maven.release.siteUrlDeployment}</url>
-    </site>
-  </distributionManagement>
-
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -109,32 +103,14 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
+        <plugin><!-- TODO remove when upgrading maven-parent to 25 -->
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.16</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
+          <artifactId>maven-site-plugin</artifactId>
           <configuration>
-            <checkoutDirectory>${maven.release.scmPubCheckoutDirectory}</checkoutDirectory>
-            <pubScmUrl>scm:svn:${maven.release.scmPubUrl}</pubScmUrl>
-            <checkinComment>Apache Maven Release site deployment</checkinComment>
-            <content>${maven.release.siteFilePath}</content>
-            <tryUpdate>true</tryUpdate>
+            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
           </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
-
-  <profiles>
-    <profile>
-      <id>site-release</id>
-      <properties>
-        <maven.site.path>${project.artifactId}</maven.site.path>
-      </properties>
-    </profile>
-  </profiles>
 </project>