Author: alexsmirnov Date: 2007-10-04 17:47:40 -0400 (Thu, 04 Oct 2007) New Revision: 3265 Added: branches/3.1.x/prepareRelease.sh Modified: branches/3.1.x/framework/impl/pom.xml branches/3.1.x/release notes.txt Log: prepare release deployment Modified: branches/3.1.x/framework/impl/pom.xml =================================================================== --- branches/3.1.x/framework/impl/pom.xml 2007-10-04 20:58:27 UTC (rev 3264) +++ branches/3.1.x/framework/impl/pom.xml 2007-10-04 21:47:40 UTC (rev 3265) @@ -1,4 +1,6 @@ -<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"> <!-- <parent> <artifactId>impl-parent</artifactId> @@ -53,9 +55,11 @@ </goals> <configuration> <tasks> - <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> + <ant + antfile="${basedir}/generatescript.xml" inheritRefs="true"> <target name="assembly" /> - <property name="target-dir" value="${project.build.directory}/javascript"> + <property name="target-dir" + value="${project.build.directory}/javascript"> </property> </ant> </tasks> @@ -81,152 +85,56 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.1_02</version> + <exclusions> + <exclusion> <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.1_02</version> - <exclusions> - <exclusion> - <artifactId>jsp-api</artifactId> - <groupId>javax.servlet.jsp</groupId> - </exclusion> - <exclusion> - <artifactId>jstl</artifactId> - <groupId>javax.servlet.jsp.jstl</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.1_02</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <artifactId>jsp-api</artifactId> - <groupId>javax.servlet.jsp</groupId> - </exclusion> - <exclusion> - <artifactId>jstl</artifactId> - <groupId>javax.servlet.jsp.jstl</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <activation> - <property> - <name>jsfVersion</name> - <value>1.2</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>process-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/jsf12</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> <groupId>javax.servlet.jsp</groupId> + </exclusion> + <exclusion> + <artifactId>jstl</artifactId> + <groupId>javax.servlet.jsp.jstl</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.1_02</version> + <scope>runtime</scope> + <exclusions> + <exclusion> <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>**/javacc/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - <dependencies> + <groupId>javax.servlet.jsp</groupId> + </exclusion> + <exclusion> + <artifactId>jstl</artifactId> + <groupId>javax.servlet.jsp.jstl</groupId> + </exclusion> + </exclusions> + </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.1</version> @@ -288,6 +196,24 @@ <version>3.1.1-SNAPSHOT</version> </dependency> </dependencies> + </profiles> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <excludes combine.children="append"> + <exclude>**/javacc/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> <properties> <jsfVersion>1.1</jsfVersion> </properties> Added: branches/3.1.x/prepareRelease.sh =================================================================== --- branches/3.1.x/prepareRelease.sh (rev 0) +++ branches/3.1.x/prepareRelease.sh 2007-10-04 21:47:40 UTC (rev 3265) @@ -0,0 +1,13 @@ +#!/bin/sh +mvn scm:checkout -DconnectionType=developerConnection +cd target/checkout +mvn release:prepare -P release -DautoVersionSubmodules=true \ + -Darguments="-P release" \ + -Dtag=$1 -DpreparationGoals="install" \ + -DtagBase=https://svn.jboss.org/repos/richfaces/tags <<-EOF +$1 +EOF +#find . -name pom.xml.branch -execdir mv pom.xml.branch pom.xml ';' +#mvn install +#cd .. +#svn copy checkout https://svn.jboss.org/repos/richfaces/tags/$1 -m " create tag for a release $1" \ No newline at end of file Modified: branches/3.1.x/release notes.txt =================================================================== --- branches/3.1.x/release notes.txt 2007-10-04 20:58:27 UTC (rev 3264) +++ branches/3.1.x/release notes.txt 2007-10-04 21:47:40 UTC (rev 3265) @@ -39,10 +39,16 @@ * [RF-985] - Test application. Data filter slider not rendered * [RF-986] - DataTable's BGcolor can't be changed * [RF-992] - calendar: the typo in style attribute - * [RF-993] - drag-n-drop on the tree: Problem with Netscape 7.1 - * [RF-1019] - ui/create.bat does not contain the good CDK reference - * [RF-1020] - Images for a tree lines not loaded after application restart. - + * [RF-993] - drag-n-drop on the tree: Problem with Netscape 7.1 + * [RF-1019] - ui/create.bat does not contain the good CDK reference + * [RF-1020] - Images for a tree lines not loaded after application restart. + * # RF-1022 suggestionBox closes unexpectedly in IE if the page vertical scroller is not at 0 position + * # RF-1028 Calendar performs unnesessary submit + * # RF-1039 onClick attribute for toolbargroup + * # RF-1055 Scrollable Data Table - missing resource exception + * # RF-1056 exception on access ty generated resources in Jboss Seam + * # RF-1061 blank page displayed after network error in AJAX request + * # RF-1064 ResourceLifecycle? fails to restore UIViewRoot?. Junit tests affected only. ** Feature Request