svn commit: r828888 - in /incubator/log4php/trunk: package-config.php pom.xml

[ch...@apache.org]

Author: chammers
Date: Thu Oct 22 22:50:50 2009
New Revision: 828888

URL: http://svn.apache.org/viewvc?rev=828888&view=rev
Log:
Changed version number to 2.0.0-incubating as Christian G. suggested on the Wiki page "Log4php Releaseplan".

Modified:
    incubator/log4php/trunk/package-config.php
    incubator/log4php/trunk/pom.xml

Modified: incubator/log4php/trunk/package-config.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/package-config.php?rev=828888&r1=828887&r2=828888&view=diff
==============================================================================
--- incubator/log4php/trunk/package-config.php (original)
+++ incubator/log4php/trunk/package-config.php Thu Oct 22 22:50:50 2009
@@ -17,14 +17,14 @@
  */
 
 // parse pom.xml to get version in sync
-preg_match("/<version>(.+?)(-SNAPSHOT)?<\/version>/", file_get_contents("../../pom.xml"), $pom_version);
+preg_match("/<version>(.+?)(-(\w+))?<\/version>/", file_get_contents("../../pom.xml"), $pom_version);
 
 $name = 'log4php';
 $summary = 'log4Php is a PHP port of log4j framework';
-$version = $pom_version[1];
+$version = $pom_version[1].(empty($pom_version[3]) ? '' : $pom_version[3]);
 $versionBuild = 'b1';
 $apiVersion = '2.0.0';
-$state = empty($pom_version[2]) ? 'stable' : 'snapshot';
+$state = empty($pom_version[3]) ? 'stable' : 'snapshot';
 $apiStability = 'stable';
 
 $description = <<<EOT

Modified: incubator/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/pom.xml?rev=828888&r1=828887&r2=828888&view=diff
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ incubator/log4php/trunk/pom.xml Thu Oct 22 22:50:50 2009
@@ -20,7 +20,7 @@
 	<groupId>org.apache.log4php</groupId>
 	<artifactId>apache-log4php</artifactId>
 	<packaging>jar</packaging>
-	<version>2.0-SNAPSHOT</version>
+	<version>2.0.0-incubating</version>
 	<name>Apache log4php.</name>
 	<description>Logging framework for PHP.</description>
 	<url>http://incubator.apache.org:80/log4php</url>
@@ -117,7 +117,8 @@
 	<properties>
 		<surefire.reports>target/surefire-reports</surefire.reports>
 		<coverage.report>target/site/coverage-report</coverage.report>
-		<pear.version>2.0</pear.version>
+        <!-- PEAR does not accept a "-" after the version number! -->
+		<pear.version>2.0.0incubating</pear.version>
 	</properties>
 
 	<build>