Author: jboynes
Date: Tue Mar 10 16:01:40 2015
New Revision: 1665588
URL: http://svn.apache.org/r1665588
Log:
Update version numbers in project for 1.2.5 release
Added:
tomcat/taglibs/standard/trunk/RELEASING
Modified:
tomcat/taglibs/standard/trunk/CHANGES.txt
tomcat/taglibs/standard/trunk/README_bin.txt
tomcat/taglibs/standard/trunk/README_src.txt
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
Modified: tomcat/taglibs/standard/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/CHANGES.txt?rev=1665588&r1=1665587&r2=1665588&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/CHANGES.txt (original)
+++ tomcat/taglibs/standard/trunk/CHANGES.txt Tue Mar 10 16:01:40 2015
@@ -1,4 +1,8 @@
-Changes in 1.2.4 release
+Changes in 1.2.5 release
+- Set version identifiers correctly, no other changes.
+
+Changes in 1.2.4 release (not released due to incorrect version numbers)
+
57673 AccessControlException accessing
org.apache.taglibs.standard.xml.accessExternalEntity
37466 Reverted changes that overrode HTTP method when importing local
resources.
Modified: tomcat/taglibs/standard/trunk/README_bin.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_bin.txt?rev=1665588&r1=1665587&r2=1665588&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/README_bin.txt (original)
+++ tomcat/taglibs/standard/trunk/README_bin.txt Tue Mar 10 16:01:40 2015
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Apache Standard Tag Library 1.2.3 -- BINARY DISTRIBUTION
+Apache Standard Tag Library 1.2.5 -- BINARY DISTRIBUTION
---------------------------------------------------------------------------
Thanks for downloading this release of the Standard tag library,
an implementation of the JavaServer Pages(tm)(JSP)
@@ -41,9 +41,9 @@ ADD DEPENDENCIES TO A WEB APPLICATION
To use this distribution with your own web applications, add the following JAR
files to the '/WEB-INF/lib' directory of your application:
- - taglibs-standard-spec-1.2.3.jar
- - taglibs-standard-impl-1.2.3.jar
- - taglibs-standard-jstlel-1.2.3.jar
+ - taglibs-standard-spec-1.2.5.jar
+ - taglibs-standard-impl-1.2.5.jar
+ - taglibs-standard-jstlel-1.2.5.jar
- xalan-2.7.1.jar
- serializer-2.7.1.jar
@@ -57,12 +57,12 @@ your pom.xml file:
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
- <version>1.2.3</version>
+ <version>1.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
- <version>1.2.3</version>
+ <version>1.2.5</version>
</dependency>
---------------------------------------------------------------------------
Modified: tomcat/taglibs/standard/trunk/README_src.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_src.txt?rev=1665588&r1=1665587&r2=1665588&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/README_src.txt (original)
+++ tomcat/taglibs/standard/trunk/README_src.txt Tue Mar 10 16:01:40 2015
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Apache Standard Tag Library 1.2.3 -- SOURCE DISTRIBUTION
+Apache Standard Tag Library 1.2.5 -- SOURCE DISTRIBUTION
---------------------------------------------------------------------------
Thanks for downloading the source code for the Apache Software Foundation's
implementation of the JavaServer Pages(tm)(JSP) Standard Tag Library (JSTL)
Added: tomcat/taglibs/standard/trunk/RELEASING
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/RELEASING?rev=1665588&view=auto
==============================================================================
--- tomcat/taglibs/standard/trunk/RELEASING (added)
+++ tomcat/taglibs/standard/trunk/RELEASING Tue Mar 10 16:01:40 2015
@@ -0,0 +1,42 @@
+The project is configured to be released using the Maven Release Plugin.
+
+Some manual steps are required before performing a release build.
+
+* Update the version strings in README_bin.txt and README_src.tst
+* Update the version number in the Version class
+* Update the version number in the VersionTest class
+Commit these changes.
+
+Push the Maven Artifacts to the Apache Staging Repository:
+$ mvn release:prepare -Papache-release -DautoVersionSubmodules=true
+$ mvn release:perform
+
+Don't forget to close the staging repository prior to the vote.
+
+Stage the Apache download repository at
+ https://dist.apache.org/repos/dist/dev/tomcat/taglibs
+with the following files:
+NOTICE
+README_bin.txt
+README_src.txt
+taglibs-standard-1.2.x-source-release.zip
+taglibs-standard-1.2.x-source-release.zip.asc
+taglibs-standard-1.2.x-source-release.zip.md5
+taglibs-standard-1.2.x-source-release.zip.sha1
+taglibs-standard-compat-1.2.x.jar
+taglibs-standard-compat-1.2.x.jar.asc
+taglibs-standard-compat-1.2.x.jar.md5
+taglibs-standard-compat-1.2.x.jar.sha1
+taglibs-standard-impl-1.2.x.jar
+taglibs-standard-impl-1.2.x.jar.asc
+taglibs-standard-impl-1.2.x.jar.md5
+taglibs-standard-impl-1.2.x.jar.sha1
+taglibs-standard-jstlel-1.2.x.jar
+taglibs-standard-jstlel-1.2.x.jar.asc
+taglibs-standard-jstlel-1.2.x.jar.md5
+taglibs-standard-jstlel-1.2.x.jar.sha1
+taglibs-standard-spec-1.2.x.jar
+taglibs-standard-spec-1.2.x.jar.asc
+taglibs-standard-spec-1.2.x.jar.md5
+taglibs-standard-spec-1.2.x.jar.sha1
+
Modified:
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java?rev=1665588&r1=1665587&r2=1665588&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/main/java/org/apache/taglibs/standard/Version.java
Tue Mar 10 16:01:40 2015
@@ -97,7 +97,7 @@ public class Version {
public static int getMaintenanceVersionNum() {
// TODO: BZ 57548: Make this autogenerated by Maven, or read from
"Implementation-Version"
// of Manifest. Note that there is a test class that has to be kept in
sync (VersionTest).
- return 3;
+ return 5;
}
/**
Modified:
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java?rev=1665588&r1=1665587&r2=1665588&view=diff
==============================================================================
---
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
(original)
+++
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/VersionTest.java
Tue Mar 10 16:01:40 2015
@@ -45,43 +45,43 @@ public class VersionTest
public void testGetDevelopmentVersionNum() {
int expectedReturn = 0;
- int actualReturn = version.getDevelopmentVersionNum();
+ int actualReturn = Version.getDevelopmentVersionNum();
assertEquals("return value", expectedReturn, actualReturn);
}
public void testGetMaintenanceVersionNum() {
- int expectedReturn = 3;
- int actualReturn = version.getMaintenanceVersionNum();
+ int expectedReturn = 5;
+ int actualReturn = Version.getMaintenanceVersionNum();
assertEquals("return value", expectedReturn, actualReturn);
}
public void testGetMajorVersionNum() {
int expectedReturn = 1;
- int actualReturn = version.getMajorVersionNum();
+ int actualReturn = Version.getMajorVersionNum();
assertEquals("return value", expectedReturn, actualReturn);
}
public void testGetProduct() {
String expectedReturn = "standard-taglib";
- String actualReturn = version.getProduct();
+ String actualReturn = Version.getProduct();
assertEquals("return value", expectedReturn, actualReturn);
}
public void testGetReleaseVersionNum() {
int expectedReturn = 2;
- int actualReturn = version.getReleaseVersionNum();
+ int actualReturn = Version.getReleaseVersionNum();
assertEquals("return value", expectedReturn, actualReturn);
}
public void testGetVersion() {
- String expectedReturn = "standard-taglib 1.2.3";
- String actualReturn = version.getVersion();
+ String expectedReturn = "standard-taglib 1.2.5";
+ String actualReturn = Version.getVersion();
assertEquals("return value", expectedReturn, actualReturn);
}
public void testMain() {
String[] argv = null;
- version.main(argv);
+ Version.main(argv);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
