9:14 a.m.
Author: jbalunas(a)redhat.com
Date: 2010-08-19 10:14:47 -0400 (Thu, 19 Aug 2010)
New Revision: 18815
Modified:
branches/RF-9112/bom/pom.xml
branches/RF-9112/cdk/parent/pom.xml
branches/RF-9112/core/parent/pom.xml
branches/RF-9112/dist/pom.xml
branches/RF-9112/examples/repeater-demo/pom.xml
branches/RF-9112/parent/pom.xml
branches/RF-9112/ui/parent/pom.xml
Log:
RF-9112 initial switch to root-parent usage
Modified: branches/RF-9112/bom/pom.xml
===================================================================
--- branches/RF-9112/bom/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/bom/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -34,12 +34,10 @@
</parent>
<description>
- The RichFaces "Bill of Materials". This defines all runtime dependency
- versions for RichFaces.
+ The RichFaces "Bill of Materials". This defines all runtime dependency
+ versions for RichFaces.
</description>
- <url>http://www.jboss.org/richfaces</url>
-
<properties>
</properties>
@@ -223,102 +221,6 @@
</dependencies>
</dependencyManagement>
- <profiles>
- <!--
- The following profiles determine the JSF api/impl
- combinations that will be used in the project builds.
-
- -Djsf_profile=<profile-name> on the mvn command line
- -->
- <profile>
- <id>jsf_ri</id>
- <activation>
- <property>
- <name>!jsf_profile</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>jsf_profile</name>
- <value>myfaces</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jsf_ri_2_1_snapshot</id>
- <activation>
- <property>
- <name>jsf_profile</name>
- <value>jsf_ri_2_1_snapshot</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>myfaces_snapshot</id>
- <activation>
- <property>
- <name>jsf_profile</name>
- <value>myfaces_snapshot</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/buil...
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
Modified: branches/RF-9112/cdk/parent/pom.xml
===================================================================
--- branches/RF-9112/cdk/parent/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/cdk/parent/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -5,8 +5,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: branches/RF-9112/core/parent/pom.xml
===================================================================
--- branches/RF-9112/core/parent/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/core/parent/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -28,9 +28,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../bom/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<description>
Modified: branches/RF-9112/dist/pom.xml
===================================================================
--- branches/RF-9112/dist/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/dist/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -23,9 +23,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../bom/pom.xml</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces</groupId>
Modified: branches/RF-9112/examples/repeater-demo/pom.xml
===================================================================
--- branches/RF-9112/examples/repeater-demo/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/examples/repeater-demo/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -105,6 +105,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: branches/RF-9112/parent/pom.xml
===================================================================
--- branches/RF-9112/parent/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/parent/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -1,21 +1,24 @@
<!--
- JBoss, Home of Professional Open Source Copyright 2010, Red Hat, Inc.
- and individual contributors by the @authors tag. See the copyright.txt
- in the distribution for a full listing of individual contributors. This
- is free software; you can redistribute it and/or modify it under the
- terms of the GNU Lesser General Public License as published by the Free
- Software Foundation; either version 2.1 of the License, or (at your
- option) any later version. This software is distributed in the hope that
- it will be useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Lesser General Public License for more details. You should have
- received a copy of the GNU Lesser General Public License along with this
- software; if not, write to the Free Software Foundation, Inc., 51
- Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
- site: http://www.fsf.org.
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
-->
-<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
@@ -26,16 +29,16 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
- <version>10-SNAPSHOT</version>
+ <artifactId>richfaces-bom</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
</parent>
<description>
- This is the root parent for the richfaces project that is released with the
project, and contains pluginmangement, and common testing dependency management elements.
+ This is the root parent for the richfaces project that is released with
+ the project, and contains pluginmangement, and common testing dependency
+ management elements.
</description>
-
- <url>http://richfaces.org</url>
-
+
<properties>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Override the default 2.0.9 from jboss-parent -->
@@ -80,126 +83,17 @@
<!-- Build -->
<build>
<!--
- Plugin config, including versions to use in the build. Note: some
- are inherited from jboss-parent
+ PluginManagement config, including versions to use in the
+ build. Note: some are inherited from jboss-parent, others
+ from richfaces-parent
-->
<pluginManagement>
<plugins>
- <!-- Release -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!-- All sub-modules will have same version -->
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <!-- During release:perform, enable the "release"
profile -->
- <releaseProfiles>release</releaseProfiles>
- <!-- Some modules (dist) need release items installed during
prepare -->
- <preparationGoals>clean install</preparationGoals>
- <!--
- RichFaces modules should override and set goals to
- run for release:perform
- -->
- <!-- <goals></goals> -->
- </configuration>
- </plugin>
-
-
- <!-- Build -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <index>true</index>
- <manifest>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <mode>development</mode>
- <Build-Number>${buildNumber}
- </Build-Number>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <!-- reporting -->
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
- <configuration>
-
<configLocation>richfaces-checkstyle/richfaces-checkstyle.xml
- </configLocation>
- </configuration>
- <executions>
- <execution>
- <id>richfaces-checkstyle-report</id>
- <phase>process-sources</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.richfaces</groupId>
-
<artifactId>richfaces-build-checkstyle</artifactId>
-
<version>${richfaces.checkstyle.version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <!-- dev -->
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <wtpversion>2.0</wtpversion>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
-
<!--
- docs TODO should move to profiles probably a "doc" profile
+ TODO: migrate plugin config from richfaces-parent.
+ Need to be careful of what root-aggregator, and bom
+ need though because they do not inherit this
-->
- <plugin>
- <groupId>gr.abiss.mvn.plugins</groupId>
- <artifactId>maven-jstools-plugin</artifactId>
- <version>0.7</version>
- <configuration>
-
<jsDir>${project.basedir}/src/main/resources/META-INF/resources
- </jsDir>
- <includes>**/*.js</includes>
- <caseSensitive>true</caseSensitive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -212,83 +106,110 @@
</plugins>
</build>
- <!-- Profiles -->
<profiles>
<profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <!-- TODO move to doc profile? -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <javadocVersion>1.5</javadocVersion>
- <aggregate>true</aggregate>
- </configuration>
- <executions>
- <execution>
- <id>generate-javadoc</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<!--
- Triggers generated documentation as part of builds ( javadoc,
- jsdoc, etc...
+ TODO: migrate profile config from richfaces-parent. Need
+ to be careful of what root-aggregator, and bom need
+ though because they do not inherit this
-->
- <id>doc</id>
- <!-- TODO -->
</profile>
+
+ <!--
+ The following profiles determine the JSF api/impl
+ combinations that will be used in the project builds.
+
+ -Djsf_profile=<profile-name> on the mvn command line
+ -->
<profile>
- <!-- Triggers clover reports to be generated -->
- <id>clover</id>
- <build>
- <plugins>
- <plugin>
- <groupId>com.atlassian.maven.plugins</groupId>
- <artifactId>maven-clover2-plugin</artifactId>
- <configuration>
- <licenseLocation>
- ${clover.license.path}
- </licenseLocation>
- <jdk>1.5</jdk>
- <generatePdf>false</generatePdf>
- <generateXml>true</generateXml>
- <generateHtml>true</generateHtml>
- </configuration>
- <executions>
- <execution>
- <id>instrument</id>
- <phase>verify</phase>
- <goals>
- <goal>instrument</goal>
- <goal>check</goal>
- <goal>clover</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <id>jsf_ri</id>
+ <activation>
+ <property>
+ <name>!jsf_profile</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
- <!-- Required when in JBoss hudson env to have clover reports generate
-->
- <id>hudson</id>
- <properties>
-
<clover.license.path>/home/hudson/config_repository/resources/richfaces/richfaces-clover-license.txt
- </clover.license.path>
- </properties>
+ <id>myfaces</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>myfaces</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
+ <profile>
+ <id>jsf_ri_2_1_snapshot</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>jsf_ri_2_1_snapshot</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>myfaces_snapshot</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>myfaces_snapshot</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
-
+
<!-- SCM and distribution management -->
<scm>
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/parent
Modified: branches/RF-9112/ui/parent/pom.xml
===================================================================
--- branches/RF-9112/ui/parent/pom.xml 2010-08-19 14:12:52 UTC (rev 18814)
+++ branches/RF-9112/ui/parent/pom.xml 2010-08-19 14:14:47 UTC (rev 18815)
@@ -26,9 +26,9 @@
<parent>
<groupId>org.richfaces</groupId>
- <artifactId>richfaces-bom</artifactId>
+ <artifactId>richfaces-root-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../bom/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.ui</groupId>