You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2012/09/13 19:30:46 UTC
svn commit: r1384417 - in /turbine/maven/turbine-parent/trunk: NOTICE.txt
pom.xml src/changes/ src/changes/changes.xml xdocs/
Author: tv
Date: Thu Sep 13 17:30:45 2012
New Revision: 1384417
URL: http://svn.apache.org/viewvc?rev=1384417&view=rev
Log:
Update Apache parent POM to version 11
Move changes.xml to standard location
Added:
turbine/maven/turbine-parent/trunk/src/changes/
turbine/maven/turbine-parent/trunk/src/changes/changes.xml
- copied, changed from r1200689, turbine/maven/turbine-parent/trunk/xdocs/changes.xml
Removed:
turbine/maven/turbine-parent/trunk/xdocs/
Modified:
turbine/maven/turbine-parent/trunk/NOTICE.txt
turbine/maven/turbine-parent/trunk/pom.xml
Modified: turbine/maven/turbine-parent/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/NOTICE.txt?rev=1384417&r1=1384416&r2=1384417&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/NOTICE.txt (original)
+++ turbine/maven/turbine-parent/trunk/NOTICE.txt Thu Sep 13 17:30:45 2012
@@ -1,5 +1,5 @@
Turbine Parent POM
-Copyright 2006-2011 The Apache Software Foundation
+Copyright 2006-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: turbine/maven/turbine-parent/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/pom.xml?rev=1384417&r1=1384416&r2=1384417&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/pom.xml (original)
+++ turbine/maven/turbine-parent/trunk/pom.xml Thu Sep 13 17:30:45 2012
@@ -22,8 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <!-- Version 10 is broken; see https://issues.apache.org/jira/browse/MPOM-32 -->
- <version>9</version>
+ <version>11</version>
</parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
@@ -38,6 +37,11 @@
<url>http://turbine.apache.org</url>
<inceptionYear>2011</inceptionYear>
+ <!-- Now required by versions plugin -->
+ <prerequisites>
+ <maven>2.2.1</maven>
+ </prerequisites>
+
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/TRB</url>
@@ -89,18 +93,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>2.5.1</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -112,26 +106,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${turbine.javadoc.version}</version>
<configuration>
@@ -153,11 +127,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<configuration>
@@ -166,11 +135,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
<configuration>
@@ -199,10 +163,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
<!-- generate the Eclipse project files -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -249,19 +209,6 @@
<jvm>${turbine.surefire.java}</jvm>
</configuration>
</plugin>
- <plugin>
- <!-- attach the source code turbine.n building a jar -->
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>create-source-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -341,7 +288,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<!-- Exclude the navigation file for Maven 1 sites
and the changes file used by the changes-plugin,
@@ -569,12 +516,12 @@
<turbine.surefire.java>${JAVA_HOME}/bin/java</turbine.surefire.java>
<!-- Plugin versions (allows same value in reporting and build sections) -->
- <turbine.surefire.version>2.9</turbine.surefire.version>
- <turbine.surefire-report.version>2.9</turbine.surefire-report.version>
- <turbine.javadoc.version>2.8</turbine.javadoc.version>
+ <turbine.surefire.version>2.12</turbine.surefire.version>
+ <turbine.surefire-report.version>2.12</turbine.surefire-report.version>
+ <turbine.javadoc.version>2.8.1</turbine.javadoc.version>
<turbine.changes.version>2.6</turbine.changes.version>
<turbine.jxr.version>2.3</turbine.jxr.version>
- <turbine.project-info.version>2.4</turbine.project-info.version>
+ <turbine.project-info.version>2.5</turbine.project-info.version>
<!--
Make the deployment protocol pluggable. This allows to switch to
Copied: turbine/maven/turbine-parent/trunk/src/changes/changes.xml (from r1200689, turbine/maven/turbine-parent/trunk/xdocs/changes.xml)
URL: http://svn.apache.org/viewvc/turbine/maven/turbine-parent/trunk/src/changes/changes.xml?p2=turbine/maven/turbine-parent/trunk/src/changes/changes.xml&p1=turbine/maven/turbine-parent/trunk/xdocs/changes.xml&r1=1200689&r2=1384417&rev=1384417&view=diff
==============================================================================
--- turbine/maven/turbine-parent/trunk/xdocs/changes.xml (original)
+++ turbine/maven/turbine-parent/trunk/src/changes/changes.xml Thu Sep 13 17:30:45 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,12 +19,20 @@
-->
<document>
<properties>
- <title>Fulcrum Parent POM</title>
+ <title>Turbine Parent POM</title>
<author email="siegfried.goeschl@it20one.at">Siegfried Goeschl</author>
</properties>
<body>
- <release version="1-SNAPSHOT" date="as in SVN">
+ <release version="2" date="as in SVN">
+ <action dev="tv" type="update" date="2012-09-13">
+ Move changelog to standard location
+ </action>
+ <action dev="tv" type="update" date="2012-09-13">
+ Update Apache Parent POM to version 11 and remove all duplicate settings
+ </action>
+ </release>
+ <release version="1-SNAPSHOT" date="unreleased">
<action dev="sgoeschl" type="update" date="2011-11-07">
Removed site content since that conflicts with the Turbine site.
</action>