jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1609422 - in /jmeter/trunk: build.properties build.xml eclipse.classpath lib/ lib/aareadme.txt licenses/bin/rsyntaxtextarea-2.5.1.txt licenses/bin/rsyntaxtextarea-2.5.3.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Date Thu, 10 Jul 2014 08:43:31 GMT
Author: pmouawad
Date: Thu Jul 10 08:43:30 2014
New Revision: 1609422

URL: http://svn.apache.org/r1609422
Log:
Bug 56367 - JMeter 2.11 on maven central triggers a not existing dependency rsyntaxtextarea
2.5.1, upgrade to 2.5.3 
Bugzilla Id: 56367

Added:
    jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.3.txt   (contents, props changed)
      - copied, changed from r1606604, jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.1.txt
Removed:
    jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.1.txt
Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    jmeter/trunk/eclipse.classpath
    jmeter/trunk/lib/   (props changed)
    jmeter/trunk/lib/aareadme.txt
    jmeter/trunk/res/maven/ApacheJMeter_parent.pom
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1609422&r1=1609421&r2=1609422&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Thu Jul 10 08:43:30 2014
@@ -237,11 +237,10 @@ mongo-java-driver.jar       = mongo-java
 mongo-java-driver.loc       = ${maven2.repo}/org/mongodb/mongo-java-driver/${mongo-java-driver.version}
 mongo-java-driver.md5       = 90647a53231eb75715fda30759ff4ff7
 
-rsyntaxtextarea.version     = 2.5.1
+rsyntaxtextarea.version     = 2.5.3
 rsyntaxtextarea.jar         = rsyntaxtextarea-${rsyntaxtextarea.version}.jar
-rsyntaxtextarea.loc         = http://downloads.sourceforge.net/project/rsyntaxtextarea/rsyntaxtextarea/${rsyntaxtextarea.version}
-rsyntaxtextarea.md5         = 20cbb6cc4faacbbed6a62b1fff4279fb
-rsyntaxtextarea.name        = rsyntaxtextarea
+rsyntaxtextarea.loc         = ${maven2.repo}/com/fifesoft/rsyntaxtextarea/${rsyntaxtextarea.version}
+rsyntaxtextarea.md5         = 97e3697bab8f0f18d32b4f7c6d7af187
 
 slf4j-api.version           = 1.7.5
 slf4j-api.jar               = slf4j-api-${slf4j-api.version}.jar

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1609422&r1=1609421&r2=1609422&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Thu Jul 10 08:43:30 2014
@@ -2928,6 +2928,7 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="junit"/>
         <process_jarfile jarname="logkit"/>
         <process_jarfile jarname="mongo-java-driver"/>
+        <process_jarfile jarname="rsyntaxtextarea"/>
         <process_jarfile jarname="serializer"/>
         <process_jarfile jarname="slf4j-api"/>
         <process_jarfile jarname="slf4j-nop"/>
@@ -2944,8 +2945,6 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="xmlpull"/>
         <process_jarfile jarname="xpp3"/>
         <process_jarfile jarname="xstream"/>
-        <!-- special -->
-        <antcall target="_process_rsyntaxtextarea"/>
     </target>
 
     <target name="_process_doc_jars">
@@ -3000,12 +2999,16 @@ run JMeter unless all the JMeter jars ar
     </target>
 
     <!-- Special: process to get RSyntaxTextArea-->
+	<!-- Useless since rsyntaxtextarea artifacts are published to Maven Repo since 9th july
2014 (JMeter 2.12) -->
+	<!--
     <target name="_process_rsyntaxtextarea">
         <available file="./lib/${rsyntaxtextarea.jar}" property="rsyntaxtextarea.exists"/>
         <antcall target="_get_rsyntaxtextarea"/>
     </target>
-
+    -->
     <!-- Get RSyntaxTextArea binary zip file, unpack it, pick up jar file and remove the
zip -->
+    <!-- Useless since rsyntaxtextarea artifacts are published to Maven Repo since 9th
july 2014 (JMeter 2.12) -->
+	<!--
     <target name="_get_rsyntaxtextarea" unless="rsyntaxtextarea.exists">
         <property name="loc" value="${rsyntaxtextarea.loc}"/>
         <property name="zip" value="${rsyntaxtextarea.name}_${rsyntaxtextarea.version}.zip"/>
@@ -3033,7 +3036,7 @@ run JMeter unless all the JMeter jars ar
             file="${build.dir}/${jar}" tofile="${path}/${rsyntaxtextarea.jar}" verbose="true"/>
         <delete file="${build.dir}/${zip}"/>
     </target>
-
+    -->
     <target name="checkstyle">
         <taskdef resource="checkstyletask.properties"
                  classpath="${lib.opt}/checkstyle-5.3-all.jar"/>

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1609422&r1=1609421&r2=1609422&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Thu Jul 10 08:43:30 2014
@@ -81,7 +81,7 @@
 	<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
 	<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/rhino-1.7R4.jar"/>
-	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.3.jar"/>
 	<classpathentry kind="lib" path="lib/serializer-2.7.1.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-nop-1.7.5.jar"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jul 10 08:43:30 2014
@@ -38,7 +38,7 @@ junit-4.11.jar
 logkit-2.0.jar
 mail-1.5.0-b01.jar
 mongo-java-driver-2.11.3.jar
-rsyntaxtextarea-2.5.1.jar
+rsyntaxtextarea-2.5.3.jar
 oro-2.0.8.jar
 rhino-1.7R4.jar
 serializer-2.7.1.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1609422&r1=1609421&r2=1609422&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Thu Jul 10 08:43:30 2014
@@ -160,7 +160,7 @@ oro-2.0.8
 http://jakarta.apache.org/site/downloads/downloads_oro.cgi
 - regular expressions: various
 
-rsyntaxtextarea-2.5.1
+rsyntaxtextarea-2.5.3
 ---------------------
 http://fifesoft.com/rsyntaxtextarea/
 - syntax coloration

Copied: jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.3.txt (from r1606604, jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.1.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.3.txt?p2=jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.3.txt&p1=jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.1.txt&r1=1606604&r2=1609422&rev=1609422&view=diff
==============================================================================
    (empty)

Propchange: jmeter/trunk/licenses/bin/rsyntaxtextarea-2.5.3.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1609422&r1=1609421&r2=1609422&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Thu Jul 10 08:43:30 2014
@@ -88,7 +88,7 @@ under the License.
       <junit.version>4.11</junit.version>
       <logkit.version>2.0</logkit.version>
       <mongo-java-driver.version>2.11.3</mongo-java-driver.version>
-      <rsyntaxtextarea.version>2.5.1</rsyntaxtextarea.version>
+      <rsyntaxtextarea.version>2.5.3</rsyntaxtextarea.version>
       <slf4j-api.version>1.7.5</slf4j-api.version>
       <slf4j-nop.version>1.7.5</slf4j-nop.version>
       <soap.version>2.3.1</soap.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1609422&r1=1609421&r2=1609422&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Thu Jul 10 08:43:30 2014
@@ -175,6 +175,7 @@ A workaround is to use a Java 7 update 4
 <li><bugzilla>56360</bugzilla> - HashTree and ListedHashTree fail to compile
with Java 8</li>
 <li><bugzilla>56419</bugzilla> - Jmeter silently fails to save results</li>
 <li><bugzilla>56662</bugzilla> - Save as xml in a listener is not remembered</li>
+<li><bugzilla>56367</bugzilla> - JMeter 2.11 on maven central triggers
a not existing dependency rsyntaxtextarea 2.5.1, upgrade to 2.5.3</li>
 </ul>
 
 <!-- =================== Improvements =================== -->
@@ -237,6 +238,7 @@ A workaround is to use a Java 7 update 4
 <li>Updated to xml-apis 1.4.01 (from 1.3.04)</li>
 <li>Updated to xstream 1.4.6 (from 1.4.4)</li>
 <li>Updated to jodd 3.5 (from 3.4.10)</li>
+<li>Updated to rsyntaxtextarea 2.5.3 (from 2.5.1)</li>
 </ul>
 
 <ch_section>Thanks</ch_section>



Mime
View raw message