Merge pull request #799 from hazendaz/master

Fix selenium usage, update some containers, cleanup pom
mybatis · Feb 10, 2024 · 0a71e05 · 0a71e05
2 parents f8da409 + 7218f88
commit 0a71e05
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@
 *.releaseBackup
 *.properties
 .env
+.github/keys/
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
                                  Apache License
                            Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/
 
    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
@@ -192,7 +192,7 @@
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2010-2023 the original author or authors.
+       Copyright 2010-2024 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -16,7 +16,8 @@
        limitations under the License.
 
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -32,13 +33,13 @@
   <packaging>war</packaging>
 
   <name>JPetStore Demo 6</name>
-  <url>http://www.mybatis.org</url>
+  <url>https://www.mybatis.org/jpetstore-6/</url>
 
   <scm>
-    <url>http://github.com/mybatis/jpetstore-6</url>
     <connection>scm:git:ssh://git@github.com/mybatis/jpetstore-6.git</connection>
     <developerConnection>scm:git:ssh://git@github.com/mybatis/jpetstore-6.git</developerConnection>
     <tag>HEAD</tag>
+    <url>https://github.com/mybatis/jpetstore-6/</url>
   </scm>
   <issueManagement>
     <system>GitHub Issue Management</system>
@@ -56,8 +57,28 @@
     </site>
   </distributionManagement>
 
+  <properties>
+    <cargo.maven.containerId>tomcat${tomcat.major-version}x</cargo.maven.containerId>
+    <cargo.maven.containerUrl>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major-version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</cargo.maven.containerUrl>
+    <tomcat.major-version />
+    <tomcat.version />
+
+    <cargo-maven3-plugin.version>1.10.12</cargo-maven3-plugin.version>
+    <clirr.comparisonVersion>6.0.2</clirr.comparisonVersion>
+
+    <slf4j.version>2.0.12</slf4j.version>
+    <spring.version>5.3.31</spring.version>
+    <assertj.version>3.25.3</assertj.version>
+    <mockito.version>5.10.0</mockito.version>
+    <hsqldb.version>2.7.2</hsqldb.version>
+    <module.name>org.mybatis.jpetstore</module.name>
+
+    <!-- Reproducible Builds -->
+    <project.build.outputTimestamp>1670877034</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
-    
+
     <dependency>
       <groupId>org.mybatis</groupId>
       <artifactId>mybatis</artifactId>
@@ -123,12 +144,12 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.12</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.12</version>
+      <version>${slf4j.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hsqldb</groupId>
@@ -170,8 +191,8 @@
     </dependency>
     <dependency>
       <groupId>org.seleniumhq.selenium</groupId>
-      <artifactId>htmlunit-driver</artifactId>
-      <version>4.13.0</version>
+      <artifactId>htmlunit3-driver</artifactId>
+      <version>4.17.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -188,6 +209,28 @@
     </dependency>
   </dependencies>
 
+  <repositories>
+    <repository>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>sonatype-oss-snapshots</id>
+      <name>Sonatype OSS Snapshots Repository</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>sonatype-oss-snapshots</id>
+      <name>Sonatype OSS Snapshots Repository</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+    </pluginRepository>
+  </pluginRepositories>
+
   <build>
     <finalName>jpetstore</finalName>
     <pluginManagement>
@@ -205,6 +248,7 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>3.2.5</version>
         </plugin>
@@ -250,21 +294,22 @@
         <executions>
           <execution>
             <id>start-container</id>
-            <phase>pre-integration-test</phase>
             <goals>
               <goal>start</goal>
             </goals>
+            <phase>pre-integration-test</phase>
           </execution>
           <execution>
             <id>stop-container</id>
-            <phase>post-integration-test</phase>
             <goals>
               <goal>stop</goal>
             </goals>
+            <phase>post-integration-test</phase>
           </execution>
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <executions>
           <execution>
@@ -278,48 +323,6 @@
     </plugins>
   </build>
 
-  <repositories>
-    <repository>
-      <id>sonatype-oss-snapshots</id>
-      <name>Sonatype OSS Snapshots Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>sonatype-oss-snapshots</id>
-      <name>Sonatype OSS Snapshots Repository</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <properties>
-    <cargo.maven.containerId>tomcat${tomcat.major-version}x</cargo.maven.containerId>
-    <cargo.maven.containerUrl>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major-version}/v${tomcat.version}/bin/apache-tomcat-${tomcat.version}.zip</cargo.maven.containerUrl>
-    <tomcat.major-version />
-    <tomcat.version />
-
-    <surefire.version>3.0.0-M7</surefire.version>
-    <cargo-maven3-plugin.version>1.10.12</cargo-maven3-plugin.version>
-    <clirr.comparisonVersion>6.0.2</clirr.comparisonVersion>
-
-    <spring.version>5.3.31</spring.version>
-    <assertj.version>3.25.3</assertj.version>
-    <mockito.version>5.10.0</mockito.version>
-    <hsqldb.version>2.7.2</hsqldb.version>
-    <module.name>org.mybatis.jpetstore</module.name>
-
-    <!-- Reproducible Builds -->
-    <project.build.outputTimestamp>1670877034</project.build.outputTimestamp>
-  </properties>
-
   <profiles>
     <!-- Profiles for Application Server -->
     <profile>
@@ -329,26 +332,28 @@
       </activation>
       <properties>
         <tomcat.major-version>9</tomcat.major-version>
-        <tomcat.version>9.0.70</tomcat.version>
+        <tomcat.version>9.0.85</tomcat.version>
       </properties>
     </profile>
     <profile>
+      <!-- TODO: Remove tomcat 8.5 after 3/31/2024 as obsolete -->
       <id>tomcat85</id>
       <properties>
         <tomcat.major-version>8</tomcat.major-version>
-        <tomcat.version>8.5.84</tomcat.version>
+        <tomcat.version>8.5.98</tomcat.version>
       </properties>
     </profile>
     <profile>
       <id>tomee80</id>
       <properties>
         <tomee.major-version>8</tomee.major-version>
-        <tomee.version>8.0.13</tomee.version>
+        <tomee.version>8.0.16</tomee.version>
         <cargo.maven.containerId>tomee${tomee.major-version}x</cargo.maven.containerId>
         <cargo.maven.containerUrl>https://repo1.maven.org/maven2/org/apache/tomee/apache-tomee/${tomee.version}/apache-tomee-${tomee.version}-plume.zip</cargo.maven.containerUrl>
       </properties>
     </profile>
     <profile>
+      <!-- TODO: Remove tomee71 after 3/31/2024 as obsolete -->
       <id>tomee71</id>
       <properties>
         <tomee.major-version>7</tomee.major-version>
@@ -361,12 +366,13 @@
       <id>wildfly26</id>
       <properties>
         <wildfly.major-version>26</wildfly.major-version>
-        <wildfly.version>26.1.2.Final</wildfly.version>
+        <wildfly.version>26.1.3.Final</wildfly.version>
         <cargo.maven.containerId>wildfly${wildfly.major-version}x</cargo.maven.containerId>
         <cargo.maven.containerUrl>https://github.com/wildfly/wildfly/releases/download/${wildfly.version}/wildfly-${wildfly.version}.zip</cargo.maven.containerUrl>
       </properties>
     </profile>
     <profile>
+      <!-- TODO: Remove wildfly13 after 3/31/2024 as obsolete -->
       <id>wildfly13</id>
       <properties>
         <wildfly.major-version>13</wildfly.major-version>
@@ -378,15 +384,15 @@
     <profile>
       <id>liberty-ee8</id>
       <properties>
-        <liberty.version>22.0.0.12</liberty.version>
+        <liberty.version>24.0.0.1</liberty.version>
         <cargo.maven.containerId>liberty</cargo.maven.containerId>
         <cargo.maven.containerUrl>https://repo1.maven.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee8/${liberty.version}/wlp-javaee8-${liberty.version}.zip</cargo.maven.containerUrl>
       </properties>
     </profile>
     <profile>
       <id>liberty-ee7</id>
       <properties>
-        <liberty.version>22.0.0.12</liberty.version>
+        <liberty.version>24.0.0.1</liberty.version>
         <cargo.maven.containerId>liberty</cargo.maven.containerId>
         <cargo.maven.containerUrl>https://repo1.maven.org/maven2/com/ibm/websphere/appserver/runtime/wlp-javaee7/${liberty.version}/wlp-javaee7-${liberty.version}.zip</cargo.maven.containerUrl>
       </properties>
@@ -395,7 +401,7 @@
       <id>jetty</id>
       <properties>
         <jetty.major-version>9</jetty.major-version>
-        <jetty.version>9.4.50.v20221201</jetty.version>
+        <jetty.version>9.4.53.v20231009</jetty.version>
         <cargo.maven.containerId>jetty${jetty.major-version}x</cargo.maven.containerId>
         <cargo.maven.containerUrl>https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.version}/jetty-distribution-${jetty.version}.tar.gz</cargo.maven.containerUrl>
       </properties>
@@ -410,6 +416,7 @@
       </properties>
     </profile>
     <profile>
+      <!-- TODO: Remove wildfly13 after 3/31/2024 as obsolete -->
       <id>glassfish4</id>
       <properties>
         <glassfish.major-version>4</glassfish.major-version>

diff --git a/renovate.json b/renovate.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
+    "config:recommended"
   ]
 }