Merge pull request #339 from apache/dependabot/maven/org.slf4j-slf4j-simple-2.0.13
Bump org.slf4j:slf4j-simple from 2.0.12 to 2.0.13
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 756cbca..619fa10 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,9 +31,9 @@
java: [ '17', '21' ]
steps:
- name: Checkout code
- uses: actions/checkout@v4.1.1
+ uses: actions/checkout@v4.1.4
- name: Set up cache
- uses: actions/cache@v4.0.0
+ uses: actions/cache@v4.0.2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
diff --git a/jasperreports/pom.xml b/jasperreports/pom.xml
index 5c5da9d..79d9cc9 100644
--- a/jasperreports/pom.xml
+++ b/jasperreports/pom.xml
@@ -17,6 +17,7 @@
<url>https://struts.apache.org/getting-started/jasper-reports-tutorial</url>
<properties>
<jasperreports.version>6.21.2</jasperreports.version>
+ <jetty-plugin.version>12.0.8</jetty-plugin.version>
</properties>
<dependencies>
@@ -68,8 +69,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
+ <groupId>org.eclipse.jetty.ee8</groupId>
+ <artifactId>jetty-ee8-maven-plugin</artifactId>
<version>${jetty-plugin.version}</version>
<configuration>
<webApp>
@@ -77,8 +78,15 @@
</webApp>
<stopKey>CTRL+C</stopKey>
<stopPort>8999</stopPort>
- <scanIntervalSeconds>10</scanIntervalSeconds>
+ <scan>10</scan>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>serializer</artifactId>
+ <version>2.7.3</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
diff --git a/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java b/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java
index d7959b7..ccf4709 100644
--- a/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java
+++ b/jasperreports/src/main/java/org/apache/struts/example/jasperreports/service/JasperInitializer.java
@@ -15,7 +15,9 @@
private static final Logger LOG = LogManager.getLogger(JasperInitializer.class);
- private static final String COMPILED_JASPER_FILE = "/WEB-INF/jasper/our_compiled_template.jasper";
+ private static final String COMPILED_JASPER_PATH = "/WEB-INF/jasper/";
+
+ private static final String COMPILED_JASPER_FILENAME = "our_compiled_template.jasper";
@Override
public void afterPropertiesSet() throws Exception {
@@ -29,7 +31,7 @@
throw new IllegalStateException("our_jasper_template.jrxml File not found.");
})
.getFile(),
- sc.getRealPath(COMPILED_JASPER_FILE));
+ sc.getRealPath(COMPILED_JASPER_PATH) + COMPILED_JASPER_FILENAME);
LOG.info("=== End JasperReport compile ===");
} catch (Exception e) {
throw new IllegalStateException("Failed to compile, " + e.getMessage(), e);
@@ -43,7 +45,7 @@
@Override
public void destroy() throws Exception {
- File templteFile = new File(sc.getRealPath(COMPILED_JASPER_FILE));
+ File templteFile = new File(sc.getRealPath(COMPILED_JASPER_PATH) + COMPILED_JASPER_FILENAME);
LOG.info(
"=== Compiled JasperReport file ({}) delete result: {} ===",
templteFile.getAbsolutePath(),
diff --git a/pom.xml b/pom.xml
index f65ef07..f07064d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<struts2.version>6.3.0.2</struts2.version>
- <log4j2.version>2.22.1</log4j2.version>
+ <log4j2.version>2.23.1</log4j2.version>
<jetty-plugin.version>9.4.46.v20220331</jetty-plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<jackson.version>2.14.1</jackson.version>
diff --git a/quarkus/pom.xml b/quarkus/pom.xml
index bdd1a86..267ca79 100644
--- a/quarkus/pom.xml
+++ b/quarkus/pom.xml
@@ -14,7 +14,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <quarkus-plugin.version>3.7.3</quarkus-plugin.version>
+ <quarkus-plugin.version>3.10.0</quarkus-plugin.version>
</properties>
<dependencyManagement>
diff --git a/shiro-basic/pom.xml b/shiro-basic/pom.xml
index b2162b1..29399a1 100644
--- a/shiro-basic/pom.xml
+++ b/shiro-basic/pom.xml
@@ -13,7 +13,7 @@
<packaging>war</packaging>
<properties>
- <shiro.version>1.13.0</shiro.version>
+ <shiro.version>2.0.0</shiro.version>
</properties>
<dependencies>
