Author: nlebas
Date: Thu May 3 16:28:54 2012
New Revision: 1333532
URL: http://svn.apache.org/viewvc?rev=1333532&view=rev
Log:
more POM cleaning: missing plugin version, deprecated features, unused
repositories
Modified:
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-parent/assembly/pom.xml
tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml
tiles/framework/trunk/tiles-parent/tiles-core/pom.xml
tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml
tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml
Modified: tiles/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Thu May 3 16:28:54 2012
@@ -133,6 +133,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jxr-maven-plugin</artifactId>
+ <version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
@@ -181,7 +182,7 @@
</reporting>
<properties>
-
<tiles.osgi.symbolicName>org.apache.${artifactId}</tiles.osgi.symbolicName>
+
<tiles.osgi.symbolicName>org.apache.${project.artifactId}</tiles.osgi.symbolicName>
<tiles.osgi.export>org.apache.tiles.*;version=${project.version}</tiles.osgi.export>
<tiles.osgi.import>*</tiles.osgi.import>
<tiles.osgi.dynamicImport />
Modified: tiles/framework/trunk/tiles-parent/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/assembly/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/assembly/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/assembly/pom.xml Thu May 3 16:28:54 2012
@@ -51,7 +51,7 @@
<descriptor>src/main/assembly/docs.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
- <finalName>tiles-${version}</finalName>
+ <finalName>tiles-${project.version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
<tarLongFileMode>gnu</tarLongFileMode>
@@ -123,6 +123,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0-beta-4</version>
<executions>
<execution>
<phase>deploy</phase>
@@ -200,12 +201,5 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java_net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
</project>
Modified: tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-compat/pom.xml Thu May 3 16:28:54
2012
@@ -66,6 +66,7 @@
<plugin>
<groupId>net.sf.dtddoc</groupId>
<artifactId>dtddoc-maven-plugin</artifactId>
+ <version>1.1</version>
<configuration>
<docTitle>Tiles Definition File</docTitle>
</configuration>
@@ -118,17 +119,4 @@
</dependencies>
- <repositories>
- <repository>
- <id>dtddoc</id>
- <url>http://dtddoc.sf.net/maven2</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>dtddoc</id>
- <url>http://dtddoc.sf.net/maven2</url>
- </pluginRepository>
- </pluginRepositories>
-
</project>
Modified: tiles/framework/trunk/tiles-parent/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-core/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-core/pom.xml Thu May 3 16:28:54
2012
@@ -66,6 +66,7 @@
<plugin>
<groupId>net.sf.dtddoc</groupId>
<artifactId>dtddoc-maven-plugin</artifactId>
+ <version>1.1</version>
<configuration>
<docTitle>Tiles Definition File</docTitle>
</configuration>
@@ -127,22 +128,4 @@
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>dtddoc</id>
- <url>http://dtddoc.sf.net/maven2</url>
- </repository>
- <repository>
- <id>java_net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>dtddoc</id>
- <url>http://dtddoc.sf.net/maven2</url>
- </pluginRepository>
- </pluginRepositories>
-
</project>
Modified: tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-extras/pom.xml Thu May 3 16:28:54
2012
@@ -73,10 +73,10 @@
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-mustache</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${tiles.request.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>${project.version}</version>
</dependency>
@@ -153,11 +153,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>java_net</id>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
</project>
Modified: tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-parent/tiles-servlet/pom.xml Thu May 3
16:28:54 2012
@@ -78,6 +78,7 @@
<plugin>
<groupId>net.sf.dtddoc</groupId>
<artifactId>dtddoc-maven-plugin</artifactId>
+ <version>1.1</version>
<configuration>
<docTitle>Tiles Definition File</docTitle>
</configuration>
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-alt/pom.xml
Thu May 3 16:28:54 2012
@@ -54,7 +54,7 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-test-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -64,4 +64,4 @@
<version>2.5</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-common/pom.xml
Thu May 3 16:28:54 2012
@@ -35,9 +35,9 @@
<description>Common classes between modules of the test webapp.</description>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>tiles-extras</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test-db/pom.xml Thu
May 3 16:28:54 2012
@@ -33,7 +33,7 @@
<description>Tiles configuration that uses a database.</description>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-test-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -69,4 +69,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml?rev=1333532&r1=1333531&r2=1333532&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml
(original)
+++ tiles/framework/trunk/tiles-parent/tiles-test-pom/tiles-test/pom.xml Thu
May 3 16:28:54 2012
@@ -38,29 +38,29 @@
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-test-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-test-alt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-test-db</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-extras</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.apache.tiles</groupId>
<artifactId>tiles-request-portlet</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${tiles.request.version}</version>
</dependency>
<dependency>
@@ -162,7 +162,7 @@
</configuration>
</plugin>
</plugins>
- <finalName>${pom.artifactId}</finalName>
+ <finalName>${project.artifactId}</finalName>
</build>
<profiles>
@@ -206,10 +206,10 @@
<phase>process-resources</phase>
<configuration>
<tasks>
- <copy
todir="${project.build.directory}/${artifactId}/selenium/core">
+ <copy
todir="${project.build.directory}/${project.artifactId}/selenium/core">
<fileset
dir="${project.build.directory}/selenium/core" />
</copy>
- <copy
todir="${project.build.directory}/${artifactId}/selenium/tests">
+ <copy
todir="${project.build.directory}/${project.artifactId}/selenium/tests">
<fileset dir="src/test/selenium" />
</copy>
</tasks>
@@ -414,6 +414,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
+ <version>1.0-beta-4</version>
<executions>
<execution>
<phase>deploy</phase>
