11:06 a.m.
Author: jbalunas(a)redhat.com
Date: 2010-08-22 12:06:24 -0400 (Sun, 22 Aug 2010)
New Revision: 18910
Modified:
trunk/
trunk/archetypes/pom.xml
trunk/examples/parent/pom.xml
trunk/examples/pom.xml
trunk/examples/richfaces-showcase/pom.xml
trunk/pom.xml
Log:
Merged revisions 18897,18901-18904,18906-18907 via svnmerge from
https://svn.jboss.org/repos/richfaces/branches/RFPL-754
.......
r18897 | jbalunas(a)redhat.com | 2010-08-20 18:42:08 -0400 (Fri, 20 Aug 2010) | 1 line
RFPL-754 update to showcase for release
.......
r18901 | jbalunas(a)redhat.com | 2010-08-22 10:49:19 -0400 (Sun, 22 Aug 2010) | 1 line
[maven-release-plugin] prepare release 4.0.0.20100822-M2
.......
r18902 | jbalunas(a)redhat.com | 2010-08-22 11:02:52 -0400 (Sun, 22 Aug 2010) | 1 line
[maven-release-plugin] rollback the release of 4.0.0.20100822-M2
.......
r18903 | jbalunas(a)redhat.com | 2010-08-22 11:13:49 -0400 (Sun, 22 Aug 2010) | 1 line
RFPL-754 Fixed a scm settings in some pom.xml for release
.......
r18904 | jbalunas(a)redhat.com | 2010-08-22 11:27:43 -0400 (Sun, 22 Aug 2010) | 1 line
[maven-release-plugin] prepare release 4.0.0.20100822-M2
.......
r18906 | jbalunas(a)redhat.com | 2010-08-22 11:28:51 -0400 (Sun, 22 Aug 2010) | 1 line
[maven-release-plugin] prepare for next development iteration
.......
r18907 | jbalunas(a)redhat.com | 2010-08-22 11:47:21 -0400 (Sun, 22 Aug 2010) | 1 line
[maven-release-plugin] rollback the release of 4.0.0.20100822-M2
.......
Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
- /branches/RFPL-754:1-18887
+ /branches/RFPL-754:1-18909
Modified: trunk/archetypes/pom.xml
===================================================================
--- trunk/archetypes/pom.xml 2010-08-22 15:55:24 UTC (rev 18909)
+++ trunk/archetypes/pom.xml 2010-08-22 16:06:24 UTC (rev 18910)
@@ -49,4 +49,10 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
+ <scm>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
+
<url>http://fisheye.jboss.org/browse/richfaces/trunk/archetypes</url...
+ </scm>
+
</project>
Modified: trunk/examples/parent/pom.xml
===================================================================
--- trunk/examples/parent/pom.xml 2010-08-22 15:55:24 UTC (rev 18909)
+++ trunk/examples/parent/pom.xml 2010-08-22 16:06:24 UTC (rev 18910)
@@ -222,4 +222,10 @@
</dependencies>
</profile>
</profiles>
+
+ <scm>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
+
<url>http://fisheye.jboss.org/browse/richfaces/trunk/examples/parent<...
+ </scm>
</project>
\ No newline at end of file
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2010-08-22 15:55:24 UTC (rev 18909)
+++ trunk/examples/pom.xml 2010-08-22 16:06:24 UTC (rev 18910)
@@ -1,35 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <!-- This aggregator pom, is not released, and is only used to make it easy to
build all of the
- examples at once from trunk. -->
+ <!--
+ This aggregator pom, is not released, and is only used to make
+ it easy to build all of the examples at once from trunk.
+ -->
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>10</version>
-<relativePath>../build/parent/pom.xml</relativePath>
+ <relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.examples</groupId>
@@ -50,4 +52,10 @@
<!--<module>dist</module>-->
</modules>
+ <scm>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/exam...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
+ <url>http://fisheye.jboss.org/browse/richfaces/trunk/examples</url>
+ </scm>
+
</project>
Modified: trunk/examples/richfaces-showcase/pom.xml
===================================================================
--- trunk/examples/richfaces-showcase/pom.xml 2010-08-22 15:55:24 UTC (rev 18909)
+++ trunk/examples/richfaces-showcase/pom.xml 2010-08-22 16:06:24 UTC (rev 18910)
@@ -205,7 +205,7 @@
<plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<configuration>
</configuration>
<executions>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-08-22 15:55:24 UTC (rev 18909)
+++ trunk/pom.xml 2010-08-22 16:06:24 UTC (rev 18910)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
@@ -25,14 +25,14 @@
<module>cdk</module>
<!-- richfaces ui -->
- <module>ui</module>
+ <module>ui</module>
<!-- Remaining -->
<module>archetypes</module>
<module>examples</module>
<!--<module>docs</module>-->
</modules>
-
+
<build>
<plugins>
<!-- To trigger the release -->
@@ -59,4 +59,10 @@
</modules>
</profile>
</profiles>
+
+ <scm>
+
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk</...
+
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun...
+ <url>http://fisheye.jboss.org/browse/richfaces/trunk</url>
+ </scm>
</project>