tag release 1.5.1

svn-rev: tags/release_1_5_1@800
jflex-de · Mar 21, 2014 · 4c0cb42 · 4c0cb42
2 parents b998f1a + a827f66
commit 4c0cb42
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 31 deletions.
diff --git a/jflex-maven-plugin/pom.xml b/jflex-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>jflex-maven-plugin</artifactId>
 	<packaging>maven-plugin</packaging>
 	<name>JFlex Maven Plugin</name>
-	<version>1.5.1-SNAPSHOT</version>
+	<version>1.5.1</version>
 	<description>
       This is a Maven 2 plugin to generate a parser in Java code from
       a Lexer definition, using JFlex.
@@ -172,7 +172,7 @@
 		<dependency>
 			<groupId>de.jflex</groupId>
 			<artifactId>jflex</artifactId>
-			<version>1.5.1-SNAPSHOT</version>
+			<version>1.5.1</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -278,9 +278,9 @@
 		</plugins>
 	</reporting>
 	<scm>
-        <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/trunk</connection>
-        <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/trunk</developerConnection>
-        <url>http://sourceforge.net/p/jflex/code/HEAD/tree/trunk</url>
+        <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</connection>
+        <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</developerConnection>
+        <url>http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1</url>
 	</scm>
     <profiles>
         <profile>

diff --git a/jflex-unicode-maven-plugin/pom.xml b/jflex-unicode-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.jflex</groupId>
     <artifactId>jflex-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>jflex-unicode-maven-plugin</artifactId>
@@ -71,9 +71,9 @@
     </dependency>
   </dependencies>
   <scm>
-    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/trunk</connection>
-    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/trunk</developerConnection>
-    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/trunk</url>
+    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</connection>
+    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</developerConnection>
+    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1</url>
   </scm>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git 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.jar $@
diff --git 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.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/jflex/examples/pom.xml b/jflex/examples/pom.xml
@@ -13,7 +13,7 @@
 			<plugin>
 				<groupId>de.jflex</groupId>
 				<artifactId>jflex-maven-plugin</artifactId>
-				<version>1.5.1-SNAPSHOT</version>
+				<version>1.5.1</version>
 				<executions>
 					<execution>
 						<goals>

diff --git a/jflex/pom.xml b/jflex/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>de.jflex</groupId>
     <artifactId>jflex-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <name>JFlex</name>
@@ -23,9 +23,9 @@
     </license>
   </licenses>
   <scm>
-    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/trunk</connection>
-    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/trunk</developerConnection>
-    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/trunk</url>
+    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</connection>
+    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</developerConnection>
+    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1</url>
   </scm>
   <developers>
     <developer>

diff --git 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
@@ -4,7 +4,7 @@
   <groupId>de.jflex</groupId>
   <artifactId>jflex-parent</artifactId>
   <name>JFlex parent and aggregator POM</name>
-  <version>1.5.1-SNAPSHOT</version>
+  <version>1.5.1</version>
   <packaging>pom</packaging>
   <url>http://jflex.de</url>
   <description>JFlex parent and aggregator POM</description>
@@ -88,9 +88,9 @@
   </issueManagement>
 
   <scm>
-    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/trunk</connection>
-    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/trunk</developerConnection>
-    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/trunk</url>
+    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</connection>
+    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</developerConnection>
+    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1</url>
   </scm>
 
   <dependencyManagement>

diff --git 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";
+
 #  <property name="bootstrap.version" value="1.5.0" />
 #  <property name="version" value="1.5.1-SNAPSHOT" />
 print "Updating version -> $snapshot and",

diff --git 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 <version>s -> $release and SCM URLs -> /tags/$tag"!);

diff --git a/testsuite/jflex-testsuite-maven-plugin/pom.xml b/testsuite/jflex-testsuite-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.jflex</groupId>
     <artifactId>jflex-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>jflex-testsuite-maven-plugin</artifactId>
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>de.jflex</groupId>
         <artifactId>jflex-maven-plugin</artifactId>
-        <version>1.5.1-SNAPSHOT</version>
+        <version>1.5.1</version>
         <executions>
           <execution>
             <goals>
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>de.jflex</groupId>
       <artifactId>jflex</artifactId>
-      <version>1.5.1-SNAPSHOT</version>
+      <version>1.5.1</version>
     </dependency>
     <dependency>
       <!-- If this dependency is not included, the Ant Javac task can't find -->
@@ -130,9 +130,9 @@
     </dependency>
   </dependencies>
   <scm>
-    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/trunk</connection>
-    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/trunk</developerConnection>
-    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/trunk</url>
+    <connection>scm:svn:http://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</connection>
+    <developerConnection>scm:svn:https://svn.code.sf.net/p/jflex/code/tags/release_1_5_1</developerConnection>
+    <url>http://sourceforge.net/p/jflex/code/HEAD/tree/tags/release_1_5_1</url>
   </scm>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

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
@@ -191,7 +191,7 @@ public static void main(String args[]) {
       System.out.println
       ("class:\n" 
          + execClass("jflextest.Main", ".", new ArrayList<String>(), 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
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.jflex</groupId>
     <artifactId>jflex-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.1</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>jflex-testsuite-parent</artifactId>

diff --git a/testsuite/testcases/pom.xml b/testsuite/testcases/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>de.jflex</groupId>
     <artifactId>jflex-parent</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.5.1</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>jflex-testsuite-testcases</artifactId>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>de.jflex</groupId>
       <artifactId>jflex</artifactId>
-      <version>1.5.1-SNAPSHOT</version>
+      <version>1.5.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.jar $@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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.jar %1 %2 %3 %4 %5 %6 %7 %8 %9