Author: ecki
Date: Thu Jan 8 21:32:11 2015
New Revision: 1650385
URL: http://svn.apache.org/r1650385
Log:
Updated commons-parent 34->36 and adjusted plugins, added 2.0 release link,
announce 1.6+, rename relnotes template
Added:
commons/proper/vfs/trunk/src/changes/release-notes.vm
Removed:
commons/proper/vfs/trunk/src/changes/announcement.vm
Modified:
commons/proper/vfs/trunk/pom.xml
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1650385&r1=1650384&r2=1650385&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Thu Jan 8 21:32:11 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>34</version>
+ <version>36</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -145,6 +145,7 @@
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
+ <!-- bare ID without major version or commons- prefix -->
<commons.componentid>vfs</commons.componentid>
<commons.release.version>2.0</commons.release.version>
<!--<commons.rc.version>RC1</commons.rc.version> -->
@@ -152,9 +153,15 @@
<commons.jira.id>VFS</commons.jira.id>
<commons.jira.pid>12310495</commons.jira.pid>
<commons.release.name>commons-vfs-${commons.release.version}</commons.release.name>
+ <commons.release.desc>(requires Java 1.6+)</commons.release.desc>
<commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/commons-vfs</commons.scmPubUrl>
<vfs.parent.dir>${basedir}</vfs.parent.dir>
+
+ <commons.release.2.version>2.0</commons.release.2.version>
+ <commons.release.2.name>commons-vfs-2.0</commons.release.2.name>
+ <commons.release.2.desc>(requires Java 1.5+)</commons.release.2.desc>
+ <commons.release.2.binary.suffix></commons.release.2.binary.suffix>
</properties>
<build>
@@ -168,16 +175,6 @@
</resource>
</resources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -218,14 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-build-plugin</artifactId>
- <!-- version inherited from commons-parent -->
- <configuration>
-
<commons.release.name>commons-${commons.componentid}-${commons.release.version}</commons.release.name>
- </configuration>
+ <version>2.13</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -257,11 +247,12 @@
<!-- trivial test data text files -->
<exclude>src/test/resources/test-data/**/*.txt</exclude>
<exclude>src/test/resources/test-data/test.mf</exclude>
- <!-- implicite exclude does not work if sandbox profile is not
activated -->
+ <!-- implicit exclude does not work if sandbox profile is not
activated -->
<exclude>sandbox/**</exclude>
</excludes>
</configuration>
</plugin>
+ <!-- Keep in sync with build config above -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -293,7 +284,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.5.5</version>
+ <!-- commons-parent defines version 2.5.x or 3.x depending on JDK
active. -->
+ <version>${commons.findbugs.version}</version>
<configuration>
<threshold>Normal</threshold>
<effort>Default</effort>
@@ -303,9 +295,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
<configuration>
<targetJdk>${maven.compiler.target}</targetJdk>
+ <aggregate>true</aggregate>
</configuration>
</plugin>
<!-- cobertura breaks because it cannot parse annotations in methods. -->
@@ -313,7 +306,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>${commons.cobertura.version}</version>
</plugin>
-->
<!-- javancss breaks because it cannot parse annotations in methods. -->
@@ -521,40 +514,11 @@
</dependencies>
</dependencyManagement>
- <repositories>
- <repository>
- <id>apache.snapshots.https</id>
- <name>Apache Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
<distributionManagement>
- <repository>
- <id>apache.releases.https</id>
- <name>Apache Release Distribution Repository</name>
-
<url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>apache.snapshots.https</id>
- <name>Apache Development Snapshot Repository</name>
- <url>https://repository.apache.org/content/repositories/snapshots</url>
- </snapshotRepository>
<site>
- <id>apache.website</id>
+ <id>commons.site</id>
<name>Apache Commons Site</name>
-
<url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/${commons.componentid}</url>
+ <url>scm:svn:${commons.scmPubUrl}</url>
</site>
</distributionManagement>
@@ -568,37 +532,6 @@
</modules>
</profile>
<profile>
- <id>relnotes</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.11</version>
- <configuration>
- <template>announcement.vm</template>
- <templateDirectory>src/changes</templateDirectory>
- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
- <outputDirectory>.</outputDirectory>
- <announcementFile>RELEASE-NOTES.txt</announcementFile>
- <announceParameters>
- <releaseVersion>${commons.release.version}</releaseVersion>
- </announceParameters>
- </configuration>
- <executions>
- <execution>
- <id>create-release-notes</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>announcement-generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>release</id>
<build>
<plugins>
Added: commons/proper/vfs/trunk/src/changes/release-notes.vm
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/changes/release-notes.vm?rev=1650385&view=auto
==============================================================================
--- commons/proper/vfs/trunk/src/changes/release-notes.vm (added)
+++ commons/proper/vfs/trunk/src/changes/release-notes.vm Thu Jan 8 21:32:11
2015
@@ -0,0 +1,122 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+ ${project.name} ${version}
+ RELEASE NOTES
+
+The ${developmentTeam} is pleased to announce the release of ${project.name}
${version}
+
+$introduction.replaceAll("(?<!\015)\012", "
+").replaceAll("(?m)^ +","")
+
+## N.B. the available variables are described here:
+##
http://maven.apache.org/plugins/maven-changes-plugin/examples/using-a-custom-announcement-template.html
+##
+## Hack to improve layout: replace all pairs of spaces with a single new-line
+$release.description.replaceAll(" ", "
+")
+
+## set up indent sizes. Only change indent1
+#set($props=${project.properties})
+#set($jiralen=$props.get("commons.jira.id").length())
+## indent1 = POOL-nnnn:
+#set($blanklen=$jiralen+6)## +6 for "-nnnn:"
+## must be at least as long as the longest JIRA id
+#set($blanks=" ")
+#set($indent1=$blanks.substring(0,$blanklen))
+## indent2 allows for issue wrapper
+#set($indent2="$indent1 ")
+##
+#macro ( processaction )
+## Use replaceAll to fix up LF-only line ends on Windows.
+#set($action=$actionItem.getAction().replaceAll("\n","
+"))
+## Replace < with < so can embed tag markup
+#set($action=$action.replaceAll("<","<"))
+## use an empty date to mean don't format the entry
+## TODO how to enable leading spaces without compromising html report
+## unfortunately leading spaces are trimmed even from CDATA sections
+#if ($actionItem.getDate() && $actionItem.getDate().length()==0)
+$action
+#else
+## Fix up indentation for multi-line action descriptions
+#set($action=$action.replaceAll("(?m)^ +",$indent2))
+#if ($actionItem.getIssue())
+#set($issue="$actionItem.getIssue():")
+## Pad shorter issue numbers
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#if ($issue.length() < $indent1.length())#set ($issue="$issue ")#end
+#else
+#set($issue=$indent1)
+#end
+#if ($actionItem.getDueTo())
+#set($dueto=" Thanks to $actionItem.getDueTo().")
+#else
+#set($dueto="")
+#end
+o $issue ${action}$dueto
+#end
+#set($action="")
+#set($issue="")
+#set($dueto="")
+#end
+##
+#if ($release.getActions().size() == 0)
+No changes defined in this version.
+#else
+Changes in this version include:
+
+#if ($release.getActions('add').size() !=0)
+New features:
+#foreach($actionItem in $release.getActions('add'))
+#processaction()
+#end
+
+#end
+##
+#if ($release.getActions('fix').size() !=0)
+Fixed Bugs:
+#foreach($actionItem in $release.getActions('fix'))
+#processaction()
+#end
+
+#end
+##
+#if ($release.getActions('update').size() !=0)
+Changes:
+#foreach($actionItem in $release.getActions('update'))
+#processaction()
+#end
+
+#end
+##
+#if ($release.getActions('remove').size() !=0)
+Removed:
+#foreach($actionItem in $release.getActions('remove'))
+#processaction()
+#end
+#end
+## End of main loop
+#end
+
+Historical list of changes: ${project.url}changes-report.html
+
+For complete information on ${project.name}, including instructions on how to
submit bug reports,
+patches, or suggestions for improvement, see the Apache ${project.name}
website:
+
+${project.url}
