Author: veithen
Date: Mon Dec 21 17:46:09 2015
New Revision: 1721217
URL: http://svn.apache.org/viewvc?rev=1721217&view=rev
Log:
Automatically include the right release note from
src/site/markdown/release-notes in the distributions. Also remove the old HTML
release note.
Removed:
axis/axis2/java/core/trunk/release-notes.html
Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1721217&r1=1721216&r2=1721217&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Mon Dec 21 17:46:09
2015
@@ -320,7 +320,7 @@
<executions>
<execution>
<id>generate-timestamp</id>
- <phase>package</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>execute</goal>
</goals>
@@ -330,6 +330,7 @@
import java.util.Date
import java.text.MessageFormat
project.properties['buildTimestamp'] =
MessageFormat.format("{0,date,dd-MM-yyyy}", new Date())
+ project.properties['release_version'] =
project.version.replaceAll("-SNAPSHOT", "")
</script>
</scripts>
</configuration>
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1721217&r1=1721216&r2=1721217&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
Mon Dec 21 17:46:09 2015
@@ -114,7 +114,6 @@
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>README.txt</include>
- <include>release-notes.html</include>
</includes>
<filtered>true</filtered>
</fileSet>
@@ -160,6 +159,13 @@
</fileSet>
</fileSets>
+ <files>
+ <file>
+
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
+ <destName>RELEASE-NOTE.txt</destName>
+ </file>
+ </files>
+
<dependencySets>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml?rev=1721217&r1=1721216&r2=1721217&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Mon Dec 21 17:46:09 2015
@@ -34,7 +34,6 @@
<include>NOTICE.txt</include>
<include>LICENSE.txt</include>
<include>README.txt</include>
- <include>release-notes.html</include>
</includes>
<filtered>true</filtered>
</fileSet>
@@ -113,4 +112,11 @@
<filtered>true</filtered>
</fileSet>
</fileSets>
+
+ <files>
+ <file>
+
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
+ <destName>RELEASE-NOTE.txt</destName>
+ </file>
+ </files>
</assembly>
Modified:
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml?rev=1721217&r1=1721216&r2=1721217&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
(original)
+++
axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/war-assembly.xml
Mon Dec 21 17:46:09 2015
@@ -40,9 +40,14 @@
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
<include>README.txt</include>
- <include>release-notes.html</include>
</includes>
<filtered>true</filtered>
</fileSet>
</fileSets>
+ <files>
+ <file>
+
<source>../../src/site/markdown/release-notes/${release_version}.md</source>
+ <destName>RELEASE-NOTE.txt</destName>
+ </file>
+ </files>
</assembly>
