[jtrac-svn] SF.net SVN: j-trac:[1471] trunk/jtrac

[<udi...@us...>]

Revision: 1471
          http://sourceforge.net/p/j-trac/code/1471
Author:   udittmer
Date:     2023-03-24 09:07:58 +0000 (Fri, 24 Mar 2023)
Log Message:
-----------
update dependencies, fix #169

Modified Paths:
--------------
    trunk/jtrac/pom.xml
    trunk/jtrac/src/main/java/info/jtrac/wiki/HTMLRenderer.java
    trunk/jtrac/src/main/java/info/jtrac/wiki/Utils.java
    trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java

Modified: trunk/jtrac/pom.xml
===================================================================
--- trunk/jtrac/pom.xml	2023-02-23 08:35:24 UTC (rev 1470)
+++ trunk/jtrac/pom.xml	2023-03-24 09:07:58 UTC (rev 1471)
@@ -4,7 +4,7 @@
     <groupId>info.jtrac</groupId>
     <artifactId>jtrac</artifactId>
     <packaging>war</packaging>
-    <version>2.3.0</version>
+    <version>2.3.1</version>
     <name>JTrac</name>
     <description>
         JTrac is a generic issue-tracking web-application that can be easily customized by adding custom fields 
@@ -65,9 +65,9 @@
             <scope>test</scope>
         </dependency>
 		<dependency>
-			<groupId>net.sourceforge.htmlunit</groupId>
+			<groupId>org.htmlunit</groupId>
 			<artifactId>htmlunit</artifactId>
-			<version>2.70.0</version>
+			<version>3.0.0</version>
             <scope>test</scope>
 		</dependency>
         <dependency>
@@ -479,7 +479,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>
@@ -506,7 +506,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M8</version>
+				<version>3.0.0</version>
                 <configuration>
                     <excludes>
                         <exclude>info/jtrac/test/**</exclude>
@@ -530,7 +530,7 @@
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm z</maven.build.timestamp.format>
 		<commonmark.version>0.21.0</commonmark.version>
-		<log4j2.version>2.19.0</log4j2.version>
-		<slf4j.version>2.0.6</slf4j.version>
+		<log4j2.version>2.20.0</log4j2.version>
+		<slf4j.version>2.0.7</slf4j.version>
 	</properties>
 </project>

Modified: trunk/jtrac/src/main/java/info/jtrac/wiki/HTMLRenderer.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wiki/HTMLRenderer.java	2023-02-23 08:35:24 UTC (rev 1470)
+++ trunk/jtrac/src/main/java/info/jtrac/wiki/HTMLRenderer.java	2023-03-24 09:07:58 UTC (rev 1471)
@@ -97,9 +97,6 @@
             } catch (PatternSyntaxException psex) {
                 logger.error("Can't construct regular expression - " + psex.getMessage());
             }
-        } else if (mode.startsWith("view")) {
-			// dollar signs lead to errors in the regexps
-			content = content.replace("$", "&dollar;");
 		}
 
 		Map<String,String> tokens = new HashMap<>();

Modified: trunk/jtrac/src/main/java/info/jtrac/wiki/Utils.java
===================================================================
--- trunk/jtrac/src/main/java/info/jtrac/wiki/Utils.java	2023-02-23 08:35:24 UTC (rev 1470)
+++ trunk/jtrac/src/main/java/info/jtrac/wiki/Utils.java	2023-03-24 09:07:58 UTC (rev 1471)
@@ -188,36 +188,5 @@
 
 		return sb.toString();
 	}
-
-	/** This method runs about 20 times faster than java.lang.String.toLowerCase
-	 * (and doesn't waste any storage when the result is equal to the input).
-	 * Warning: Don't use this method when your default locale is Turkey.
-	 * java.lang.String.toLowerCase is slow because (a) it uses a
-	 * StringBuffer (which has synchronized methods), (b) it initializes
-	 * the StringBuffer to the default size, and (c) it gets the default
-	 * locale every time to test for name equal to "tr".
-	 * @author Peter Norvig (www.norvig.com) **/
-
-	public static String toLowerCase (String str) {
-		if (str == null) return null;
-		int len = str.length();
-		int different = -1;
-		for (int i = len-1; i >= 0; i--) {
-			char ch = str.charAt(i);
-			if (Character.toLowerCase(ch) != ch) {
-				different = i;
-				break;
-			}
-		}
-		if (different == -1) {
-			return str;
-		} else {
-			char[] chars = new char[len];
-			str.getChars(0, len, chars, 0);
-			for (int j = different; j >= 0; j--)
-				chars[j] = Character.toLowerCase(chars[j]);
-			return new String(chars);
-		}
-	}
 }
 

Modified: trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java
===================================================================
--- trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java	2023-02-23 08:35:24 UTC (rev 1470)
+++ trunk/jtrac/src/test/java/info/jtrac/htmlunit/BasicTest.java	2023-03-24 09:07:58 UTC (rev 1471)
@@ -5,8 +5,8 @@
 import org.junit.*;
 import org.junit.runners.MethodSorters;
 
-import com.gargoylesoftware.htmlunit.*;
-import com.gargoylesoftware.htmlunit.html.*;
+import org.htmlunit.*;
+import org.htmlunit.html.*;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class BasicTest {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.