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 2011/01/27 08:43:33 UTC
svn commit: r1064013 - /myfaces/trinidad/trunk/pom.xml
Author: matzew
Date: Thu Jan 27 07:43:33 2011
New Revision: 1064013
URL: http://svn.apache.org/viewvc?rev=1064013&view=rev
Log:
backing out previous revision
Modified:
myfaces/trinidad/trunk/pom.xml
Modified: myfaces/trinidad/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/pom.xml?rev=1064013&r1=1064012&r2=1064013&view=diff
==============================================================================
--- myfaces/trinidad/trunk/pom.xml (original)
+++ myfaces/trinidad/trunk/pom.xml Thu Jan 27 07:43:33 2011
@@ -28,10 +28,11 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>10</version>
+ <version>6</version>
</parent>
<groupId>org.apache.myfaces.trinidad</groupId>
+
<artifactId>trinidad</artifactId>
<version>2.0.0-beta-2-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,12 +41,14 @@
<!-- Standards -->
<jdk.version>1.6</jdk.version>
<servlet.version>2.5</servlet.version>
+
<portlet.version>2.0</portlet.version>
<validation.version>1.0.0.GA</validation.version>
<jsp.version>2.1</jsp.version>
<jstl.version>1.2</jstl.version>
<jsf-spec.version>2.0</jsf-spec.version>
<jsf-ri.version>2.0.4-b09</jsf-ri.version>
+
<jsf-myfaces.version>2.0.3</jsf-myfaces.version>
<portlet-bridge.version>1.0.0-beta</portlet-bridge.version>
<commons-lang.version>2.4</commons-lang.version>
@@ -53,6 +56,7 @@
<pluto-embedded.version>1.0.1</pluto-embedded.version>
<!-- Testing -->
+
<shale.version>1.0.5</shale.version>
<jmock.version>1.2.0</jmock.version>
<junit.version>4.4</junit.version>
@@ -60,6 +64,7 @@
<!-- Plugins -->
<trinidad-plugins.version>2.0.4</trinidad-plugins.version>
<wagon-plugin.version>1.0.6</wagon-plugin.version>
+
<jetty-plugin.version>6.1.21</jetty-plugin.version>
<pluto.version>1.1.6</pluto.version>
<pluto.package>org.apache.pluto</pluto.package>
@@ -76,6 +81,7 @@
<ciManagement>
<system>continuum</system>
<url>http://myfaces.zones.apache.org:8080/continuum</url>
+
<notifiers>
<notifier>
<type>mail</type>
@@ -83,6 +89,7 @@
<configuration>
<address>commits@myfaces.apache.org</address>
</configuration>
+
</notifier>
</notifiers>
</ciManagement>
@@ -91,12 +98,14 @@
<mailingList>
<name>MyFaces Users (use [Trinidad] prefix)</name>
<post>users@myfaces.apache.org</post>
+
<subscribe>users-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>users-unsubscribe@myfaces.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-users</archive>
<otherArchives>
<otherArchive>http://users.myfaces.markmail.org/</otherArchive>
<otherArchive>http://www.mail-archive.com/users@myfaces.apache.org/</otherArchive>
+
<otherArchive>http://www.nabble.com/MyFaces---Users-f181.html</otherArchive>
</otherArchives>
</mailingList>
@@ -104,12 +113,14 @@
<name>MyFaces Developers (use [Trinidad] prefix)</name>
<post>dev@myfaces.apache.org</post>
<subscribe>dev-subscribe@myfaces.apache.org</subscribe>
+
<unsubscribe>dev-unsubscribe@myfaces.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>
<otherArchives>
<otherArchive>http://dev.myfaces.markmail.org/</otherArchive>
<otherArchive>http://www.mail-archive.com/dev@myfaces.apache.org/</otherArchive>
<otherArchive>http://www.nabble.com/My-Faces---Dev-f182.html</otherArchive>
+
</otherArchives>
</mailingList>
<mailingList>
@@ -117,6 +128,7 @@
<post>Do not post</post>
<subscribe>issues-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>issues-unsubscribe@myfaces.apache.org</unsubscribe>
+
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>
<otherArchives>
<otherArchive>http://dev.myfaces.markmail.org/</otherArchive>
@@ -124,12 +136,14 @@
<otherArchive>http://www.nabble.com/My-Faces---Dev-f182.html</otherArchive>
</otherArchives>
</mailingList>
+
<mailingList>
<name>MyFaces commits</name>
<post>Do not post</post>
<subscribe>commits-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@myfaces.apache.org</unsubscribe>
<archive>http://mail-archives.apache.org/mod_mbox/myfaces-commits</archive>
+
<otherArchives>
<otherArchive>http://commits.myfaces.markmail.org/</otherArchive>
</otherArchives>
@@ -138,6 +152,7 @@
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/trinidad/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/trinidad/trunk</developerConnection>
<url>http://svn.apache.org/viewvc/myfaces/trinidad/trunk</url>
</scm>
@@ -145,9 +160,16 @@
<repositories>
<!-- needed for Bean Validation API -->
<repository>
+ <id>apache.snapshots</id>
+
+ <name>Apache Snapshots</name>
+ <url>http://repository.apache.org/snapshots</url>
+ </repository>
+ <repository>
<id>jboss</id>
<name>jboss nexus</name>
<url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+
</repository>
<!-- Needed for Mojarra -->
<repository>
@@ -155,6 +177,21 @@
<name>Java.net Repository for Maven</name>
<url>http://download.java.net/maven/2/</url>
</repository>
+
+ <!-- apache snapshot repository should be disabled... -->
+ <repository>
+ <id>apache.snapshots.old</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
@@ -176,8 +213,22 @@
<site>
<id>apache-site</id>
<name>Apache Website</name>
+
<url>scpexe://minotaur.apache.org/www/myfaces.apache.org/trinidad</url>
</site>
+
+ <!-- this is defined in a 'good' root pom, but not for ours... -->
+ <repository>
+ <id>apache.releases.https</id>
+ <name>Apache Release Distribution Repository</name>
+ <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+
+ </repository>
+ <snapshotRepository>
+ <id>apache.snapshots.https</id>
+ <name>Apache Development Snapshot Repository</name>
+ <url>https://repository.apache.org/content/repositories/snapshots</url>
+ </snapshotRepository>
</distributionManagement>
<dependencyManagement>
@@ -187,6 +238,7 @@
<artifactId>servlet-api</artifactId>
<version>${servlet.version}</version>
<scope>provided</scope>
+
</dependency>
<dependency>
@@ -194,6 +246,7 @@
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
<scope>provided</scope>
+
</dependency>
<dependency>
@@ -201,6 +254,7 @@
<artifactId>jsp-api</artifactId>
<version>${jsp.version}</version>
<scope>provided</scope>
+
</dependency>
<dependency>
@@ -208,6 +262,7 @@
<artifactId>portlet-api</artifactId>
<version>${portlet.version}</version>
<scope>provided</scope>
+
</dependency>
<dependency>
@@ -252,6 +307,7 @@
<version>${portlet-bridge.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<!-- If the impl is needed, it should always be added in -->
@@ -260,6 +316,7 @@
<version>${portlet-bridge.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>commons-lang</groupId>
@@ -269,6 +326,7 @@
<dependency>
<groupId>commons-io</groupId>
+
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
@@ -276,6 +334,7 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-build</artifactId>
+
<version>${pom.version}</version>
<scope>provided</scope>
</dependency>
@@ -283,6 +342,7 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
+
<version>${pom.version}</version>
</dependency>
@@ -290,6 +350,7 @@
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-impl</artifactId>
<version>${pom.version}</version>
+
</dependency>
<dependency>
@@ -297,6 +358,7 @@
<artifactId>trinidad-api</artifactId>
<version>${pom.version}</version>
<type>test-jar</type>
+
<scope>test</scope>
</dependency>
@@ -304,6 +366,7 @@
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
<version>${shale.version}</version>
+
<scope>test</scope>
</dependency>
@@ -311,6 +374,7 @@
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>${jmock.version}</version>
+
<scope>test</scope>
</dependency>
@@ -318,6 +382,7 @@
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
<version>${jmock.version}</version>
+
<scope>test</scope>
</dependency>
@@ -325,6 +390,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
+
<scope>test</scope>
</dependency>
@@ -333,6 +399,7 @@
<artifactId>maven-jetty-pluto-embedded</artifactId>
<version>${pluto-embedded.version}</version>
</dependency>
+
<dependency>
<groupId>${pluto.package}</groupId>
<artifactId>pluto-util</artifactId>
@@ -340,6 +407,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
</dependencyManagement>
<modules>
@@ -353,10 +421,10 @@
<plugins>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
<inherited>true</inherited>
<configuration>
<outputEncoding>UTF-8</outputEncoding>
+
</configuration>
</plugin>
@@ -366,6 +434,7 @@
<configuration>
<!-- set the forkMode to "always" to validate new tests,
and "never" otherwise for performance -->
+
<forkMode>never</forkMode>
<parallel>true</parallel>
</configuration>
@@ -374,6 +443,7 @@
<plugin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>wagon-maven-plugin</artifactId>
+
<version>${wagon-plugin.version}</version>
<inherited>true</inherited>
<configuration>
@@ -388,6 +458,7 @@
<version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
+
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
@@ -396,6 +467,7 @@
<inherited>true</inherited>
<configuration>
<force>true</force>
+
<jsfVersion>${jsf-spec.version}</jsfVersion>
</configuration>
</plugin>
@@ -404,6 +476,7 @@
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-jdev-plugin</artifactId>
<version>${trinidad-plugins.version}</version>
+
</plugin>
<plugin>
@@ -411,6 +484,7 @@
<artifactId>maven-i18n-plugin</artifactId>
<version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
+
</plugin>
<plugin>
@@ -418,6 +492,7 @@
<artifactId>maven-javascript-plugin</artifactId>
<version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
+
</plugin>
<plugin>
@@ -433,6 +508,7 @@
<configuration>
<source>${jdk.version}</source>
<target>${jdk.version}</target>
+
<!--
<showWarnings>true</showWarnings>
<compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>
@@ -444,6 +520,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<inherited>true</inherited>
+
<configuration>
<targetJdk>${jdk.version}</targetJdk>
</configuration>
@@ -452,6 +529,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+
<configuration>
<source>${jdk.version}</source>
</configuration>
@@ -460,6 +538,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
+
<inherited>true</inherited>
<configuration>
<filtering>false</filtering>
@@ -468,6 +547,7 @@
<plugin>
<artifactId>maven-source-plugin</artifactId>
+
<executions>
<execution>
<id>attach-source</id>
@@ -476,6 +556,7 @@
</goals>
</execution>
</executions>
+
</plugin>
<plugin>
@@ -499,12 +580,14 @@
</plugin>
<plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
<configuration>
<jdkName>${maven.compile.source}</jdkName>
<linkModules>true</linkModules>
<downloadSources>true</downloadSources>
+
<jdkLevel>5.0</jdkLevel>
</configuration>
</plugin>
@@ -515,6 +598,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
@@ -522,6 +606,7 @@
<goals>
<goal>enforce</goal>
</goals>
+
<configuration>
<rules>
<requireJavaVersion>
@@ -530,6 +615,7 @@
</requireJavaVersion>
</rules>
</configuration>
+
</execution>
</executions>
</plugin>
@@ -538,6 +624,7 @@
<artifactId>maven-release-plugin</artifactId>
<!--version>2.1</version-->
<configuration>
+
<preparationGoals>clean verify install</preparationGoals>
<tagBase>https://svn.apache.org/repos/asf/myfaces/trinidad/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -546,6 +633,7 @@
<!-- force generating a *-sources.jar when building a jar -->
<plugin>
+
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -553,6 +641,7 @@
<id>attach-source</id>
<goals>
<goal>jar</goal>
+
</goals>
</execution>
</executions>
@@ -561,6 +650,7 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-xrts-plugin</artifactId>
+
<executions>
<execution>
<goals>
@@ -569,6 +659,7 @@
</goals>
</execution>
</executions>
+
</plugin>
<plugin>
@@ -578,6 +669,7 @@
<execution>
<goals>
<goal>process</goal>
+
</goals>
<configuration>
<resourceBundles>
@@ -586,6 +678,7 @@
<properties>
<addLicense>true</addLicense>
</properties>
+
</configuration>
</execution>
</executions>
@@ -595,14 +688,16 @@
<reporting>
<plugins>
- <!--plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<threshold>Low</threshold>
</configuration>
- </plugin-->
+
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -611,13 +706,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.0.1</version>
</plugin>
- <!--plugin>
+ <plugin>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.3</version>
+
<configuration>
<rulesets>
<ruleset>/rulesets/basic.xml</ruleset>
@@ -625,9 +722,10 @@
</rulesets>
<linkXref>true</linkXref>
<minimumTokens>100</minimumTokens>
+
<targetJdk>${jdk.version}</targetJdk>
</configuration>
- </plugin-->
+ </plugin>
</plugins>
</reporting>
@@ -638,6 +736,7 @@
there is, it may manually be invoked by adding a -PbuildExamples.
-->
<profile>
+
<id>buildExamples</id>
<activation>
<property>
@@ -647,6 +746,7 @@
<modules>
<module>trinidad-examples</module>
+
</modules>
</profile>
@@ -669,6 +769,7 @@
<id>apache-release</id>
<modules>
+
<module>trinidad-assembly</module>
</modules>
</profile>
@@ -682,6 +783,7 @@
<profile>
<id>enableAssert</id>
<build>
+
<pluginManagement>
<plugins>
<plugin>
@@ -689,6 +791,7 @@
<inherited>true</inherited>
<configuration>
<forkMode>once</forkMode>
+
<argLine>-enableassertions</argLine>
<parallel>false</parallel>
</configuration>
@@ -697,6 +800,7 @@
</pluginManagement>
</build>
</profile>
+
<!--
This marks the JSF libraries for inclusion into the example projects. Execute this profile
@@ -711,6 +815,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
+
<version>${jsf-ri.version}</version>
<scope>compile</scope>
</dependency>
@@ -718,6 +823,7 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
+
<version>${jsf-ri.version}</version>
<scope>runtime</scope>
</dependency>
@@ -725,6 +831,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+
<version>${jsf-myfaces.version}</version>
<scope>compile</scope>
</dependency>
@@ -732,6 +839,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
+
<version>${jsf-myfaces.version}</version>
<scope>runtime</scope>
</dependency>
@@ -746,6 +854,7 @@
mvn install -PincludeJSTL
-->
<profile>
+
<id>includeJSTL</id>
<dependencyManagement>
<dependencies>
@@ -753,6 +862,7 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
+
<scope>compile</scope>
</dependency>
</dependencies>
@@ -767,6 +877,7 @@
-->
<profile>
<id>includeBridge</id>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -774,6 +885,7 @@
<artifactId>portlet-bridge-api</artifactId>
<version>${portlet-bridge.version}</version>
<scope>compile</scope>
+
</dependency>
<dependency>
@@ -782,6 +894,7 @@
<version>${portlet-bridge.version}</version>
<scope>runtime</scope>
</dependency>
+
</dependencies>
</dependencyManagement>
</profile>