Author: sgoeschl
Date: Tue Feb 16 11:07:50 2010
New Revision: 910472
URL: http://svn.apache.org/viewvc?rev=910472&view=rev
Log:
Preparing release candidate
Modified:
turbine/fulcrum/trunk/jetty/NOTICE.txt
turbine/fulcrum/trunk/jetty/pom.xml
turbine/fulcrum/trunk/jetty/xdocs/changes.xml
Modified: turbine/fulcrum/trunk/jetty/NOTICE.txt
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/NOTICE.txt?rev=910472&r1=910471&r2=910472&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/NOTICE.txt (original)
+++ turbine/fulcrum/trunk/jetty/NOTICE.txt Tue Feb 16 11:07:50 2010
@@ -1,5 +1,5 @@
Turbine Fulcrum YAAFI
-Copyright 2002-2007 The Apache Software Foundation.
+Copyright 2002-2010 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: turbine/fulcrum/trunk/jetty/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/pom.xml?rev=910472&r1=910471&r2=910472&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/pom.xml (original)
+++ turbine/fulcrum/trunk/jetty/pom.xml Tue Feb 16 11:07:50 2010
@@ -15,11 +15,9 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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>
+<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>
@@ -117,6 +115,17 @@
<test>**/JettyTestRunner</test>
</properties>
</profile>
+ <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>
+ </profile>
</profiles>
<properties>
@@ -125,6 +134,9 @@
<maven.compile.target>1.5</maven.compile.target>
<!-- the Jetty version to pick up -->
<jetty.version>6.1.14</jetty.version>
- </properties>
-
+ <!-- This bits are used for the staging directory -->
+ <fulcrum.release.version>1.0.0</fulcrum.release.version>
+ <fulcrum.rc.version>RC1</fulcrum.rc.version>
+ </properties>
+
</project>
Modified: turbine/fulcrum/trunk/jetty/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/xdocs/changes.xml?rev=910472&r1=910471&r2=910472&view=diff
==============================================================================
--- turbine/fulcrum/trunk/jetty/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/jetty/xdocs/changes.xml Tue Feb 16 11:07:50 2010
@@ -24,7 +24,10 @@
</properties>
<body>
- <release version="1.0.0-SNAPSHOT" date="as in SVN">
+ <release version="1.0.0" date="2010-02-16">
+ <action dev="sgoeschl" type="delete" date="2010-02-16">
+ Removing JSP 2.0 and JDK 1.4 support
+ </action>
<action dev="sgoeschl" type="update" date="2010-02-16">
Upgrading from jetty-6.1.11 to jetty-6.1.14
</action>
