Author: kkolinko Date: Sun Feb 8 22:12:37 2015 New Revision: 1658264 URL: http://svn.apache.org/r1658264 Log: For https://issues.apache.org/bugzilla/show_bug.cgi?id=57548 Manually update version number for the next release (1.2.3)
I hope that this will be automated in the future. Modified: tomcat/taglibs/standard/trunk/CHANGES.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=1658264&r1=1658263&r2=1658264&view=diff ============================================================================== --- tomcat/taglibs/standard/trunk/CHANGES.txt (original) +++ tomcat/taglibs/standard/trunk/CHANGES.txt Sun Feb 8 22:12:37 2015 @@ -1,6 +1,7 @@ Changes in 1.2.3 release 57547 Fix regression with running on older JREs +57548 Update library version number printed by Version class Changes in 1.2.2 release [WITHDRAWN due to regressions in older JREs] 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=1658264&r1=1658263&r2=1658264&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 Sun Feb 8 22:12:37 2015 @@ -95,7 +95,9 @@ public class Version { * development drop for a release. */ public static int getMaintenanceVersionNum() { - return 0; + // 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; } /** 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=1658264&r1=1658263&r2=1658264&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 Sun Feb 8 22:12:37 2015 @@ -50,7 +50,7 @@ public class VersionTest } public void testGetMaintenanceVersionNum() { - int expectedReturn = 0; + int expectedReturn = 3; 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.0"; + String expectedReturn = "standard-taglib 1.2.3"; 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