Revision: 1506
http://stripes.svn.sourceforge.net/stripes/?rev=1506&view=rev
Author: bengunter
Date: 2012-05-18 03:39:11 +0000 (Fri, 18 May 2012)
Log Message:
-----------
[maven-release-plugin] rollback the release of 1.5.7
Modified Paths:
--------------
branches/1.5.x/examples/pom.xml
branches/1.5.x/pom.xml
branches/1.5.x/stripes/pom.xml
branches/1.5.x/tests/pom.xml
Modified: branches/1.5.x/examples/pom.xml
===================================================================
--- branches/1.5.x/examples/pom.xml 2012-05-18 03:37:58 UTC (rev 1505)
+++ branches/1.5.x/examples/pom.xml 2012-05-18 03:39:11 UTC (rev 1506)
@@ -2,12 +2,12 @@
<!--
Stripes Examples Webapp.
-->
-<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";>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes-parent</artifactId>
- <version>1.5.8-SNAPSHOT</version>
+ <version>1.5.7-SNAPSHOT</version>
</parent>
<artifactId>examples</artifactId>
<packaging>war</packaging>
@@ -86,7 +86,7 @@
<configuration>
<target>
<copy todir="./web/WEB-INF/src" flatten="true"
overwrite="true">
- <fileset dir="./src" includes="**/*.java"
/>
+ <fileset dir="./src" includes="**/*.java"/>
</copy>
</target>
</configuration>
Modified: branches/1.5.x/pom.xml
===================================================================
--- branches/1.5.x/pom.xml 2012-05-18 03:37:58 UTC (rev 1505)
+++ branches/1.5.x/pom.xml 2012-05-18 03:39:11 UTC (rev 1506)
@@ -4,7 +4,7 @@
We use multi-module project in order to avoid directory refactorings
and thereby breaking of the currently used and build.
-->
-<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";>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.sonatype.oss</groupId>
@@ -13,7 +13,7 @@
</parent>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes-parent</artifactId>
- <version>1.5.8-SNAPSHOT</version>
+ <version>1.5.7-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Stripes Parent</name>
<url>http://stripesframework.org/</url>
Modified: branches/1.5.x/stripes/pom.xml
===================================================================
--- branches/1.5.x/stripes/pom.xml 2012-05-18 03:37:58 UTC (rev 1505)
+++ branches/1.5.x/stripes/pom.xml 2012-05-18 03:39:11 UTC (rev 1506)
@@ -3,12 +3,12 @@
Stripes core. Produces the stripe.jar needed in
users webapps.
-->
-<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";>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes-parent</artifactId>
- <version>1.5.8-SNAPSHOT</version>
+ <version>1.5.7-SNAPSHOT</version>
</parent>
<artifactId>stripes</artifactId>
<packaging>jar</packaging>
@@ -42,14 +42,17 @@
<configuration>
<target>
<!-- make two copies of the taglib, one with
and one without dynamic attributes -->
- <filter
filtersfile="./resources/common-descriptions.properties" />
- <filter token="dynattrs" value="false" />
- <copy file="./resources/stripes.tld"
todir="./target/classes/META-INF" filtering="true" />
- <copy
file="./resources/stripes-buffered-layout.tld"
todir="./target/classes/META-INF" filtering="true" />
+ <filter
filtersfile="./resources/common-descriptions.properties"/>
+ <filter token="dynattrs" value="false"/>
+ <copy file="./resources/stripes.tld"
todir="./target/classes/META-INF" filtering="true"/>
+ <copy
file="./resources/stripes-buffered-layout.tld"
todir="./target/classes/META-INF" filtering="true"/>
- <filter token="dynattrs" value="true" />
- <copy file="./resources/stripes.tld"
tofile="./target/classes/META-INF/stripes-dynattr.tld" filtering="true" />
- <replace
file="./target/classes/META-INF/stripes-dynattr.tld"
token="http://stripes.sourceforge.net/stripes.tld";
value="http://stripes.sourceforge.net/stripes-dynattr.tld"; />
+ <filter token="dynattrs" value="true"/>
+ <copy file="./resources/stripes.tld"
+
tofile="./target/classes/META-INF/stripes-dynattr.tld" filtering="true"/>
+ <replace
file="./target/classes/META-INF/stripes-dynattr.tld"
+
token="http://stripes.sourceforge.net/stripes.tld";
+
value="http://stripes.sourceforge.net/stripes-dynattr.tld"/>
</target>
</configuration>
<goals>
@@ -68,14 +71,19 @@
<configuration>
<target>
<java fork="true" jar="./lib/build/tlddoc.jar"
failonerror="false">
- <arg line="-d './target/taglib'" />
- <arg line="-doctitle 'Stripes
${project.version} Tag Library Documentation'" />
- <arg line="-windowtitle 'Stripes
${project.version} Tag Library Documentation'" />
- <arg
value="./target/classes/META-INF/stripes.tld" />
+ <arg line="-d './target/taglib'"/>
+ <arg line="-doctitle 'Stripes
${project.version} Tag Library Documentation'"/>
+ <arg line="-windowtitle 'Stripes
${project.version} Tag Library Documentation'"/>
+ <arg
value="./target/classes/META-INF/stripes.tld"/>
</java>
- <copy file="./src/javadoc.css"
tofile="./target/taglib/stylesheet.css" overwrite="true" />
- <replace file="./target/taglib/index.html"
token="overview-summary.html" value="stripes/tld-summary.html" />
- <jar
destfile="./target/stripes-${project.version}-tlddoc.jar"
basedir="./target/taglib" />
+ <copy file="./src/javadoc.css"
+ tofile="./target/taglib/stylesheet.css"
+ overwrite="true"/>
+ <replace file="./target/taglib/index.html"
+ token="overview-summary.html"
+ value="stripes/tld-summary.html"/>
+ <jar
destfile="./target/stripes-${project.version}-tlddoc.jar"
+ basedir="./target/taglib"/>
</target>
</configuration>
<goals>
@@ -130,7 +138,7 @@
<configuration>
<stylesheetfile>${basedir}/src/javadoc.css</stylesheetfile>
<overview>${basedir}/src/overview.html</overview>
- <bottom>© Copyright 2005-2006, Stripes Development
Team.</bottom>
+ <bottom>© Copyright 2005-2006, Stripes
Development Team.</bottom>
<author>true</author>
<protected>true</protected>
<use>true</use>
Modified: branches/1.5.x/tests/pom.xml
===================================================================
--- branches/1.5.x/tests/pom.xml 2012-05-18 03:37:58 UTC (rev 1505)
+++ branches/1.5.x/tests/pom.xml 2012-05-18 03:39:11 UTC (rev 1506)
@@ -5,12 +5,12 @@
Eventually tests should be in the same module than stripes
core itself, using maven standard layout.
-->
-<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";>
+<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.stripes</groupId>
<artifactId>stripes-parent</artifactId>
- <version>1.5.8-SNAPSHOT</version>
+ <version>1.5.7-SNAPSHOT</version>
</parent>
<artifactId>tests</artifactId>
<packaging>jar</packaging>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
