.github/workflows/codeql-analysis.yml

@@ -30,13 +30,13 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
 
       - name: Checkout Project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: false

.github/workflows/main.yml

@@ -32,11 +32,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '11', '17', '21-ea' ]
+        java: [ '11', '17', '21', '23' ]
 
     steps:
       - name: Set up JDK ${{ matrix.java }} 
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }} 
           distribution: 'zulu'
@@ -47,18 +47,19 @@ jobs:
           Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
 
       - name: Checkout Project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           persist-credentials: false
           submodules: false
+          show-progress: false
 
       - name: Build Roller and run JUnit Tests
         run: mvn -V -ntp install
 
       - name: Run Integration Tests
         run: |
           cd it-selenium
-          mvn -V -ntp -Dwebdriver.gecko.driver=$GECKOWEBDRIVER/geckodriver install
+          mvn -V -ntp install
 
       - name: Publish JUnit Report
         uses: test-summary/action@v2
@@ -75,7 +76,7 @@ jobs:
       # only on integration and only once in this matrix
       - name: Upload Dev Build on Integration
         if: ${{ (matrix.java == '11') && (github.event_name == 'push') }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: dev-build
           path: ./app/target/roller.war

app/pom.xml

@@ -24,7 +24,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.roller</groupId>
         <artifactId>roller-project</artifactId>
-        <version>6.1.2</version>
+        <version>6.1.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,29 +36,30 @@ limitations under the License.
         <servlet.version>4.0.1</servlet.version>
         <jsp-api.version>2.2</jsp-api.version>
         <java-activation.version>1.2.0</java-activation.version>
-        <java-mail.version>1.4.7</java-mail.version>
         <jstl.version>1.2</jstl.version>
         <angular.version>1.7.8</angular.version>
-        <ant.version>1.10.13</ant.version>
-        <asm.version>9.5</asm.version>
+        <ant.version>1.10.15</ant.version>
+        <asm.version>9.7.1</asm.version>
         <bouncycastle.version>1.70</bouncycastle.version>
-        <commons-validator.version>1.7</commons-validator.version>
-        <commons-beanutils.version>1.9.4</commons-beanutils.version>
-        <commons-codec.version>1.15</commons-codec.version>
-        <eclipse-link.version>4.0.2</eclipse-link.version>
-        <guice.version>6.0.0</guice.version>
-        <log4j2.version>2.20.0</log4j2.version>
-        <lucene.version>9.6.0</lucene.version>
+        <commons-validator.version>1.9.0</commons-validator.version>
+        <commons-beanutils.version>1.10.0</commons-beanutils.version>
+        <commons-codec.version>1.18.0</commons-codec.version>
+        <commons-text.version>1.13.0</commons-text.version>
+        <commons-lang3.version>3.17.0</commons-lang3.version>
+        <eclipse-link.version>4.0.5</eclipse-link.version>
+        <guice.version>7.0.0</guice.version>
+        <log4j2.version>2.24.3</log4j2.version>
+        <lucene.version>9.12.1</lucene.version> <!-- lucene 10 requires JDK 21 -->
         <oauth-core.version>20100527</oauth-core.version>
-        <maven-war.version>3.3.2</maven-war.version>
-        <maven-surefire.version>2.22.2</maven-surefire.version>
+        <maven-war.version>3.4.0</maven-war.version>
+        <maven-surefire.version>3.5.2</maven-surefire.version>
         <maven-antrun.version>1.0b3</maven-antrun.version>
         <rome.version>1.19.0</rome.version> <!-- locked in place since next version removes popono -->
-        <slf4j.version>1.7.36</slf4j.version>
-        <spring.version>5.3.27</spring.version>
-        <spring.security.version>5.8.3</spring.security.version>
-        <struts.version>2.5.29</struts.version>
-        <velocity.version>2.3</velocity.version>
+        <slf4j.version>2.0.16</slf4j.version>
+        <spring.version>5.3.39</spring.version>
+        <spring.security.version>5.8.14</spring.security.version>
+        <struts.version>2.5.29</struts.version> <!-- .30+ breaks selenium tests -->
+        <velocity.version>2.4.1</velocity.version>
         <webjars.version>1.6</webjars.version>
         <ws-commons-util.version>1.0.2</ws-commons-util.version>
         <xmlrpc-version>3.1.3</xmlrpc-version>
@@ -266,13 +267,13 @@ limitations under the License.
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>jquery</artifactId>
-            <version>3.6.4</version>
+            <version>3.7.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>jquery-ui</artifactId>
-            <version>1.13.2</version>
+            <version>1.14.1</version>
         </dependency>
 
         <dependency>
@@ -284,7 +285,7 @@ limitations under the License.
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>jquery-validation</artifactId>
-            <version>1.19.5</version>
+            <version>1.20.0</version>
         </dependency>
 
         <dependency>
@@ -365,9 +366,15 @@ limitations under the License.
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>${commons-text.version}</version>
          </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.xmlrpc</groupId>
             <artifactId>xmlrpc-common</artifactId>
@@ -499,7 +506,7 @@ limitations under the License.
         <dependency>
             <groupId>com.jgeppert.struts2.bootstrap</groupId>
             <artifactId>struts2-bootstrap-plugin</artifactId>
-            <version>4.0.1</version>
+            <version>4.0.0</version>
         </dependency>
 
         <dependency>
@@ -574,14 +581,14 @@ limitations under the License.
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.12.4</version>
+            <version>5.15.2</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.instancio</groupId>
             <artifactId>instancio-junit</artifactId>
-            <version>2.16.0</version>
+            <version>5.3.0</version>
             <scope>test</scope>
         </dependency>
 
@@ -611,19 +618,21 @@ limitations under the License.
                     </webApp>
                     <jettyXmls>src/test/resources/jetty.xml</jettyXmls>
                     <systemProperties>
-                        <systemProperty>
-                            <name>roller.custom.config</name>
-                            <value>${project.build.directory}/test-classes/roller-jettyrun.properties</value>
-                        </systemProperty>
+                        <roller.custom.config>
+                            ${project.build.directory}/test-classes/roller-jettyrun.properties
+                        </roller.custom.config>
                     </systemProperties>
                 </configuration>
                 <dependencies>
-                    <!-- Dependencies needed when using mvn jetty:run, not mvn test -->
+                    <dependency>
+                        <groupId>org.apache.roller</groupId>
+                        <artifactId>db-utils</artifactId>
+                        <version>6.1.5</version>
+                    </dependency>
                     <dependency>
                         <groupId>commons-dbcp</groupId>
                         <artifactId>commons-dbcp</artifactId>
                         <version>1.4</version>
-                        <scope>runtime</scope>
                     </dependency>
                     <dependency>
                         <groupId>org.apache.derby</groupId>
@@ -643,49 +652,9 @@ limitations under the License.
                 </dependencies>
             </plugin>
 
-            <!-- Activates the Derby database for unit tests and mvn jetty:run
-            <plugin>
-                <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
-                <artifactId>inmemdb-maven-plugin</artifactId>
-
-                <configuration>
-                    <daemon>true</daemon>
-                    <type>derby</type>
-                    <database>rollerdb</database>
-                    <username>APP</username>
-                    <password>APP</password>
-                    <port>4224</port>
-                    <sources>
-                        <script>
-                            <sourceFile>${project.basedir}/target/dbscripts/derby/createdb.sql</sourceFile>
-                        </script>
-                    </sources>
-                    <skip>${skipTests}</skip>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>run</id>
-                        <phase>test-compile</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>stop</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-
-            </plugin>
-            -->
-
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
 
                 <executions>
 
@@ -714,7 +683,7 @@ limitations under the License.
                         </goals>
                         <configuration>
                             <includeEmptyDirs>true</includeEmptyDirs>
-                            <outputDirectory>${basedir}/target/dbscripts</outputDirectory>
+                            <outputDirectory>${basedir}/target/classes/dbscripts</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>${basedir}/src/main/resources/sql</directory>
@@ -724,7 +693,7 @@ limitations under the License.
                         </configuration>
                     </execution>
 
-                    <execution>
+                    <!-- <execution>
                         <id>copy-resources</id>
                         <phase>process-resources</phase>
                         <goals>
@@ -742,7 +711,7 @@ limitations under the License.
                                 </resource>
                             </resources>
                         </configuration>
-                    </execution>
+                    </execution> -->
 
                 </executions>
 
@@ -768,7 +737,7 @@ limitations under the License.
 
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <dependencies>
                     <dependency>
                         <groupId>ant-contrib</groupId>
@@ -804,7 +773,7 @@ limitations under the License.
                                 <property file="${basedir}/src/main/resources/sql/dbscripts.properties" />
                                 <for list="${databases}" param="database" delimiter=" ">
                                     <sequential>
-                                        <mkdir dir="${basedir}/target/dbscripts/@{database}" />
+                                        <mkdir dir="${basedir}/target/classes/dbscripts/@{database}" />
                                     </sequential>
                                 </for>
 
@@ -815,7 +784,7 @@ limitations under the License.
                                     controlTemplate  ="control.vm"
                                     contextProperties="${basedir}/src/main/resources/sql/dbscripts.properties"
                                     templatePath     ="${basedir}/src/main/resources/sql"
-                                    outputDirectory  ="${basedir}/target/dbscripts"
+                                    outputDirectory  ="${basedir}/target/classes/dbscripts"
                                     outputFile       ="README.txt"/>
                             </target>
                         </configuration>
@@ -826,7 +795,7 @@ limitations under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>

app/src/main/java/org/apache/roller/weblogger/business/jpa/JPABookmarkManagerImpl.java

@@ -148,15 +148,14 @@ public void importBookmarks(
 
             WeblogBookmarkFolder newFolder = getFolder(website, folderName);
             if (newFolder == null) {
-                newFolder = new WeblogBookmarkFolder(
-                        folderName, website);
+                newFolder = new WeblogBookmarkFolder(folderName, website);
                 this.strategy.store(newFolder);
             }
 
             // Iterate through children of OPML body, importing each
             Element body = doc.getRootElement().getChild("body");
-            for (Object elem : body.getChildren()) {
-                importOpmlElement((Element) elem, newFolder );
+            for (Element elem : body.getChildren()) {
+                importOpmlElement(elem, newFolder );
             }
         } catch (Exception ex) {
             throw new WebloggerException(ex);
@@ -216,8 +215,8 @@ private void importOpmlElement(
             }
         } else {
             // Import suboutline's children into folder
-            for (Object subelem : elem.getChildren("outline")) {
-                importOpmlElement((Element) subelem, folder );
+            for (Element subelem : elem.getChildren("outline")) {
+                importOpmlElement(subelem, folder );
             }
         }
     }

app/src/main/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java

@@ -67,8 +67,8 @@ public void release() {}
     //--------------------------------------------------------------- user CRUD
 
     @Override
-    public void saveUser(User data) throws WebloggerException {
-        this.strategy.store(data);
+    public void saveUser(User user) throws WebloggerException {
+        this.strategy.store(user);
     }