Author: jbalunas(a)redhat.com Date: 2010-06-02 16:06:12 -0400 (Wed, 02 Jun 2010) New Revision: 17472 Added: root/build/resources/trunk/release.sh Modified: root/build/bom/trunk/pom.xml root/build/resources/trunk/clean_install.sh root/cdk/trunk/archetypes/ui-multimodule/pom.xml root/cdk/trunk/archetypes/ui-singlemodule/pom.xml root/cdk/trunk/bom/pom.xml root/cdk/trunk/parent/pom.xml root/cdk/trunk/plugins/commons/pom.xml root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml root/cdk/trunk/pom.xml root/commons/trunk/api/pom.xml root/commons/trunk/bom/pom.xml root/commons/trunk/parent/pom.xml root/core/trunk/api/pom.xml root/core/trunk/bom/pom.xml root/core/trunk/impl/pom.xml root/core/trunk/parent/pom.xml root/ui/core/trunk/bom/pom.xml root/ui/core/trunk/parent/pom.xml root/ui/core/trunk/pom.xml root/ui/core/trunk/ui/pom.xml root/ui/dist/trunk/assembler.xml root/ui/dist/trunk/pom.xml root/ui/dist/trunk/richfaces-components-api/pom.xml root/ui/dist/trunk/richfaces-components-impl/pom.xml root/ui/dist/trunk/richfaces-components-ui/pom.xml root/ui/iteration/trunk/bom/pom.xml root/ui/iteration/trunk/datascroller/api/pom.xml root/ui/iteration/trunk/datascroller/pom.xml root/ui/iteration/trunk/datascroller/ui/pom.xml root/ui/iteration/trunk/dist/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml root/ui/iteration/trunk/parent/pom.xml root/ui/iteration/trunk/pom.xml root/ui/iteration/trunk/tables/api/pom.xml root/ui/iteration/trunk/tables/impl/pom.xml root/ui/iteration/trunk/tables/pom.xml root/ui/iteration/trunk/tables/ui/pom.xml root/ui/misc/trunk/bom/pom.xml root/ui/misc/trunk/componentcontrol/pom.xml root/ui/misc/trunk/dist/pom.xml root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml root/ui/misc/trunk/functions/pom.xml root/ui/misc/trunk/parent/pom.xml root/ui/misc/trunk/pom.xml Log: RF-8460 Major update to pom.xml files to support release procedure Modified: root/build/bom/trunk/pom.xml =================================================================== --- root/build/bom/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/build/bom/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -38,68 +38,11 @@ <url>http://www.jboss.org/richfaces</url> <properties> - <!-- RichFaces Modules Versions --> - <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> - <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> - <richfaces.ui.core.version>4.0.0-SNAPSHOT</richfaces.ui.core.version> - <richfaces.ui.input.version>4.0.0-SNAPSHOT</richfaces.ui.input.version> - <richfaces.ui.output.version>4.0.0-SNAPSHOT</richfaces.ui.output.version> - <richfaces.ui.iteration.version>4.0.0-SNAPSHOT</richfaces.ui.iteration.version> - <richfaces.ui.misc.version>4.0.0-SNAPSHOT</richfaces.ui.misc.version> </properties> <!-- Runtime dependency management --> <dependencyManagement> <dependencies> - <!-- RichFaces --> - <dependency> - <groupId>org.richfaces.commons</groupId> - <artifactId>richfaces-commons-api</artifactId> - <version>${richfaces.commons.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-api</artifactId> - <version>${richfaces.core.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - <version>${richfaces.core.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>core</artifactId> - <version>${richfaces.ui.core.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>input</artifactId> - <version>${richfaces.ui.input.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>output</artifactId> - <version>${richfaces.ui.output.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>iteration</artifactId> - <version>${richfaces.ui.iteration.version}</version> - </dependency> - - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>misc</artifactId> - <version>${richfaces.ui.misc.version}</version> - </dependency> - <!-- JSF 2 --> <!-- This is set by default above, but can be overwritten by profiles Modified: root/build/resources/trunk/clean_install.sh =================================================================== --- root/build/resources/trunk/clean_install.sh 2010-06-02 18:46:37 UTC (rev 17471) +++ root/build/resources/trunk/clean_install.sh 2010-06-02 20:06:12 UTC (rev 17472) @@ -105,6 +105,8 @@ "core/trunk" "ui/core/trunk" "ui/misc/trunk" + "ui/iteration/trunk" + "ui/dist/trunk" # other ui modules when in place # TODO NOT SURE WHAT TO DO WITH /DISTS ) Added: root/build/resources/trunk/release.sh =================================================================== --- root/build/resources/trunk/release.sh (rev 0) +++ root/build/resources/trunk/release.sh 2010-06-02 20:06:12 UTC (rev 17472) @@ -0,0 +1,202 @@ +#!/bin/sh + +usage() +{ +cat << EOF +usage: $0 options + +** WARNING: DO NOT USE UNLESS FOLLOWING PROJECT PROCESS ** + +This script will release all modules in RichFaces 4.0 distributions. WARNING: DO NOT USE UNLESS FOLLOWING PROJECT PROCESS + +BASIC OPTIONS: + -h Show this message + -b Root directory, otherwise the PWD is used + -x Use mvn -X option + +Rules: +- Modules should only import other modules bom's for versions, not set specific version themselves +- All interproject versions must be set with variables in the for of: <version_prop>.version + - Example: "org.richfaces.commons.version" + - <version_prop> is set in the array below +- All sub-modules of a single t/b/t module must share versions + - Setting <autoVersionSubmodules> to true +- <parent> references within the same module must use <relativePath> + - This is needed because during release prepare the module parent is not installed + - For example: commons-api must reference commons-parent as ../parent/pom.xml + - Note: this is not needed for referencing parents outside of module + - Such as richfaces-parent - it is released already + +EOF +} + +work() +{ + +if [ "$DEBUG" -eq "1" ] +then + MVNARGS="-X" +fi + +if [ -d "$BASE" ] +then + echo "$ECHO_MARK Beginning build from base directory: $BASE" +else + echo "$ECHO_MARK Base directory does not exist, can not build from: $BASE" + exit 1; +fi + +for module_meta in "${MAIN_MODULE_ARRAY[@]}" +do + set -- $module_meta + #for each module I need + MODULE_PATH=$1 + REL_VER=$2 + DEV_VER=$3 + TAG_BASE=$4 + VER_PROP_BASE=$5 + + #derived variables + TAG_NAME="$TAG_BASE-$REL_VER" + MODULE_BASE=$BASE/$1 + MODULE_TRUNK=$MODULE_BASE/$TRUNK_EXT + MODULE_TAG=$MODULE_BASE/tags/$TAG_NAME + MVN_PREPARE_CMD="mvn $MVNARGS release:prepare --batch-mode -DdevelopmentVersion=$DEV_VER -DreleaseVersion=$REL_VER -Dtag=$TAG_NAME" + MVN_PERFORM_CMD="mvn $MVNARGS --batch-mode release:perform" + VER_PROP="$VER_PROP_BASE.version" + + echo + echo "================================= START" + echo "$ECHO_MARK Releasing $VER_PROP_BASE " + echo "$ECHO_MARK Module Path : $MODULE_BASE" + echo "$ECHO_MARK Module Trunk Path : $MODULE_TRUNK" + echo "$ECHO_MARK Module Tag Path : $MODULE_TAG" + echo "$ECHO_MARK Development Version : $DEV_VER" + echo "$ECHO_MARK Release Version : $REL_VER" + echo "$ECHO_MARK Tag Name : $TAG_NAME" + echo "$ECHO_MARK Version Prop : $VER_PROP" + echo ---------------------------------- + echo "$ECHO_MARK Moving into $MODULE_TRUNK" + + if [ -d "$MODULE_TRUNK" ] + then + cd $MODULE_TRUNK + + echo "$ECHO_MARK Excuting Maven Release Prepare Command: $MVN_PREPARE_CMD" + $MVN_PREPARE_CMD + if [ $? -eq "0" ] + then + echo "$ECHO_MARK Maven Release Prepare Command Completed" + else + echo "$ECHO_MARK Maven Release Prepare Command Failed" + exit 1; + fi + + # NOTE: This might not be needed, because all modules in a project share a version + # echo "$ECHO_MARK Fixing maven-release-plugin error with updating import versions in tag: $TAG_NAME" + # TODO - Need to verify next dev version gets updated correctly by plugin + # find $MODULE_TAG -name "pom.xml" | xargs perl -pi -e "s/<$VER_PROP>.+<\/$VER_PROP>/<$VER_PROP>$REL_VER<\/$VER_PROP>/" + # svn ci $MODULE_TAG -m "[RichFaces Release Script] Checking in release-plugin fix for import version updates" + # echo "$ECHO_MARK Fixing maven-release-plugin error complete" + + echo "$ECHO_MARK Executing Maven Release Perform Command: $MVN_PERFORM_CMD" + $MVN_PERFORM_CMD + if [ $? -eq "0" ] + then + echo "$ECHO_MARK Maven Release Perform Command Completed" + else + echo "$ECHO_MARK Maven Release Perform Command Failed" + exit 1; + fi + + echo "$ECHO_MARK Updating Intermodule Module Version References" + echo "$ECHO_MARK $ECHO_MARK Replacing $VER_PROP properties to: $REL_VER in all modules" + + # Only replace in pom.xml that are in a trunk, not in a tag, or branch + # - This is because only modules that have not released yet should be referring to this + find $BASE -name "pom.xml" -path *trunk/* | xargs perl -pi -e "s/<$VER_PROP>.+<\/$VER_PROP>/<$VER_PROP>$REL_VER<\/$VER_PROP>/" + if [ $? -eq "0" ] + then + echo "$ECHO_MARK Version References Updated" + else + echo "$ECHO_MARK Version Reference Update Failed" + exit 1; + fi + + svn ci $BASE . -m "[RichFaces Release Script] Updated intermodule version of $VER_PROP properties to: $REL_VER" + if [ $? -eq "0" ] + then + echo "$ECHO_MARK Commit of Version References Update Completed" + else + echo "$ECHO_MARK Commit of Version References Update Failed" + exit 1; + fi + + # TODO need to handle changing these to next $DEV_VER after release is complete + # - Will have to populate an array with data for this. + + echo "================================= END" + else + # TODO someday create an automatic rollback + echo "$ECHO_MARK Module directory does not exist, can not execute release - you must now rollback previous changes" + echo ================================= + exit 1; + fi + +done + +} + +BASE=`pwd` +TRUNK_EXT="trunk" +ECHO_MARK="==> " +DEBUG=0 +MVNARGS= +WORK=1 + +# Listing of all modules to be released +# TODO might be read from prop file +# http://tldp.org/LDP/abs/html/arrays.html#SCRIPTARRAY +# $1 = path to module trunk/head +# $2 = release version +# $3 = dev version +# $4 = tag name base - "-<release version" appended +# $5 = version property - required for updating intermodule dependencies modules +MAIN_MODULE_ARRAY=( + "build/bom 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-bom org.richfaces.bom" + "commons 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-commons org.richfaces.commons" + "core 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-core org.richfaces.core" + "cdk 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-cdk org.richfaces.cdk" + "ui/core 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-core org.richfaces.ui.core" + "ui/misc 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-misc org.richfaces.ui.misc" + "ui/iteration 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-iteration org.richfaces.ui.iteration" + # TODO Needs to be updated after merge + #"ui/dist 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-ui-dist org.richfaces.ui.dist" + #"archetypes/richfaces-archetype-simpleapp/ 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-archetype-simpleapp org.richfaces.archetypes.richfaces-archetype-simpleapp" + #"archetypes/richfaces-archetype-simpleapp/ 4.0.0.Alpha2 4.0.0-SNAPSHOT richfaces-archetype-simpleapp org.richfaces.archetypes richfaces-archetype-simpleapp" + ) + +while getopts "hb:x" OPTION +do + case $OPTION in + h) + usage + WORK=0 + ;; + b) + BASE=$OPTARG + ;; + x) + DEBUG=1 + ;; + [?]) + usage; + WORK=0 + ;; + esac +done + +if [ "$WORK" -eq "1" ] || [ "$#" -eq "0" ] +then + work; +fi \ No newline at end of file Modified: root/cdk/trunk/archetypes/ui-multimodule/pom.xml =================================================================== --- root/cdk/trunk/archetypes/ui-multimodule/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/archetypes/ui-multimodule/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -7,6 +7,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetypes</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: root/cdk/trunk/archetypes/ui-singlemodule/pom.xml =================================================================== --- root/cdk/trunk/archetypes/ui-singlemodule/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/archetypes/ui-singlemodule/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -7,6 +7,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-archetypes</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: root/cdk/trunk/bom/pom.xml =================================================================== --- root/cdk/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -19,7 +19,7 @@ <name>JSF Components Development Kit (CDK) bill of materials.</name> <description>This module defines all versions of CDK projects and their dependencies.</description> <properties> - <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> + <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> </properties> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/t... @@ -33,7 +33,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${project.version}</version> </plugin> </plugins> </pluginManagement> @@ -44,7 +44,7 @@ <dependency> <groupId>org.richfaces.commons</groupId> <artifactId>richfaces-commons-bom</artifactId> - <version>${richfaces.commons.version}</version> + <version>${org.richfaces.commons.version}</version> <scope>import</scope> <type>pom</type> </dependency> Modified: root/cdk/trunk/parent/pom.xml =================================================================== --- root/cdk/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -25,9 +25,9 @@ <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/t... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... - <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/root</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/cdk/t... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/Richfaces/cdk/trunk/parent</url... </scm> <repositories> <repository> Modified: root/cdk/trunk/plugins/commons/pom.xml =================================================================== --- root/cdk/trunk/plugins/commons/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/plugins/commons/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -7,6 +7,7 @@ <artifactId>maven-plugins</artifactId> <groupId>org.richfaces.cdk</groupId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>commons</artifactId> Modified: root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/plugins/maven-cdk-plugin/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -4,6 +4,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-plugins</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.cdk</groupId> Modified: root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml =================================================================== --- root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/plugins/maven-javascript-plugin/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -5,6 +5,7 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-plugins</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-javascript-plugin</artifactId> Modified: root/cdk/trunk/pom.xml =================================================================== --- root/cdk/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/cdk/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -19,7 +19,7 @@ <module>parent</module> <module>plugins</module> <module>archetypes</module> - <module>docs</module> + <!-- <module>docs</module> --> <module>dist</module> </modules> <!-- SCM and distribution management --> Modified: root/commons/trunk/api/pom.xml =================================================================== --- root/commons/trunk/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/commons/trunk/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,6 +24,7 @@ <groupId>org.richfaces.commons</groupId> <artifactId>richfaces-commons-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.commons</groupId> Modified: root/commons/trunk/bom/pom.xml =================================================================== --- root/commons/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/commons/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -40,7 +40,7 @@ <url>http://www.jboss.org/richfaces</url> <properties> - <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version> + <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> </properties> <!-- Runtime dependency management --> @@ -49,7 +49,7 @@ <dependency> <groupId>org.richfaces</groupId> <artifactId>richfaces-bom</artifactId> - <version>${richfaces.bom.version}</version> + <version>${org.richfaces.bom.version}</version> <scope>import</scope> <type>pom</type> </dependency> Modified: root/commons/trunk/parent/pom.xml =================================================================== --- root/commons/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/commons/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -36,7 +36,6 @@ </description> <properties> - <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> @@ -45,7 +44,7 @@ <dependency> <groupId>org.richfaces.commons</groupId> <artifactId>richfaces-commons-bom</artifactId> - <version>${richfaces.commons.version}</version> + <version>${project.version}</version> <type>pom</type> <scope>import</scope> </dependency> Modified: root/core/trunk/api/pom.xml =================================================================== --- root/core/trunk/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/core/trunk/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -25,6 +25,7 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: root/core/trunk/bom/pom.xml =================================================================== --- root/core/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/core/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -39,8 +39,7 @@ <url>http://www.jboss.org/richfaces</url> <properties> - <richfaces.commons.version>4.0.0-SNAPSHOT</richfaces.commons.version> - <richfaces.bom.version>4.0.0-SNAPSHOT</richfaces.bom.version> + <org.richfaces.commons.version>4.0.0-SNAPSHOT</org.richfaces.commons.version> </properties> <!-- Runtime dependency management --> @@ -49,7 +48,7 @@ <dependency> <groupId>org.richfaces.commons</groupId> <artifactId>richfaces-commons-bom</artifactId> - <version>${richfaces.commons.version}</version> + <version>${org.richfaces.commons.version}</version> <scope>import</scope> <type>pom</type> </dependency> Modified: root/core/trunk/impl/pom.xml =================================================================== --- root/core/trunk/impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/core/trunk/impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -25,6 +25,7 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: root/core/trunk/parent/pom.xml =================================================================== --- root/core/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/core/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -38,7 +38,6 @@ </description> <properties> - <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> </properties> @@ -47,7 +46,7 @@ <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> - <version>${richfaces.core.version}</version> + <version>${project.version}</version> <type>pom</type> <scope>import</scope> </dependency> Modified: root/ui/core/trunk/bom/pom.xml =================================================================== --- root/ui/core/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/core/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,14 +30,14 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-bom</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Core BOM</name> <packaging>pom</packaging> <properties> - <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version> + <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> </properties> <dependencyManagement> @@ -45,16 +45,22 @@ <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> - <version>${richfaces.core.api.version}</version> + <version>${org.richfaces.core.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> <version>${project.version}</version> </dependency> </dependencies> </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/co... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> Modified: root/ui/core/trunk/parent/pom.xml =================================================================== --- root/ui/core/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/core/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,7 +30,7 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-parent</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Core Parent</name> @@ -38,12 +38,13 @@ <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -53,7 +54,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${org.richfaces.cdk.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -65,7 +66,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${org.richfaces.cdk.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -176,4 +177,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/co... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> Modified: root/ui/core/trunk/pom.xml =================================================================== --- root/ui/core/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/core/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,7 +30,7 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,4 +41,10 @@ <module>parent</module> <module>ui</module> </modules> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/co... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/core/trunk/ui/pom.xml =================================================================== --- root/ui/core/trunk/ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/core/trunk/ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -21,13 +21,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> <name>Richfaces UI Components: Core UI</name> <packaging>jar</packaging> @@ -111,4 +112,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/co... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/dist/trunk/assembler.xml =================================================================== --- root/ui/dist/trunk/assembler.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/dist/trunk/assembler.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -7,8 +7,7 @@ <moduleSet> <includeSubModules>true</includeSubModules> <includes> - <include>org.richfaces.ui:*</include> - <include>org.richfaces.ui-sandbox:*</include> + <include>org.richfaces.ui.*:*</include> </includes> <sources> Modified: root/ui/dist/trunk/pom.xml =================================================================== --- root/ui/dist/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/dist/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -29,7 +29,7 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-ui-assembler</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -44,8 +44,32 @@ </modules> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- + The dist requires clean install for prepare + --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- + The dist requires clean install for prepare + --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + <plugin> <artifactId>maven-deploy-plugin</artifactId> <configuration> <skip>true</skip> @@ -65,5 +89,11 @@ </modules> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/di... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.dist</groupId> + <artifactId>richfaces-ui-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-api</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -41,9 +42,10 @@ </properties> <dependencyManagement> + <!-- TODO these must be updated to follow release script property naming --> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -54,7 +56,7 @@ <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> </dependency> @@ -121,7 +123,7 @@ <configuration> <artifactSet> <includes> - <include>${assembly.projects.group}:*-api:*</include> + <include>${assembly.projects.group}.*:*-api:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> @@ -157,7 +159,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}</includeGroupIds> + <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> @@ -184,4 +186,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/di... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.dist</groupId> + <artifactId>richfaces-ui-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-impl</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -42,8 +43,9 @@ <dependencyManagement> <dependencies> + <!-- TODO these must be updated to follow release script property naming --> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -54,13 +56,12 @@ <dependencies> <dependency> - <groupId>${assembly.projects.group}</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-impl</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-api</artifactId> <version>${project.version}</version> </dependency> @@ -157,7 +158,7 @@ <configuration> <artifactSet> <includes> - <include>org.richfaces.ui:*-impl:*</include> + <include>org.richfaces.ui.*:*-impl:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> @@ -193,7 +194,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}</includeGroupIds> + <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> @@ -220,4 +221,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/di... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml =================================================================== --- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.dist</groupId> + <artifactId>richfaces-ui-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-ui</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -42,22 +43,23 @@ <dependencyManagement> <dependencies> + <!-- TODO these must be updated to follow release script property naming --> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-bom</artifactId> <version>${project.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -69,21 +71,21 @@ <dependencies> <!-- artifacts for aggregation --> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-ui</artifactId> </dependency> <!-- for javadoc generation --> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.dist</groupId> <artifactId>richfaces-components-impl</artifactId> <version>${project.version}</version> </dependency> @@ -135,13 +137,6 @@ <artifactId>jstl</artifactId> <scope>provided</scope> </dependency> - - <dependency> - <groupId>org.richfaces.cdk</groupId> - <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> </dependencies> <build> @@ -159,7 +154,7 @@ <configuration> <artifactSet> <includes> - <include>org.richfaces.ui:*-ui:*</include> + <include>${assembly.projects.group}.*:*-ui:*</include> </includes> </artifactSet> <createSourcesJar>true</createSourcesJar> @@ -210,7 +205,7 @@ <configuration> <classifier>sources</classifier> - <includeGroupIds>${assembly.projects.group}</includeGroupIds> + <includeGroupIds>${assembly.projects.group}.core, ${assembly.projects.group}.misc, ${assembly.projects.group}.iteration</includeGroupIds> <useSubDirectoryPerArtifact>true</useSubDirectoryPerArtifact> <excludeTransitive>true</excludeTransitive> </configuration> @@ -275,5 +270,11 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/di... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/bom/pom.xml =================================================================== --- root/ui/iteration/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,14 +30,14 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Iteration BOM</name> <packaging>pom</packaging> <properties> - <richfaces.core.version>4.0.0-SNAPSHOT</richfaces.core.version> + <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> </properties> <dependencyManagement> @@ -45,23 +45,23 @@ <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> - <version>${richfaces.core.version}</version> + <version>${org.richfaces.core.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-ui</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-impl</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> <version>${project.version}</version> </dependency> @@ -96,4 +96,10 @@ </dependencies> </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> Modified: root/ui/iteration/trunk/datascroller/api/pom.xml =================================================================== --- root/ui/iteration/trunk/datascroller/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/datascroller/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,9 +24,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-parent</artifactId> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -96,5 +97,11 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/datascroller/pom.xml =================================================================== --- root/ui/iteration/trunk/datascroller/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/datascroller/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -26,9 +26,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -40,4 +41,10 @@ <module>api</module> <module>ui</module> </modules> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/datascroller/ui/pom.xml =================================================================== --- root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/datascroller/ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -26,9 +26,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-parent</artifactId> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>datascroller-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -119,5 +120,11 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/dist/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/dist/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-assembler</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,4 +42,21 @@ <module>richfaces-ui-iteration-impl</module> <module>richfaces-ui-iteration-ui</module> </modules> + + <build> + <plugins> + <!-- We need to disable the cdk plugin for the dist modules --> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <inherited>false</inherited> + </plugin> + </plugins> + </build> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-api</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -43,7 +44,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -156,4 +157,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-impl</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -43,7 +44,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -158,4 +159,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml =================================================================== --- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-ui</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -43,7 +44,7 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -210,4 +211,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/parent/pom.xml =================================================================== --- root/ui/iteration/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,7 +30,7 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-parent</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Iteration Parent</name> @@ -38,12 +38,13 @@ <properties> <richfaces.checkstyle.version>1</richfaces.checkstyle.version> + <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> <dependencyManagement> <dependencies> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -53,7 +54,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${org.richfaces.cdk.version}</version> </dependency> </dependencies> </dependencyManagement> @@ -65,7 +66,7 @@ <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${org.richfaces.cdk.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -176,4 +177,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> Modified: root/ui/iteration/trunk/pom.xml =================================================================== --- root/ui/iteration/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,7 +30,7 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.iteration</groupId> <artifactId>richfaces-ui-iteration-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -41,7 +41,41 @@ <module>parent</module> <module>tables</module> <module>datascroller</module> - <module>dist</module> </modules> + + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- + The dist requires clean install for prepare + --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- + The dist requires clean install for prepare + --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + </plugins> + </build> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/tables/api/pom.xml =================================================================== --- root/ui/iteration/trunk/tables/api/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/tables/api/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,9 +24,10 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-parent</artifactId> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>tables-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -102,5 +103,11 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/tables/impl/pom.xml =================================================================== --- root/ui/iteration/trunk/tables/impl/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/tables/impl/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -26,9 +26,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-parent</artifactId> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>tables-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -119,5 +120,11 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/tables/pom.xml =================================================================== --- root/ui/iteration/trunk/tables/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/tables/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -26,9 +26,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>richfaces-ui-iteration-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -41,4 +42,10 @@ <module>impl</module> <module>ui</module> </modules> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/iteration/trunk/tables/ui/pom.xml =================================================================== --- root/ui/iteration/trunk/tables/ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/iteration/trunk/tables/ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -26,9 +26,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-iteration-parent</artifactId> + <groupId>org.richfaces.ui.iteration</groupId> + <artifactId>tables-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> <groupId>org.richfaces.ui.iteration</groupId> @@ -119,5 +120,11 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/it... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces</url> + </scm> </project> \ No newline at end of file Modified: root/ui/misc/trunk/bom/pom.xml =================================================================== --- root/ui/misc/trunk/bom/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/bom/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,14 +30,14 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-bom</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Miscellanous BOM</name> <packaging>pom</packaging> <properties> - <richfaces.core.api.version>4.0.0-SNAPSHOT</richfaces.core.api.version> + <org.richfaces.core.version>4.0.0-SNAPSHOT</org.richfaces.core.version> </properties> <dependencyManagement> @@ -45,16 +45,32 @@ <dependency> <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-bom</artifactId> - <version>${richfaces.core.api.version}</version> + <version>${org.richfaces.core.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>componentcontrol-ui</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>functions-ui</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </dependencyManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> Modified: root/ui/misc/trunk/componentcontrol/pom.xml =================================================================== --- root/ui/misc/trunk/componentcontrol/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/componentcontrol/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -21,9 +21,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -46,7 +47,7 @@ <dependency> <!-- todo remove this dependency --> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-ui</artifactId> </dependency> @@ -116,4 +117,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> \ No newline at end of file Modified: root/ui/misc/trunk/dist/pom.xml =================================================================== --- root/ui/misc/trunk/dist/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/dist/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-parent</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-assembler</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -39,4 +40,21 @@ <!-- aggregate modules --> <module>richfaces-ui-misc-ui</module> </modules> + + <build> + <plugins> + <!-- We need to disable the cdk plugin for the dist modules --> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <inherited>false</inherited> + </plugin> + </plugins> + </build> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> \ No newline at end of file Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml =================================================================== --- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -24,12 +24,13 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>7</version> + <groupId>org.richfaces.ui.misc</groupId> + <artifactId>richfaces-ui-misc-assembler</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-ui</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>jar</packaging> @@ -38,31 +39,18 @@ <properties> <assembly.projects.group>org.richfaces.ui.misc</assembly.projects.group> <faces-shade-transformers.version>1</faces-shade-transformers.version> + <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui-misc-bom</artifactId> - <version>${project.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <!-- artifacts for aggregation --> <dependency> - <groupId>${assembly.projects.group}</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>componentcontrol-ui</artifactId> - <version>${project.version}</version> </dependency> <dependency> - <groupId>${assembly.projects.group}</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>functions-ui</artifactId> - <version>${project.version}</version> </dependency> <!-- artifacts for javadoc generation --> @@ -73,8 +61,7 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> - <scope>provided</scope> + <version>${org.richfaces.cdk.version}</version> </dependency> </dependencies> @@ -214,4 +201,10 @@ </build> </profile> </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> \ No newline at end of file Modified: root/ui/misc/trunk/functions/pom.xml =================================================================== --- root/ui/misc/trunk/functions/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/functions/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -21,9 +21,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-parent</artifactId> <version>4.0.0-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -110,4 +111,10 @@ <scope>test</scope> </dependency> </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> \ No newline at end of file Modified: root/ui/misc/trunk/parent/pom.xml =================================================================== --- root/ui/misc/trunk/parent/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/parent/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,30 +30,31 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-parent</artifactId> <version>4.0.0-SNAPSHOT</version> <name>Richfaces UI Components: Miscellanous Parent</name> <packaging>pom</packaging> - <properties> - <richfaces.core.ui.version>4.0.0-SNAPSHOT</richfaces.core.ui.version> - </properties> - + <properties> + <org.richfaces.ui.core.version>4.0.0-SNAPSHOT</org.richfaces.ui.core.version> + <org.richfaces.cdk.version>4.0.0-SNAPSHOT</org.richfaces.cdk.version> + </properties> + <dependencyManagement> <dependencies> <!-- TODO: remove this dependency used by componentControl --> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.core</groupId> <artifactId>richfaces-ui-core-bom</artifactId> - <version>${richfaces.core.ui.version}</version> + <version>${org.richfaces.ui.core.version}</version> <scope>import</scope> <type>pom</type> </dependency> <dependency> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-bom</artifactId> <version>${project.version}</version> <scope>import</scope> @@ -63,19 +64,19 @@ <dependency> <groupId>org.richfaces.cdk</groupId> <artifactId>annotations</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${org.richfaces.cdk.version}</version> </dependency> </dependencies> </dependencyManagement> - + <build> <pluginManagement> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>${org.richfaces.cdk.version}</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -121,4 +122,9 @@ </plugins> </build> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> </project> Modified: root/ui/misc/trunk/pom.xml =================================================================== --- root/ui/misc/trunk/pom.xml 2010-06-02 18:46:37 UTC (rev 17471) +++ root/ui/misc/trunk/pom.xml 2010-06-02 20:06:12 UTC (rev 17472) @@ -30,7 +30,7 @@ <version>7</version> </parent> - <groupId>org.richfaces.ui</groupId> + <groupId>org.richfaces.ui.misc</groupId> <artifactId>richfaces-ui-misc-aggregator</artifactId> <version>4.0.0-SNAPSHOT</version> <packaging>pom</packaging> @@ -47,6 +47,20 @@ </modules> <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- + The dist requires clean install for prepare + --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> @@ -65,7 +79,21 @@ <fail>false</fail> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <!-- The dist requires clean install for prepare --> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> </plugins> </build> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/mi... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> + </project> \ No newline at end of file