You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/01/21 18:10:12 UTC

svn commit: r1234365 - in /jmeter/trunk/src/core/org/apache/jmeter/util: JMeterUtils.java JMeterVersion.java

Author: sebb
Date: Sat Jan 21 17:10:12 2012
New Revision: 1234365

URL: http://svn.apache.org/viewvc?rev=1234365&view=rev
Log:
Make COPYRIGHT string private; same reason as for VERSION

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
    jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1234365&r1=1234364&r2=1234365&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Sat Jan 21 17:10:12 2012
@@ -1136,7 +1136,7 @@ public class JMeterUtils implements Unit
      * @return the JMeter copyright string
      */
     public static String getJMeterCopyright() {
-        return JMeterVersion.COPYRIGHT;
+        return JMeterVersion.getCopyRight();
     }
 
     /**

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1234365&r1=1234364&r2=1234365&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Sat Jan 21 17:10:12 2012
@@ -49,11 +49,12 @@ public class JMeterVersion {
      * This ensures that JMeterUtils always gets the correct
      * version, even if JMeterUtils is not re-compiled during the build.
      */
-    private static final String VERSION = "2.5.1";
+    private static final String VERSION = "2.6-SNAPSHOT";
 
     private static final String IMPLEMENTATION;
     
-    static final String COPYRIGHT = "Copyright (c) 1998-2012 The Apache Software Foundation";
+    // Same applies to copyright string
+    private static final String COPYRIGHT = "Copyright (c) 1998-2012 The Apache Software Foundation";
 
     static {
         String impl=null;
@@ -98,4 +99,8 @@ public class JMeterVersion {
     static final String getVERSION() {
         return IMPLEMENTATION;
     }
+
+    public static String getCopyRight() {
+        return COPYRIGHT;
+    }
 }