You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/06/16 18:11:19 UTC
svn commit: r547936 - in /myfaces/trinidad/branches/matzew-core-101-release:
./ trinidad-assembly/ trinidad-examples/ trinidad-examples/trinidad-blank/
trinidad-examples/trinidad-demo/ trinidad-examples/trinidad-example-assembly/
Author: matzew
Date: Sat Jun 16 09:11:18 2007
New Revision: 547936
URL: http://svn.apache.org/viewvc?view=rev&rev=547936
Log:
some maven updates to get the releae of Trinidad CORE out
Modified:
myfaces/trinidad/branches/matzew-core-101-release/pom.xml
myfaces/trinidad/branches/matzew-core-101-release/trinidad-assembly/pom.xml
myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/pom.xml
myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-blank/pom.xml
myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-demo/pom.xml
myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-example-assembly/pom.xml
Modified: myfaces/trinidad/branches/matzew-core-101-release/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew-core-101-release/pom.xml?view=diff&rev=547936&r1=547935&r2=547936
==============================================================================
--- myfaces/trinidad/branches/matzew-core-101-release/pom.xml (original)
+++ myfaces/trinidad/branches/matzew-core-101-release/pom.xml Sat Jun 16 09:11:18 2007
@@ -263,6 +263,7 @@
<module>trinidad-api</module>
<module>trinidad-build</module>
<module>trinidad-impl</module>
+ <module>trinidad-examples</module>
</modules>
<repositories>
@@ -480,5 +481,15 @@
</snapshotRepository>
-->
</distributionManagement>
+
+ <profiles>
+ <profile>
+ <id>generate-assembly</id>
+ <modules>
+ <module>trinidad-assembly</module>
+ <module>trinidad-examples</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: myfaces/trinidad/branches/matzew-core-101-release/trinidad-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew-core-101-release/trinidad-assembly/pom.xml?view=diff&rev=547936&r1=547935&r2=547936
==============================================================================
--- myfaces/trinidad/branches/matzew-core-101-release/trinidad-assembly/pom.xml (original)
+++ myfaces/trinidad/branches/matzew-core-101-release/trinidad-assembly/pom.xml Sat Jun 16 09:11:18 2007
@@ -18,13 +18,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>trinidad-assembly</artifactId>
<packaging>pom</packaging>
- <name>Apache Trinidad Assembly</name>
+ <name>Apache MyFaces Trinidad Assembly</name>
<description>This is the Apache MyFaces Trinidad Assembly</description>
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>1.0.1</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<build>
@@ -51,78 +51,9 @@
</configuration>
</plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-build</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-demo</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency-->
- </dependencies>
- <profiles>
- <profile>
- <id>generate-assembly</id>
- <build>
- <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
@@ -147,12 +78,6 @@
<version>${project.version}</version>
<classifier>javadoc</classifier>
</artifactItem>
- <!--artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>trinidad-demo</artifactId>
- <version>${project.version}</version>
- <classifier>javadoc</classifier>
- </artifactItem-->
</artifactItems>
<outputDirectory>${project.build.directory}/javadoc
</outputDirectory>
@@ -202,9 +127,74 @@
</executions>
</plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-build</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-api</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-impl</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!--dependency>
+ <groupId>org.apache.myfaces.trinidad</groupId>
+ <artifactId>trinidad-demo</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency-->
+ </dependencies>
+
</project>
Modified: myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/pom.xml?view=diff&rev=547936&r1=547935&r2=547936
==============================================================================
--- myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/pom.xml (original)
+++ myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/pom.xml Sat Jun 16 09:11:18 2007
@@ -23,7 +23,7 @@
<version>1.0.1-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
- <name>Apache Trinidad Examples</name>
+ <name>Apache MyFaces Trinidad Examples</name>
<artifactId>trinidad-example</artifactId>
<!-- FIXME: These connections are wrong for a SNAPSHOT
@@ -45,7 +45,7 @@
<profile>
<id>generate-assembly</id>
<modules>
- <module>blank</module>
+ <module>trinidad-blank</module>
<module>trinidad-demo</module>
<module>trinidad-example-assembly</module>
</modules>
Modified: myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-blank/pom.xml?view=diff&rev=547936&r1=547935&r2=547936
==============================================================================
--- myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-blank/pom.xml (original)
+++ myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-blank/pom.xml Sat Jun 16 09:11:18 2007
@@ -15,15 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <name>Apache Trinidad blank demo</name>
- <description>Apache Trinidad blank demo</description>
+ <name>Apache MyFaces Trinidad blank demo</name>
+ <description>Apache MyFaces Trinidad blank demo</description>
<artifactId>trinidad-blank</artifactId>
<packaging>war</packaging>
@@ -125,16 +124,15 @@
<!-- Apache Trinidad -->
<dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>trinidad-api</artifactId>
- <version>1.0.0-incubating</version>
- <scope>compile</scope>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>trinidad-impl</artifactId>
- <version>1.0.0-incubating</version>
+ <version>${pom.version}</version>
<scope>compile</scope>
</dependency>
Modified: myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-demo/pom.xml?view=diff&rev=547936&r1=547935&r2=547936
==============================================================================
--- myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-demo/pom.xml (original)
+++ myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-demo/pom.xml Sat Jun 16 09:11:18 2007
@@ -23,6 +23,7 @@
<modelVersion>4.0.0</modelVersion>
+
<name>Apache MyFaces Trinidad Demo</name>
<description>Apache MyFaces Trinidad Demo</description>
Modified: myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-example-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-example-assembly/pom.xml?view=diff&rev=547936&r1=547935&r2=547936
==============================================================================
--- myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-example-assembly/pom.xml (original)
+++ myfaces/trinidad/branches/matzew-core-101-release/trinidad-examples/trinidad-example-assembly/pom.xml Sat Jun 16 09:11:18 2007
@@ -19,13 +19,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>trinidad-example-assembly</artifactId>
<packaging>pom</packaging>
- <name>Apache Trinidad Example Assembly</name>
+ <name>Apache MyFaces Trinidad Example Assembly</name>
<description>This is the Apache MyFaces Trinidad Example Assembly</description>
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-example</artifactId>
- <version>1.0.0-incubating</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<build>