pre J21 changes

dotCMS · Jun 3, 2024 · 2499942 · 2499942
1 parent 7bcecb5
commit 2499942
Show file tree

Hide file tree

Showing 15 changed files with 183 additions and 442 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -26,7 +26,6 @@
         <jackson.version>2.16.1</jackson.version>
         <jersey.version>2.22.1</jersey.version>
         <graalvm.version>22.3.3</graalvm.version>
-        <dotcms.tika-api.version>2023.09.8</dotcms.tika-api.version>
     </properties>
     <dependencyManagement>
 
@@ -59,7 +58,7 @@
             <dependency>
                 <groupId>com.dotcms.core.plugins</groupId>
                 <artifactId>com.dotcms.tika-api</artifactId>
-                <version>${dotcms.tika-api.version}</version>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
@@ -1505,7 +1504,12 @@
                 <artifactId>mockito-core</artifactId>
                 <version>5.11.0</version>
             </dependency>
-
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-junit-jupiter</artifactId>
+                <version>5.11.0</version>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <!-- Hamcrest is a framework for writing matcher objects allowing 'match' rules to be defined declaratively. -->
                 <groupId>org.hamcrest</groupId>

diff --git a/core-web/pom.xml b/core-web/pom.xml
@@ -14,9 +14,6 @@
 
     <properties>
         <maven.deploy.skip>false</maven.deploy.skip>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.plugin.cargo.version>1.9.0</maven.plugin.cargo.version>
         <cargo.tomcat.major.version>9</cargo.tomcat.major.version>

diff --git a/dotCMS/pom.xml b/dotCMS/pom.xml
@@ -1293,6 +1293,16 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
             <artifactId>junit-vintage-engine</artifactId>

diff --git a/dotCMS/src/main/java/com/liferay/util/Randomizer.java b/dotCMS/src/main/java/com/liferay/util/Randomizer.java
diff --git a/dotCMS/src/main/java/com/liferay/util/StringUtil.java b/dotCMS/src/main/java/com/liferay/util/StringUtil.java
@@ -205,12 +205,6 @@ public static String merge(String array[], String delimiter) {
 		return sb.toString();
 	}
 
-	public static String randomize(String s) {
-		Randomizer r = new Randomizer();
-
-		return r.randomize(s);
-	}
-
 	public static String read(ClassLoader classLoader, String name)
 		throws IOException {
 		InputStream is=classLoader.getResourceAsStream(name);