You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by ws...@apache.org on 2006/03/26 22:19:45 UTC
svn commit: r388954 - in /struts: action/trunk/ apps/trunk/
apps/trunk/blank/ apps/trunk/cookbook/ apps/trunk/examples/
apps/trunk/mailreader-dao/ apps/trunk/mailreader/ build/trunk/ el/trunk/
extras/trunk/ site/trunk/ taglib/trunk/ tiles/trunk/
Author: wsmoak
Date: Sun Mar 26 12:19:42 2006
New Revision: 388954
URL: http://svn.apache.org/viewcvs?rev=388954&view=rev
Log:
Change the Maven groupId to 'org.apache.struts.action' and 'org.apache.struts.tiles' and correct the version numbers.
Note: Struts Tiles no longer inherits from build/project.xml.
Modified:
struts/action/trunk/pom.xml
struts/action/trunk/project.xml
struts/apps/trunk/blank/project.xml
struts/apps/trunk/cookbook/project.xml
struts/apps/trunk/examples/project.xml
struts/apps/trunk/mailreader-dao/project.xml
struts/apps/trunk/mailreader/project.xml
struts/apps/trunk/project.properties
struts/apps/trunk/project.xml
struts/build/trunk/pom.xml
struts/build/trunk/project.xml
struts/el/trunk/maven.xml
struts/el/trunk/pom.xml
struts/el/trunk/project.xml
struts/extras/trunk/pom.xml
struts/extras/trunk/project.xml
struts/site/trunk/project.xml
struts/taglib/trunk/pom.xml
struts/taglib/trunk/project.xml
struts/tiles/trunk/maven.xml
struts/tiles/trunk/pom.xml
struts/tiles/trunk/project.properties
struts/tiles/trunk/project.xml
Modified: struts/action/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Sun Mar 26 12:19:42 2006
@@ -36,14 +36,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-build</artifactId>
<version>1.3.2-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
<artifactId>struts-action</artifactId>
<packaging>jar</packaging>
<version>1.3.2-SNAPSHOT</version>
Modified: struts/action/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/action/trunk/project.xml (original)
+++ struts/action/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -21,6 +21,7 @@
<extend>build/project.xml</extend>
<artifactId>struts-action</artifactId>
+ <currentVersion>1.3.2-SNAPSHOT</currentVersion>
<name>Struts Action Framework</name>
Modified: struts/apps/trunk/blank/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/blank/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/blank/project.xml (original)
+++ struts/apps/trunk/blank/project.xml Sun Mar 26 12:19:42 2006
@@ -11,9 +11,9 @@
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.tiles</groupId>
<artifactId>struts-tiles</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
Modified: struts/apps/trunk/cookbook/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/cookbook/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/cookbook/project.xml (original)
+++ struts/apps/trunk/cookbook/project.xml Sun Mar 26 12:19:42 2006
@@ -2,7 +2,7 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <id>struts-cookbook</id>
+ <artifactId>struts-cookbook</artifactId>
<name>Struts cookbook web application</name>
<package>example.*</package>
Modified: struts/apps/trunk/examples/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/examples/project.xml (original)
+++ struts/apps/trunk/examples/project.xml Sun Mar 26 12:19:42 2006
@@ -2,7 +2,7 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <id>struts-examples</id>
+ <artifactId>struts-examples</artifactId>
<name>Struts examples web application</name>
<package>org.apache.struts.webapp.*</package>
Modified: struts/apps/trunk/mailreader-dao/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader-dao/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/mailreader-dao/project.xml (original)
+++ struts/apps/trunk/mailreader-dao/project.xml Sun Mar 26 12:19:42 2006
@@ -19,7 +19,6 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <id>struts</id>
<artifactId>struts-mailreader-dao</artifactId>
<name>Struts mailreader DAO</name>
<package>org.apache.struts.apps.mailreader.dao.*</package>
Modified: struts/apps/trunk/mailreader/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/project.xml (original)
+++ struts/apps/trunk/mailreader/project.xml Sun Mar 26 12:19:42 2006
@@ -2,7 +2,6 @@
<project>
<extend>${basedir}/../project.xml</extend>
- <id>struts</id>
<artifactId>struts-mailreader</artifactId>
<name>Struts mailreader web application</name>
<package>org.apache.struts.apps.mailreader.*</package>
@@ -13,9 +12,9 @@
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-mailreader-dao</artifactId>
- <version>1.3.0</version>
+ <version>${pom.currentVersion}</version>
<url>http://struts.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
Modified: struts/apps/trunk/project.properties
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/project.properties?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/project.properties (original)
+++ struts/apps/trunk/project.properties Sun Mar 26 12:19:42 2006
@@ -2,3 +2,8 @@
shared.war.dir = ../shared/target/struts-mailreader
core.dist.lib.dir = ../../core/dist/lib
core.conf.share.dir = ../../core/conf/java
+
+maven.multiproject.basedir = .
+maven.multiproject.includes = */project.xml
+maven.multiproject.excludes = build/*
+
Modified: struts/apps/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/apps/trunk/project.xml (original)
+++ struts/apps/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -20,7 +20,7 @@
<extend>build/project.xml</extend>
- <id>struts-apps</id>
+ <artifactId>struts-apps</artifactId>
<name>Struts Applications</name>
<currentVersion>1.3.1-SNAPSHOT</currentVersion>
@@ -60,9 +60,9 @@
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2-SNAPSHOT</version>
<url>http://struts.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -71,9 +71,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-extras</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<url>http://struts.apache.org/download.cgi</url>
<properties>
<war.bundle>true</war.bundle>
@@ -82,9 +82,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-taglib</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<url>http://struts.apache.org/download.cgi</url>
<properties>
<war.bundle>true</war.bundle>
Modified: struts/build/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/pom.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/build/trunk/pom.xml (original)
+++ struts/build/trunk/pom.xml Sun Mar 26 12:19:42 2006
@@ -36,7 +36,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-build</artifactId>
<version>1.3.2-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: struts/build/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/build/trunk/project.xml (original)
+++ struts/build/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -55,7 +55,7 @@
<pomVersion>3</pomVersion>
<artifactId>struts-build</artifactId>
<name>Struts common build</name>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<currentVersion>1.3.2-SNAPSHOT</currentVersion>
Modified: struts/el/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/maven.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/el/trunk/maven.xml (original)
+++ struts/el/trunk/maven.xml Sun Mar 26 12:19:42 2006
@@ -14,7 +14,7 @@
<!-- Include struts-el .jar file in WEB-INF/lib -->
<ant:copy todir="${maven.war.webapp.dir}/WEB-INF/lib/" overwrite="false"
- file="${basedir}/target/struts-el-1.3.0.jar" />
+ file="${basedir}/target/struts-el-${pom.currentVersion}.jar" />
<!-- Include properties under WEB-INF/classes -->
<ant:copy todir="${maven.war.webapp.dir}/WEB-INF/classes/" overwrite="false">
Modified: struts/el/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/pom.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/el/trunk/pom.xml (original)
+++ struts/el/trunk/pom.xml Sun Mar 26 12:19:42 2006
@@ -35,14 +35,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-build</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
<artifactId>struts-el</artifactId>
<packaging>jar</packaging>
<version>1.3.1-SNAPSHOT</version>
@@ -106,19 +105,19 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-taglib</artifactId>
<version>1.3.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.tiles</groupId>
<artifactId>struts-tiles</artifactId>
<version>1.3.1-SNAPSHOT</version>
</dependency>
Modified: struts/el/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/el/trunk/project.xml (original)
+++ struts/el/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -20,7 +20,8 @@
<extend>build/project.xml</extend>
- <id>struts-el</id>
+ <artifactId>struts-el</artifactId>
+ <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts EL</name>
@@ -71,9 +72,9 @@
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
@@ -82,9 +83,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-taglib</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
@@ -93,9 +94,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.tiles</groupId>
<artifactId>struts-tiles</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
Modified: struts/extras/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/extras/trunk/pom.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/extras/trunk/pom.xml (original)
+++ struts/extras/trunk/pom.xml Sun Mar 26 12:19:42 2006
@@ -35,14 +35,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-build</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
<artifactId>struts-extras</artifactId>
<packaging>jar</packaging>
<version>1.3.1-SNAPSHOT</version>
@@ -91,9 +90,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: struts/extras/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/extras/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/extras/trunk/project.xml (original)
+++ struts/extras/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -20,8 +20,8 @@
<extend>build/project.xml</extend>
- <groupId>struts</groupId>
<artifactId>struts-extras</artifactId>
+ <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts Extras</name>
@@ -55,9 +55,9 @@
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
<cactus.bundle>true</cactus.bundle>
Modified: struts/site/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/site/trunk/project.xml (original)
+++ struts/site/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -20,8 +20,8 @@
<extend>build/project.xml</extend>
- <groupId>struts</groupId>
<artifactId>struts-site</artifactId>
+ <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts Site</name>
<!-- ################################################################ -->
Modified: struts/taglib/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/pom.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/taglib/trunk/pom.xml (original)
+++ struts/taglib/trunk/pom.xml Sun Mar 26 12:19:42 2006
@@ -35,14 +35,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-build</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
<artifactId>struts-taglib</artifactId>
<packaging>jar</packaging>
<version>1.3.1-SNAPSHOT</version>
@@ -105,9 +104,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: struts/taglib/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/taglib/trunk/project.xml (original)
+++ struts/taglib/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -20,7 +20,8 @@
<extend>build/project.xml</extend>
- <id>struts-taglib</id>
+ <artifactId>struts-taglib</artifactId>
+ <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts Taglibs</name>
<package>org.apache.struts.taglib</package>
@@ -55,9 +56,9 @@
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
<properties>
<cactus.bundle>true</cactus.bundle>
</properties>
Modified: struts/tiles/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/struts/tiles/trunk/maven.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/tiles/trunk/maven.xml (original)
+++ struts/tiles/trunk/maven.xml Sun Mar 26 12:19:42 2006
@@ -2,5 +2,62 @@
xmlns:j="jelly:core"
xmlns:ant="jelly:ant">
+ <tstamp>
+ <format property="today" pattern="yyyyMMdd"/>
+ </tstamp>
+
+ <postGoal name="dist">
+ <attainGoal name="jar:install"/>
+ </postGoal>
+
+ <postGoal name="dist:prepare-bin-filesystem">
+
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
+
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
+
+ <!-- Required by nightly build since it is not inherited from build/maven.xml -->
+ <goal name="copy-distribution">
+
+ <ant:mkdir dir="../build/nightly/${pom.artifactId}/"/>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.tar.gz">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}.tar.gz"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}.zip">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}.zip"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.tar.gz">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}-src.tar.gz"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:copy tofile="../build/nightly/${pom.artifactId}/${pom.artifactId}-${pom.currentVersion}-${today}-src.zip">
+ <ant:fileset dir="${maven.build.dir}/distributions">
+ <ant:include name="${pom.artifactId}-${pom.currentVersion}-src.zip"/>
+ </ant:fileset>
+ </ant:copy>
+ </goal>
</project>
Modified: struts/tiles/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/struts/tiles/trunk/pom.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/tiles/trunk/pom.xml (original)
+++ struts/tiles/trunk/pom.xml Sun Mar 26 12:19:42 2006
@@ -34,15 +34,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>struts</groupId>
- <artifactId>struts-build</artifactId>
- <version>1.3.1-SNAPSHOT</version>
- <relativePath>../build/pom.xml</relativePath>
- </parent>
-
<modelVersion>4.0.0</modelVersion>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.tiles</groupId>
<artifactId>struts-tiles</artifactId>
<packaging>jar</packaging>
<version>1.3.1-SNAPSHOT</version>
@@ -102,9 +95,9 @@
</dependency>
<dependency>
- <groupId>struts</groupId>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.1-SNAPSHOT</version>
+ <version>1.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: struts/tiles/trunk/project.properties
URL: http://svn.apache.org/viewcvs/struts/tiles/trunk/project.properties?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/tiles/trunk/project.properties (original)
+++ struts/tiles/trunk/project.properties Sun Mar 26 12:19:42 2006
@@ -1,5 +1,25 @@
+maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
+maven.changelog.range = 120
+
+maven.checkstyle.properties = ${basedir}/build/struts_checks.xml
+maven.checkstyle.header.file = ${basedir}/build/LICENSE.txt
+maven.checkstyle.format = jalopy
+
+checkstyle.regexp.header=${basedir}/build/LICENSE.CheckStyle
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+
+maven.javadoc.source=1.4
+
maven.repo.remote=http://www.ibiblio.org/maven,http://cvs.apache.org/repository,http://maven-taglib.sourceforge.net/maven
+
+maven.xdoc.date = left
+
+maven.jalopy.style = build/struts_jalopy.xml
+
+maven.linkcheck.exclude=http://svn.apache.org,http://issues.apache.org
maven.pdf.navigationFile=pdf-navigation.xml
Modified: struts/tiles/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/tiles/trunk/project.xml?rev=388954&r1=388953&r2=388954&view=diff
==============================================================================
--- struts/tiles/trunk/project.xml (original)
+++ struts/tiles/trunk/project.xml Sun Mar 26 12:19:42 2006
@@ -18,9 +18,9 @@
*/
-->
-
- <extend>build/project.xml</extend>
- <id>struts-tiles</id>
+ <groupId>org.apache.struts.tiles</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <currentVersion>1.3.1-SNAPSHOT</currentVersion>
<name>Struts Tiles</name>
@@ -44,9 +44,54 @@
</repository>
<dependencies>
<dependency>
- <groupId>struts</groupId>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <url>http://java.sun.com/products/servlet/</url>
+ <properties>
+ <scope>provided</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-chain</groupId>
+ <artifactId>commons-chain</artifactId>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/chain/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.6</version>
+ <url>http://jakarta.apache.org/commons/digester/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts.action</groupId>
<artifactId>struts-action</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2-SNAPSHOT</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -68,6 +113,7 @@
</dependency-->
</dependencies>
<build>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<sourceDirectory>src/java</sourceDirectory>
<resources>
<resource>
@@ -93,6 +139,21 @@
</includes>
</resource>
</resources>
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ </unitTest>
+
</build>
<reports>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org