Author: remm
Date: Tue May 16 15:14:46 2017
New Revision: 1795327
URL: http://svn.apache.org/viewvc?rev=1795327&view=rev
Log:
Make the changes mandated by the RELEASING.txt document before tagging a RC1.
More changes could be needed though.
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=1795327&r1=1795326&r2=1795327&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/CHANGES.txt (original)
+++ tomcat/taglibs/standard/trunk/CHANGES.txt Tue May 16 15:14:46 2017
@@ -1,4 +1,4 @@
-Changes in x release
+Changes in 1.2.6 release
60950 JSTL TransformSupport XSL import not finding relative path
Changes in 1.2.5 release
Modified: tomcat/taglibs/standard/trunk/README_bin.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_bin.txt?rev=1795327&r1=1795326&r2=1795327&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/README_bin.txt (original)
+++ tomcat/taglibs/standard/trunk/README_bin.txt Tue May 16 15:14:46 2017
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Apache Standard Tag Library 1.2.5 -- BINARY DISTRIBUTION
+Apache Standard Tag Library 1.2.6 -- BINARY DISTRIBUTION
---------------------------------------------------------------------------
Thanks for downloading this release of the Standard tag library,
an implementation of the JavaServer Pages(tm)(JSP)
Modified: tomcat/taglibs/standard/trunk/README_src.txt
URL:
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/README_src.txt?rev=1795327&r1=1795326&r2=1795327&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/README_src.txt (original)
+++ tomcat/taglibs/standard/trunk/README_src.txt Tue May 16 15:14:46 2017
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Apache Standard Tag Library 1.2.5 -- SOURCE DISTRIBUTION
+Apache Standard Tag Library 1.2.6 -- 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)
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=1795327&r1=1795326&r2=1795327&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 May 16 15:14:46 2017
@@ -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 5;
+ return 6;
}
/**
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=1795327&r1=1795326&r2=1795327&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 May 16 15:14:46 2017
@@ -50,7 +50,7 @@ public class VersionTest
}
public void testGetMaintenanceVersionNum() {
- int expectedReturn = 5;
+ int expectedReturn = 6;
int actualReturn = Version.getMaintenanceVersionNum();
assertEquals("return value", expectedReturn, actualReturn);
}
@@ -74,7 +74,7 @@ public class VersionTest
}
public void testGetVersion() {
- String expectedReturn = "standard-taglib 1.2.5";
+ String expectedReturn = "standard-taglib 1.2.6";
String actualReturn = Version.getVersion();
assertEquals("return value", expectedReturn, actualReturn);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
