From a6a68a3de5eea70e827a05f89ca3cbb506d0782e Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Fri, 21 Mar 2014 15:29:32 +0000 Subject: [PATCH 1/4] unsnapshot, more to be done svn-rev: trunk@795 --- jflex-maven-plugin/pom.xml | 10 +++++----- jflex-unicode-maven-plugin/pom.xml | 8 ++++---- jflex/examples/pom.xml | 2 +- jflex/pom.xml | 8 ++++---- jflex/src/main/java/jflex/Main.java | 2 +- pom.xml | 8 ++++---- testsuite/jflex-testsuite-maven-plugin/pom.xml | 12 ++++++------ .../src/main/java/jflextest/Exec.java | 2 +- testsuite/pom.xml | 2 +- testsuite/testcases/pom.xml | 4 ++-- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jflex-maven-plugin/pom.xml b/jflex-maven-plugin/pom.xml index 06f8a92cc..977757bd5 100644 --- a/jflex-maven-plugin/pom.xml +++ b/jflex-maven-plugin/pom.xml @@ -5,7 +5,7 @@ jflex-maven-plugin maven-plugin JFlex Maven Plugin - 1.5.1 + 1.5.1-SNAPSHOT This is a Maven 2 plugin to generate a parser in Java code from a Lexer definition, using JFlex. @@ -172,7 +172,7 @@ de.jflex jflex - 1.5.1 + 1.5.1-SNAPSHOT commons-io @@ -278,9 +278,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 + scm:svn:http://svn.code.sf.net/p/jflex/code/trunk + scm:svn:https://svn.code.sf.net/p/jflex/code/trunk + http://sourceforge.net/p/jflex/code/HEAD/tree/trunk diff --git a/jflex-unicode-maven-plugin/pom.xml b/jflex-unicode-maven-plugin/pom.xml index 3587550fa..1a7b565d1 100755 --- a/jflex-unicode-maven-plugin/pom.xml +++ b/jflex-unicode-maven-plugin/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1 + 1.5.1-SNAPSHOT ../pom.xml jflex-unicode-maven-plugin @@ -71,9 +71,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 + scm:svn:http://svn.code.sf.net/p/jflex/code/trunk + scm:svn:https://svn.code.sf.net/p/jflex/code/trunk + http://sourceforge.net/p/jflex/code/HEAD/tree/trunk UTF-8 diff --git a/jflex/examples/pom.xml b/jflex/examples/pom.xml index ae1950b1b..74773f447 100644 --- a/jflex/examples/pom.xml +++ b/jflex/examples/pom.xml @@ -13,7 +13,7 @@ de.jflex jflex-maven-plugin - 1.5.1 + 1.5.1-SNAPSHOT diff --git a/jflex/pom.xml b/jflex/pom.xml index 9b90bd728..e4bc7f868 100644 --- a/jflex/pom.xml +++ b/jflex/pom.xml @@ -5,7 +5,7 @@ de.jflex jflex-parent - 1.5.1 + 1.5.1-SNAPSHOT ../pom.xml JFlex @@ -23,9 +23,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 + scm:svn:http://svn.code.sf.net/p/jflex/code/trunk + scm:svn:https://svn.code.sf.net/p/jflex/code/trunk + http://sourceforge.net/p/jflex/code/HEAD/tree/trunk diff --git a/jflex/src/main/java/jflex/Main.java b/jflex/src/main/java/jflex/Main.java index e2c2d248b..04b9f776f 100644 --- a/jflex/src/main/java/jflex/Main.java +++ b/jflex/src/main/java/jflex/Main.java @@ -30,7 +30,7 @@ public class Main { /** JFlex version */ - final public static String version = "1.5.1"; //$NON-NLS-1$ + final public static String version = "1.5.1-SNAPSHOT"; //$NON-NLS-1$ /** * Generates a scanner for the specified input file. diff --git a/pom.xml b/pom.xml index 7b32d71c4..37b3943c2 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent JFlex parent and aggregator POM - 1.5.1 + 1.5.1-SNAPSHOT pom http://jflex.de JFlex parent and aggregator POM @@ -88,9 +88,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 + scm:svn:http://svn.code.sf.net/p/jflex/code/trunk + scm:svn:https://svn.code.sf.net/p/jflex/code/trunk + http://sourceforge.net/p/jflex/code/HEAD/tree/trunk diff --git a/testsuite/jflex-testsuite-maven-plugin/pom.xml b/testsuite/jflex-testsuite-maven-plugin/pom.xml index 94367d549..73a95a923 100644 --- a/testsuite/jflex-testsuite-maven-plugin/pom.xml +++ b/testsuite/jflex-testsuite-maven-plugin/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1 + 1.5.1-SNAPSHOT ../../pom.xml jflex-testsuite-maven-plugin @@ -44,7 +44,7 @@ de.jflex jflex-maven-plugin - 1.5.1 + 1.5.1-SNAPSHOT @@ -113,7 +113,7 @@ de.jflex jflex - 1.5.1 + 1.5.1-SNAPSHOT @@ -130,9 +130,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 - http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 + scm:svn:http://svn.code.sf.net/p/jflex/code/trunk + scm:svn:https://svn.code.sf.net/p/jflex/code/trunk + http://sourceforge.net/p/jflex/code/HEAD/tree/trunk UTF-8 diff --git a/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java b/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java index 9fcda8d15..8a6d8a2f2 100755 --- a/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java +++ b/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java @@ -191,7 +191,7 @@ public static void main(String args[]) { System.out.println ("class:\n" + execClass("jflextest.Main", ".", new ArrayList(), files, - "1.5.1", "UTF-8")); + "1.5.1-SNAPSHOT", "UTF-8")); } catch (UnsupportedEncodingException e) { System.out.println("UTF-8 is not a supported encoding."); System.exit(1); diff --git a/testsuite/pom.xml b/testsuite/pom.xml index 9745f51fd..b38d1ec16 100755 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1 + 1.5.1-SNAPSHOT ../pom.xml jflex-testsuite-parent diff --git a/testsuite/testcases/pom.xml b/testsuite/testcases/pom.xml index 992af2ed9..6f1ae0e90 100755 --- a/testsuite/testcases/pom.xml +++ b/testsuite/testcases/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1 + 1.5.1-SNAPSHOT ../../pom.xml jflex-testsuite-testcases @@ -26,7 +26,7 @@ de.jflex jflex - 1.5.1 + 1.5.1-SNAPSHOT test From 139bd0f290438a93b0128d650ba3ea7d3c02b5e9 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Fri, 21 Mar 2014 15:32:19 +0000 Subject: [PATCH 2/4] refer to release jar svn-rev: trunk@797 --- jflex/bin/jflex | 2 +- jflex/bin/jflex.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jflex/bin/jflex b/jflex/bin/jflex index cf61e81e9..6d1fd65eb 100755 --- a/jflex/bin/jflex +++ b/jflex/bin/jflex @@ -42,4 +42,4 @@ JFLEX_HOME=${PRG}/.. # -------------------------------------------------------------------- -$JAVA -Xmx128m -jar $JFLEX_HOME/lib/JFlex.jar $@ +$JAVA -Xmx128m -jar $JFLEX_HOME/lib/jflex-1.5.1-SNAPSHOT.jar $@ diff --git a/jflex/bin/jflex.bat b/jflex/bin/jflex.bat index ad0502e53..9615a0f98 100755 --- a/jflex/bin/jflex.bat +++ b/jflex/bin/jflex.bat @@ -4,4 +4,4 @@ REM (please do not add a trailing backslash) set JFLEX_HOME=C:\JFLEX -java -Xmx128m -jar %JFLEX_HOME%\lib\JFlex.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xmx128m -jar %JFLEX_HOME%\lib\jflex-1.5.1-SNAPSHOT.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 From e759a0266f23e221fd84f8e02c19079a97400949 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Fri, 21 Mar 2014 15:42:37 +0000 Subject: [PATCH 3/4] SNAPSHOT processing for bin/* scripts svn-rev: trunk@798 --- post-release.pl | 6 ++++++ prepare-release.pl | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/post-release.pl b/post-release.pl index 03feec44f..e5270a18d 100755 --- a/post-release.pl +++ b/post-release.pl @@ -144,6 +144,12 @@ system (qq!perl -pi -e "s/\Q$latest_release\E/$snapshot/"! . q! testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java !); + +print " updating version in bin/jflex*"; +system (qq!perl -pi -e "s/\Q$latest_release\E/$snapshot/" jflex/bin/jflex !); +system (qq!perl -pi -e "s/\Q$latest_release\E/$snapshot/" jflex/bin/jflex.bat !); +print "\ndone.\n\n"; + # # print "Updating version -> $snapshot and", diff --git a/prepare-release.pl b/prepare-release.pl index f07252b4a..4c5202b23 100755 --- a/prepare-release.pl +++ b/prepare-release.pl @@ -101,6 +101,11 @@ system ('perl -pi -e "s/-SNAPSHOT//" testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java '); print "\ndone.\n\n"; +print " updating version in bin/jflex*"; +system ('perl -pi -e "s/-SNAPSHOT//" jflex/bin/jflex'); +system ('perl -pi -e "s/-SNAPSHOT//" jflex/bin/jflex.bat'); +print "\ndone.\n\n"; + print "Committing the changed POMs ...\n"; my $ret_val = system (qq!svn ci -m "JFlex s -> $release and SCM URLs -> /tags/$tag"!); From a827f66d300c54971d42c3b45cfb502f3652cba5 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Fri, 21 Mar 2014 15:42:55 +0000 Subject: [PATCH 4/4] JFlex s -> 1.5.1 and SCM URLs -> /tags/release_1_5_1 svn-rev: trunk@799 --- jflex-maven-plugin/pom.xml | 10 +++++----- jflex-unicode-maven-plugin/pom.xml | 8 ++++---- jflex/bin/jflex | 2 +- jflex/bin/jflex.bat | 2 +- jflex/examples/pom.xml | 2 +- jflex/pom.xml | 8 ++++---- jflex/src/main/java/jflex/Main.java | 2 +- pom.xml | 8 ++++---- testsuite/jflex-testsuite-maven-plugin/pom.xml | 12 ++++++------ .../src/main/java/jflextest/Exec.java | 2 +- testsuite/pom.xml | 2 +- testsuite/testcases/pom.xml | 4 ++-- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/jflex-maven-plugin/pom.xml b/jflex-maven-plugin/pom.xml index 977757bd5..06f8a92cc 100644 --- a/jflex-maven-plugin/pom.xml +++ b/jflex-maven-plugin/pom.xml @@ -5,7 +5,7 @@ jflex-maven-plugin maven-plugin JFlex Maven Plugin - 1.5.1-SNAPSHOT + 1.5.1 This is a Maven 2 plugin to generate a parser in Java code from a Lexer definition, using JFlex. @@ -172,7 +172,7 @@ de.jflex jflex - 1.5.1-SNAPSHOT + 1.5.1 commons-io @@ -278,9 +278,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/trunk - scm:svn:https://svn.code.sf.net/p/jflex/code/trunk - http://sourceforge.net/p/jflex/code/HEAD/tree/trunk + scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 diff --git a/jflex-unicode-maven-plugin/pom.xml b/jflex-unicode-maven-plugin/pom.xml index 1a7b565d1..3587550fa 100755 --- a/jflex-unicode-maven-plugin/pom.xml +++ b/jflex-unicode-maven-plugin/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1-SNAPSHOT + 1.5.1 ../pom.xml jflex-unicode-maven-plugin @@ -71,9 +71,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/trunk - scm:svn:https://svn.code.sf.net/p/jflex/code/trunk - http://sourceforge.net/p/jflex/code/HEAD/tree/trunk + scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 UTF-8 diff --git a/jflex/bin/jflex b/jflex/bin/jflex index 6d1fd65eb..a1f237224 100755 --- a/jflex/bin/jflex +++ b/jflex/bin/jflex @@ -42,4 +42,4 @@ JFLEX_HOME=${PRG}/.. # -------------------------------------------------------------------- -$JAVA -Xmx128m -jar $JFLEX_HOME/lib/jflex-1.5.1-SNAPSHOT.jar $@ +$JAVA -Xmx128m -jar $JFLEX_HOME/lib/jflex-1.5.1.jar $@ diff --git a/jflex/bin/jflex.bat b/jflex/bin/jflex.bat index 9615a0f98..5c9c21c42 100755 --- a/jflex/bin/jflex.bat +++ b/jflex/bin/jflex.bat @@ -4,4 +4,4 @@ REM (please do not add a trailing backslash) set JFLEX_HOME=C:\JFLEX -java -Xmx128m -jar %JFLEX_HOME%\lib\jflex-1.5.1-SNAPSHOT.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xmx128m -jar %JFLEX_HOME%\lib\jflex-1.5.1.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/jflex/examples/pom.xml b/jflex/examples/pom.xml index 74773f447..ae1950b1b 100644 --- a/jflex/examples/pom.xml +++ b/jflex/examples/pom.xml @@ -13,7 +13,7 @@ de.jflex jflex-maven-plugin - 1.5.1-SNAPSHOT + 1.5.1 diff --git a/jflex/pom.xml b/jflex/pom.xml index e4bc7f868..9b90bd728 100644 --- a/jflex/pom.xml +++ b/jflex/pom.xml @@ -5,7 +5,7 @@ de.jflex jflex-parent - 1.5.1-SNAPSHOT + 1.5.1 ../pom.xml JFlex @@ -23,9 +23,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/trunk - scm:svn:https://svn.code.sf.net/p/jflex/code/trunk - http://sourceforge.net/p/jflex/code/HEAD/tree/trunk + scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 diff --git a/jflex/src/main/java/jflex/Main.java b/jflex/src/main/java/jflex/Main.java index 04b9f776f..e2c2d248b 100644 --- a/jflex/src/main/java/jflex/Main.java +++ b/jflex/src/main/java/jflex/Main.java @@ -30,7 +30,7 @@ public class Main { /** JFlex version */ - final public static String version = "1.5.1-SNAPSHOT"; //$NON-NLS-1$ + final public static String version = "1.5.1"; //$NON-NLS-1$ /** * Generates a scanner for the specified input file. diff --git a/pom.xml b/pom.xml index 37b3943c2..7b32d71c4 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent JFlex parent and aggregator POM - 1.5.1-SNAPSHOT + 1.5.1 pom http://jflex.de JFlex parent and aggregator POM @@ -88,9 +88,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/trunk - scm:svn:https://svn.code.sf.net/p/jflex/code/trunk - http://sourceforge.net/p/jflex/code/HEAD/tree/trunk + scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 diff --git a/testsuite/jflex-testsuite-maven-plugin/pom.xml b/testsuite/jflex-testsuite-maven-plugin/pom.xml index 73a95a923..94367d549 100644 --- a/testsuite/jflex-testsuite-maven-plugin/pom.xml +++ b/testsuite/jflex-testsuite-maven-plugin/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1-SNAPSHOT + 1.5.1 ../../pom.xml jflex-testsuite-maven-plugin @@ -44,7 +44,7 @@ de.jflex jflex-maven-plugin - 1.5.1-SNAPSHOT + 1.5.1 @@ -113,7 +113,7 @@ de.jflex jflex - 1.5.1-SNAPSHOT + 1.5.1 @@ -130,9 +130,9 @@ - scm:svn:http://svn.code.sf.net/p/jflex/code/trunk - scm:svn:https://svn.code.sf.net/p/jflex/code/trunk - http://sourceforge.net/p/jflex/code/HEAD/tree/trunk + scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1 + http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1 UTF-8 diff --git a/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java b/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java index 8a6d8a2f2..9fcda8d15 100755 --- a/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java +++ b/testsuite/jflex-testsuite-maven-plugin/src/main/java/jflextest/Exec.java @@ -191,7 +191,7 @@ public static void main(String args[]) { System.out.println ("class:\n" + execClass("jflextest.Main", ".", new ArrayList(), files, - "1.5.1-SNAPSHOT", "UTF-8")); + "1.5.1", "UTF-8")); } catch (UnsupportedEncodingException e) { System.out.println("UTF-8 is not a supported encoding."); System.exit(1); diff --git a/testsuite/pom.xml b/testsuite/pom.xml index b38d1ec16..9745f51fd 100755 --- a/testsuite/pom.xml +++ b/testsuite/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1-SNAPSHOT + 1.5.1 ../pom.xml jflex-testsuite-parent diff --git a/testsuite/testcases/pom.xml b/testsuite/testcases/pom.xml index 6f1ae0e90..992af2ed9 100755 --- a/testsuite/testcases/pom.xml +++ b/testsuite/testcases/pom.xml @@ -4,7 +4,7 @@ de.jflex jflex-parent - 1.5.1-SNAPSHOT + 1.5.1 ../../pom.xml jflex-testsuite-testcases @@ -26,7 +26,7 @@ de.jflex jflex - 1.5.1-SNAPSHOT + 1.5.1 test