You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2010/04/30 03:49:53 UTC
svn commit: r939542 - in /roller/trunk: planet-business/pom.xml
planet-web/pom.xml pom.xml roller-core/pom.xml test-utils/pom.xml
weblogger-assembly/pom.xml weblogger-business/pom.xml weblogger-web/pom.xml
Author: snoopdave
Date: Fri Apr 30 01:49:52 2010
New Revision: 939542
URL: http://svn.apache.org/viewvc?rev=939542&view=rev
Log:
Setting version number of 5.0.0-RC1 in preparation for release candidate
Modified:
roller/trunk/planet-business/pom.xml
roller/trunk/planet-web/pom.xml
roller/trunk/pom.xml
roller/trunk/roller-core/pom.xml
roller/trunk/test-utils/pom.xml
roller/trunk/weblogger-assembly/pom.xml
roller/trunk/weblogger-business/pom.xml
roller/trunk/weblogger-web/pom.xml
Modified: roller/trunk/planet-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-business/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/planet-business/pom.xml (original)
+++ roller/trunk/planet-business/pom.xml Fri Apr 30 01:49:52 2010
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,7 +18,7 @@
</description>
<groupId>org.apache.roller</groupId>
<artifactId>roller-planet-business</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<properties>
<testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
+
<dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
@@ -195,7 +195,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -359,3 +359,4 @@
</project>
+
Modified: roller/trunk/planet-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/planet-web/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/planet-web/pom.xml (original)
+++ roller/trunk/planet-web/pom.xml Fri Apr 30 01:49:52 2010
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -22,13 +22,13 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>planet-business</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
@@ -183,7 +183,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -303,7 +303,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -313,7 +313,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -337,3 +337,4 @@
</build>
</project>
+
Modified: roller/trunk/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/pom.xml (original)
+++ roller/trunk/pom.xml Fri Apr 30 01:49:52 2010
@@ -7,7 +7,7 @@
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<packaging>pom</packaging>
<name>Apache Roller Project</name>
@@ -26,6 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <roller.version>5.0.0-RC1</roller.version>
<!-- avoid CLOB/BLOB error in all later versions of Derby -->
<derby.version>10.1.3.1</derby.version>
</properties>
Modified: roller/trunk/roller-core/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/roller-core/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/roller-core/pom.xml (original)
+++ roller/trunk/roller-core/pom.xml Fri Apr 30 01:49:52 2010
@@ -7,17 +7,17 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
+
<name>Apache Roller Core Module</name>
<description>
Core code and resources used in other parts of Roller.
</description>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<dependencies>
@@ -43,4 +43,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: roller/trunk/test-utils/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/test-utils/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/test-utils/pom.xml (original)
+++ roller/trunk/test-utils/pom.xml Fri Apr 30 01:49:52 2010
@@ -7,21 +7,21 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Apache Roller Test Utilities</name>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<dependencies>
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
@@ -70,3 +70,4 @@
</dependencies>
</project>
+
Modified: roller/trunk/weblogger-assembly/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/pom.xml (original)
+++ roller/trunk/weblogger-assembly/pom.xml Fri Apr 30 01:49:52 2010
@@ -17,50 +17,81 @@
* under the License.
-->
<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.roller</groupId>
- <artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>roller-webblogger</artifactId>
- <packaging>pom</packaging>
-
- <name>Apache Roller Distribution assembly</name>
- <description>Assembles Roller into a distribution package</description>
-
- <build>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
-
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/binary.xml</descriptor>
- <descriptor>src/main/assembly/source.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
-
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
-
- </plugin>
-
- </plugins>
- </build>
+ <parent>
+ <groupId>org.apache.roller</groupId>
+ <artifactId>roller-project</artifactId>
+ <version>5.0.0-RC1</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>roller-webblogger</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Apache Roller Distribution assembly</name>
+ <description>Assembles Roller into a distribution package</description>
+
+ <build>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/binary.xml</descriptor>
+ <descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>release-sign-artifacts</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
+
Modified: roller/trunk/weblogger-business/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-business/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/weblogger-business/pom.xml (original)
+++ roller/trunk/weblogger-business/pom.xml Fri Apr 30 01:49:52 2010
@@ -2,12 +2,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,7 +17,7 @@
</description>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-business</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<properties>
<testOutputDirectory>${project.build.testOutputDirectory}</testOutputDirectory>
@@ -33,13 +33,13 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-planet-business</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
@@ -224,7 +224,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: roller/trunk/weblogger-web/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-web/pom.xml?rev=939542&r1=939541&r2=939542&view=diff
==============================================================================
--- roller/trunk/weblogger-web/pom.xml (original)
+++ roller/trunk/weblogger-web/pom.xml Fri Apr 30 01:49:52 2010
@@ -2,19 +2,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>5.0.0-RC1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Apache Roller Weblogger Web Application</name>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-web</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<packaging>war</packaging>
<dependencies>
@@ -22,13 +22,13 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-core</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-planet-business</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<exclusions>
<exclusion>
<artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>roller-weblogger-business</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
@@ -303,7 +303,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -388,7 +388,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -398,7 +398,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
</dependencies>
</plugin>
@@ -473,7 +473,7 @@
<dependency>
<groupId>org.apache.roller</groupId>
<artifactId>test-utils</artifactId>
- <version>5.0-BETA2-SNAPSHOT</version>
+ <version>${roller.version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>