Author: lukaszlenart
Date: Tue Nov 22 10:49:29 2011
New Revision: 1204910
URL: http://svn.apache.org/viewvc?rev=1204910&view=rev
Log:
Adds filtering for poms built with archetypes
Modified:
struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml
Modified: struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml?rev=1204910&r1=1204909&r2=1204910&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-blank/pom.xml Tue Nov 22
10:49:29 2011
@@ -21,6 +21,18 @@
<maven.test.skip>true</maven.test.skip>
</properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<profiles>
<profile>
<id>release</id>
Modified: struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml?rev=1204910&r1=1204909&r2=1204910&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-convention/pom.xml Tue
Nov 22 10:49:29 2011
@@ -1,4 +1,5 @@
-<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";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
@@ -12,14 +13,27 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</developerConnection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/
+ </developerConnection>
<url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-convention/</url>
</scm>
<properties>
- <maven.test.skip>true</maven.test.skip>
+ <maven.test.skip>true</maven.test.skip>
</properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<profiles>
<profile>
<id>release</id>
Modified: struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml?rev=1204910&r1=1204909&r2=1204910&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml
(original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/pom.xml Tue Nov
22 10:49:29 2011
@@ -1,9 +1,10 @@
-<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";>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-archetypes</artifactId>
- <version>2.3.1-SNAPSHOT</version>
- </parent>
+<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";>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-archetypes</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>struts2-archetype-dbportlet</artifactId>
@@ -12,7 +13,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</developerConnection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/
+ </developerConnection>
<url>svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-dbportlet/</url>
</scm>
@@ -20,6 +22,18 @@
<maven.test.skip>true</maven.test.skip>
</properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<profiles>
<profile>
<id>release</id>
Modified: struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml?rev=1204910&r1=1204909&r2=1204910&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-plugin/pom.xml Tue Nov 22
10:49:29 2011
@@ -1,46 +1,60 @@
-<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";>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-archetypes</artifactId>
- <version>2.3.1-SNAPSHOT</version>
- </parent>
+<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";>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-archetypes</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>struts2-archetype-plugin</artifactId>
- <version>2.3.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Struts 2 Archetypes - Plugin</name>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>struts2-archetype-plugin</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Struts 2 Archetypes - Plugin</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</developerConnection>
-
<url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/
+ </developerConnection>
+
<url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-plugin/</url>
</scm>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Modified: struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml?rev=1204910&r1=1204909&r2=1204910&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-portlet/pom.xml Tue Nov
22 10:49:29 2011
@@ -1,4 +1,5 @@
-<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";>
<parent>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-archetypes</artifactId>
@@ -13,7 +14,8 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</developerConnection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/
+ </developerConnection>
<url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-portlet/</url>
</scm>
@@ -21,6 +23,18 @@
<maven.test.skip>true</maven.test.skip>
</properties>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
<profiles>
<profile>
<id>release</id>
Modified: struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml?rev=1204910&r1=1204909&r2=1204910&view=diff
==============================================================================
--- struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml (original)
+++ struts/struts2/trunk/archetypes/struts2-archetype-starter/pom.xml Tue Nov
22 10:49:29 2011
@@ -1,49 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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";>
- <parent>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-archetypes</artifactId>
- <version>2.3.1-SNAPSHOT</version>
- </parent>
+<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";>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-archetypes</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>struts2-archetype-starter</artifactId>
- <version>2.3.1-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Struts 2 Archetypes - Starter</name>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>struts2-archetype-starter</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Struts 2 Archetypes - Starter</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</developerConnection>
-
<url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/
+ </developerConnection>
+
<url>http://svn.apache.org/repos/asf/struts/struts2/trunk/archetypes/struts2-archetype-starter/</url>
</scm>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/pom.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
