Author: tv
Date: Thu Oct 3 09:53:40 2013
New Revision: 1528773
URL: http://svn.apache.org/r1528773
Log:
Preparations for release
Added:
turbine/fulcrum/trunk/parser/src/changes/changes.xml (contents, props
changed)
- copied, changed from r1373968,
turbine/fulcrum/trunk/parser/xdocs/changes.xml
Removed:
turbine/fulcrum/trunk/parser/xdocs/changes.xml
Modified:
turbine/fulcrum/trunk/parser/NOTICE.txt
turbine/fulcrum/trunk/parser/pom.xml
turbine/fulcrum/trunk/parser/src/site/site.xml
Modified: turbine/fulcrum/trunk/parser/NOTICE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/NOTICE.txt?rev=1528773&r1=1528772&r2=1528773&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/NOTICE.txt (original)
+++ turbine/fulcrum/trunk/parser/NOTICE.txt Thu Oct 3 09:53:40 2013
@@ -1,5 +1,5 @@
Turbine Fulcrum Parser Component
-Copyright 2005-2009 The Apache Software Foundation.
+Copyright 2005-2013 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: turbine/fulcrum/trunk/parser/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/pom.xml?rev=1528773&r1=1528772&r2=1528773&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/pom.xml (original)
+++ turbine/fulcrum/trunk/parser/pom.xml Thu Oct 3 09:53:40 2013
@@ -17,12 +17,13 @@
-->
<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/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-parent</artifactId>
- <version>1</version>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-parent</artifactId>
+ <version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
<version>1.0.3-SNAPSHOT</version>
<name>Fulcrum Parser</name>
@@ -36,14 +37,6 @@
<url>http://svn.apache.org/viewcvs/turbine/fulcrum/trunk/parser/</url>
</scm>
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/fulcrum/fulcrum-parser/</url>
- </site>
- </distributionManagement>
-
<developers>
<developer>
<name>Eric Pugh</name>
@@ -137,25 +130,39 @@
<profiles>
<profile>
- <id>rc</id>
- <distributionManagement>
- <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
- <site>
- <id>apache.website</id>
- <name>Apache Fulcrum Release Candidate Staging Site</name>
-
<url>${fulcrum.deployment.protocol}://people.apache.org/www/turbine.apache.org/builds/fulcrum/${fulcrum.componentid}/${fulcrum.release.version}/${fulcrum.rc.version}/site</url>
- </site>
- </distributionManagement>
+ <id>apache-release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- build the source and binary distribution packages -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fulcrum-source-release-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+ <descriptorRefs>
+ <descriptorRef>bin</descriptorRef>
+ <descriptorRef>project</descriptorRef>
+ <descriptorRef>src</descriptorRef>
+ </descriptorRefs>
+ <tarLongFileFormat>gnu</tarLongFileFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
-
+
<properties>
- <maven.compile.source>1.5</maven.compile.source>
- <maven.compile.target>1.5</maven.compile.target>
- <!-- This bits are used for the staging directory -->
- <fulcrum.release.version>1.0.3</fulcrum.release.version>
- <fulcrum.rc.version>RC1</fulcrum.rc.version>
- <fulcrum.deployment.protocol>scpexe</fulcrum.deployment.protocol>
+ <turbine.site.path>fulcrum/fulcrum-parser</turbine.site.path>
</properties>
</project>
\ No newline at end of file
Copied: turbine/fulcrum/trunk/parser/src/changes/changes.xml (from r1373968,
turbine/fulcrum/trunk/parser/xdocs/changes.xml)
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/changes/changes.xml?p2=turbine/fulcrum/trunk/parser/src/changes/changes.xml&p1=turbine/fulcrum/trunk/parser/xdocs/changes.xml&r1=1373968&r2=1528773&rev=1528773&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/parser/src/changes/changes.xml Thu Oct 3 09:53:40
2013
@@ -22,7 +22,12 @@
</properties>
<body>
- <release version="1.0.3-SNAPSHOT" date="in SVN">
+ <release version="1.0.4" date="in SVN">
+ </release>
+ <release version="1.0.3" date="2013-10-03">
+ <action dev="tv" type="update">
+ Derive from Turbine parent POM 3
+ </action>
<action dev="tv" type="add">
ValueParser now extends Iterable
</action>
Propchange: turbine/fulcrum/trunk/parser/src/changes/changes.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5
Propchange: turbine/fulcrum/trunk/parser/src/changes/changes.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: turbine/fulcrum/trunk/parser/src/changes/changes.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: turbine/fulcrum/trunk/parser/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/site/site.xml?rev=1528773&r1=1528772&r2=1528773&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/parser/src/site/site.xml Thu Oct 3 09:53:40 2013
@@ -17,9 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<project
- name="Fulcrum Parser"
- href="http://turbine.apache.org/fulcrum/fulcrum-parser/">
+<project name="Fulcrum Parser">
<body>
<menu name="Overview">