Skip to content

Commit 1e314cd

Browse files
root360-AndreasUlmroot360-AndreasUlm
committed
modernization
* change logging library from slf4j to log4j2 (2.16.0) * upgrade tomcat to 10.0.14 * add cache directory for maven to speedup multiple release-generation * update root360 logo * cleanup of unused dependency * cleanup of some warnings Signed-off-by: Andreas Ulm <andreas.ulm@root360.de>
1 parent d792fb8 commit 1e314cd

File tree

6 files changed

+107
-41
lines changed

6 files changed

+107
-41
lines changed

‎pom.xml‎

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<maven.compiler.source>1.8</maven.compiler.source>
1717
<maven.compiler.target>1.8</maven.compiler.target>
1818
<failOnMissingWebXml>false</failOnMissingWebXml>
19-
<tomcat.version>9.0.36</tomcat.version>
20-
<slf4j.version>1.7.30</slf4j.version>
19+
<tomcat.version>10.0.14</tomcat.version>
20+
<log4j.version>2.16.0</log4j.version>
2121
</properties>
2222

2323
<dependencies>
@@ -32,34 +32,14 @@
3232
<version>${tomcat.version}</version>
3333
</dependency>
3434
<dependency>
35-
<groupId>javax.servlet</groupId>
36-
<artifactId>jstl</artifactId>
37-
<version>1.2</version>
35+
<groupId>org.apache.logging.log4j</groupId>
36+
<artifactId>log4j-api</artifactId>
37+
<version>${log4j.version}</version>
3838
</dependency>
3939
<dependency>
40-
<groupId>jakarta.json.bind</groupId>
41-
<artifactId>jakarta.json.bind-api</artifactId>
42-
<version>1.0.2</version>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.eclipse</groupId>
46-
<artifactId>yasson</artifactId>
47-
<version>1.0.7</version>
48-
</dependency>
49-
<dependency>
50-
<groupId>org.glassfish</groupId>
51-
<artifactId>jakarta.json</artifactId>
52-
<version>1.1.6</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.slf4j</groupId>
56-
<artifactId>slf4j-log4j12</artifactId>
57-
<version>${slf4j.version}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.slf4j</groupId>
61-
<artifactId>jcl-over-slf4j</artifactId>
62-
<version>${slf4j.version}</version>
40+
<groupId>org.apache.logging.log4j</groupId>
41+
<artifactId>log4j-core</artifactId>
42+
<version>${log4j.version}</version>
6343
</dependency>
6444
</dependencies>
6545

‎release.sh‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ echo "Building package with version '${version}'"
1010
cat > /tmp/build.sh <<EOF
1111
#!/bin/bash
1212
export DEBIAN_FRONTEND="noninteractive"
13-
apt update -qq -y >/dev/null
14-
apt install -qq -y maven >/dev/null
13+
export MAVEN_OPTS="-Dmaven.repo.local=/maven"
14+
apt-get update -qq -y >/dev/null
15+
apt-get install -qq -y maven >/dev/null
1516
1617
cd /app
1718
sed -i "s/1.0.0-SNAPSHOT/${version}/" pom.xml
1819
mvn clean package
19-
git checkout pom.xml
2020
chown -R "${UID}:${UID}" ./
2121
EOF
2222

@@ -26,6 +26,8 @@ rm -rf "${SCRIPTDIR}/target"
2626

2727
git tag --annotate "${version}" -s -m "release of ${version}"
2828

29-
docker run -ti --rm -v "${SCRIPTDIR}:/app" -v "/tmp/build.sh:/build.sh" ubuntu:focal /build.sh
29+
docker run -ti --rm -v "/tmp/m2_home:/maven" -v "${SCRIPTDIR}:/app" -v "/tmp/build.sh:/build.sh" ubuntu:focal /build.sh
30+
31+
git checkout pom.xml
3032

3133
rm -f /tmp/build.sh

‎src/main/java/io/github/root360/app/controller/BaseController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.github.root360.app.controller;
22

3+
import jakarta.servlet.ServletException;
4+
import jakarta.servlet.http.HttpServlet;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletResponse;
37
import java.io.IOException;
4-
import javax.servlet.ServletException;
5-
import javax.servlet.http.HttpServlet;
6-
import javax.servlet.http.HttpServletRequest;
7-
import javax.servlet.http.HttpServletResponse;
88

99
/**
1010
* Class to handle requests.

‎src/main/java/io/github/root360/app/server/TomcatServer.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.apache.catalina.WebResourceRoot;
66
import org.apache.catalina.startup.Tomcat;
77
import org.apache.catalina.webresources.StandardRoot;
8-
import org.slf4j.Logger;
9-
import org.slf4j.LoggerFactory;
8+
import org.apache.logging.log4j.LogManager;
9+
import org.apache.logging.log4j.Logger;
1010

1111
/**
1212
* Class to control TomcatServer.
@@ -19,13 +19,13 @@
1919
public class TomcatServer implements Server {
2020

2121
/** logger object. */
22-
private static final Logger LOGGER = LoggerFactory.getLogger(TomcatServer.class);
22+
private static final Logger LOGGER = LogManager.getLogger(TomcatServer.class);
2323
/** default listen host. */
2424
private static final String DEFAULT_HOST = "localhost";
2525
/** default listen port. */
2626
private static final int DEFAULT_PORT = 8080;
2727
/** default context path to react on. */
28-
private static final String CONTEXT_PATH = "/";
28+
private static final String CONTEXT_PATH = "";
2929
/** default document root. */
3030
private static final String DOC_BASE = ".";
3131

@@ -81,3 +81,4 @@ private int port(final String... args) {
8181
return port;
8282
}
8383
}
84+
// vim: ts=2 sw=2 et

‎src/main/webapp/assets/root360.svg‎

Lines changed: 83 additions & 0 deletions
Loading

‎src/main/webapp/index.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%@ page import = " java.util.* " %>
22
<div class="container">
33
<div class="hero-unit">
4-
<h1><img src="https://s3.amazonaws.com/cdn.freshdesk.com/data/helpdesk/attachments/production/6000441619/logo/k68pEIS95R2nxQjoEu3NlXZmeizE70Y10Q.png"> Sample Java App</h1>
4+
<h1><img src="${pageContext.request.contextPath}/assets/root360.svg" width="200px"> Sample Java App</h1>
55
<hr>
66
<h2>Congratulations!</h2>
77
<p>Your Java application is now running on the host &ldquo;<%= java.net.InetAddress.getLocalHost().getHostName() %>&rdquo; in your own dedicated environment in the AWS&nbsp;Cloud.</p>

0 commit comments

Comments
 (0)