You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/08/28 13:22:43 UTC
svn commit: r689785 - in /cocoon/whiteboard/corona/trunk:
corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
parent/pom.xml
Author: reinhard
Date: Thu Aug 28 04:22:42 2008
New Revision: 689785
URL: http://svn.apache.org/viewvc?rev=689785&view=rev
Log:
. if the value of the revision number is uncertain, skip it
. enforce Maven 2.0.9
. set plugin versions in the pluginManagement section
Modified:
cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
cocoon/whiteboard/corona/trunk/parent/pom.xml
Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java?rev=689785&r1=689784&r2=689785&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/corona/servlet/SitemapServlet.java Thu Aug 28 04:22:42 2008
@@ -173,10 +173,10 @@
// FIXME Make this header configureable
String version = "3.0.0-SNAPSHOT";
if (version.endsWith("SNAPSHOT")) {
- String buildNumber = null;
+ String buildNumber = "";
try {
String buildNumberAttr = ManifestUtils.getAttribute(this.getClass(), "Implementation-Build");
- if (buildNumberAttr != null && !"".equals(buildNumberAttr)) {
+ if (buildNumberAttr != null && !"".equals(buildNumberAttr) && !"na".equals(buildNumberAttr)) {
buildNumber = "/rev" + buildNumberAttr;
}
@@ -185,7 +185,7 @@
this.logger.debug("Error while reading an attribute from the manifest.", e);
}
}
- version = version + buildNumber;
+ version += buildNumber;
}
response.setHeader("X-Cocoon-Version", version);
}
Modified: cocoon/whiteboard/corona/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/parent/pom.xml?rev=689785&r1=689784&r2=689785&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/parent/pom.xml (original)
+++ cocoon/whiteboard/corona/trunk/parent/pom.xml Thu Aug 28 04:22:42 2008
@@ -281,7 +281,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[2.0.8,)</version>
+ <version>[2.0.9,)</version>
</requireMavenVersion>
</rules>
</configuration>
@@ -290,9 +290,8 @@
</plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-5</version>
<configuration>
- <tagBase>https://svn.apache.org/repos/asf/cocoon/tags/cocoon-3.0/${project.artifactId}</tagBase>
+ <tagBase>https://svn.apache.org/repos/asf/cocoon/cocoon3/tags/${project.artifactId}</tagBase>
</configuration>
</plugin>
<plugin>
@@ -305,12 +304,10 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.0-beta-1</version>
<executions>
<execution>
<phase>validate</phase>
@@ -320,8 +317,8 @@
</execution>
</executions>
<configuration>
- <doCheck>false</doCheck>
- <doUpdate>false</doUpdate>
+ <doCheck>true</doCheck>
+ <doUpdate>true</doUpdate>
</configuration>
</plugin>
<plugin>
@@ -392,6 +389,20 @@
<artifactId>maven-dependency-plugin</artifactId>
<version>2.0-alpha-4</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -413,6 +424,35 @@
<profiles>
<profile>
+ <id>skip-buildnumber</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>na</Implementation-Build>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>release</id>
<build>
<plugins>
@@ -460,14 +500,14 @@
<url>http://people.apache.org/builds/cocoon</url>
</pluginRepository>
</pluginRepositories>
- </profile>
+ </profile>
<profile>
<id>all</id>
<modules>
- <module>../corona-docs</module>
+ <module>../corona-docs</module>
<module>../corona-sample-webapp</module>
- </modules>
- </profile>
+ </modules>
+ </profile>
<profile>
<id>it</id>
<modules>