Skip to content

Commit c8f4f2a

Browse files
mofterdingeraamotharald
mofterdinger
and
aamotharald
authored
Add a new servlet logging module supporting jakarta.* packages. (#153)
* Added jakarta servlet module * maintain dependency versions in root pom.xml --------- Co-authored-by: Harald Aamot <[email protected]>
1 parent c7acbca commit c8f4f2a

File tree

3 files changed

+240
-6
lines changed

3 files changed

+240
-6
lines changed

‎cf-java-logging-support-servlet-jakarta/pom.xml

Lines changed: 213 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,213 @@
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<artifactId>cf-java-logging-support-servlet-jakarta</artifactId>
7+
<packaging>jar</packaging>
8+
9+
<name>cf-java-logging-support-servlet-jakarta</name>
10+
<parent>
11+
<groupId>com.sap.hcp.cf.logging</groupId>
12+
<artifactId>cf-java-logging-support-parent</artifactId>
13+
<version>3.6.3</version>
14+
<relativePath>../pom.xml</relativePath>
15+
</parent>
16+
17+
<properties>
18+
<servlet.api.version>5.0.0</servlet.api.version>
19+
<maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
20+
<build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
21+
<jetty.version>11.0.13</jetty.version>
22+
</properties>
23+
24+
<dependencies>
25+
<!-- servlet api -->
26+
<dependency>
27+
<groupId>jakarta.servlet</groupId>
28+
<artifactId>jakarta.servlet-api</artifactId>
29+
<version>${servlet.api.version}</version>
30+
<scope>provided</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>com.sap.hcp.cf.logging</groupId>
34+
<artifactId>cf-java-logging-support-core</artifactId>
35+
<version>${project.version}</version>
36+
</dependency>
37+
<!-- we need our logback implementation for testing! -->
38+
<dependency>
39+
<groupId>com.sap.hcp.cf.logging</groupId>
40+
<artifactId>cf-java-logging-support-logback</artifactId>
41+
<version>${project.version}</version>
42+
<scope>test</scope>
43+
</dependency>
44+
<dependency>
45+
<groupId>ch.qos.logback</groupId>
46+
<artifactId>logback-classic</artifactId>
47+
<version>${logback.version}</version>
48+
<scope>test</scope>
49+
</dependency>
50+
<!-- Library for token signing/verification -->
51+
<dependency>
52+
<groupId>com.auth0</groupId>
53+
<artifactId>java-jwt</artifactId>
54+
<version>${java-jwt.version}</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>com.fasterxml.jackson.core</groupId>
58+
<artifactId>jackson-databind</artifactId>
59+
<version>${jackson-databind.version}</version>
60+
</dependency>
61+
62+
<!-- testing -->
63+
<dependency>
64+
<groupId>org.eclipse.jetty</groupId>
65+
<artifactId>jetty-server</artifactId>
66+
<version>${jetty.version}</version>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>org.eclipse.jetty</groupId>
71+
<artifactId>jetty-servlet</artifactId>
72+
<version>${jetty.version}</version>
73+
<scope>test</scope>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.apache.httpcomponents</groupId>
77+
<artifactId>httpclient</artifactId>
78+
<version>${httpclient.version}</version>
79+
<scope>test</scope>
80+
</dependency>
81+
82+
</dependencies>
83+
84+
<build>
85+
<plugins>
86+
<plugin>
87+
<artifactId>maven-dependency-plugin</artifactId>
88+
<version>${maven-dependency-plugin.version}</version>
89+
<executions>
90+
<execution>
91+
<id>unpack</id>
92+
<phase>generate-sources</phase>
93+
<goals>
94+
<goal>unpack</goal>
95+
</goals>
96+
<configuration>
97+
<artifactItems>
98+
<artifactItem>
99+
<groupId>${project.groupId}</groupId>
100+
<artifactId>cf-java-logging-support-servlet</artifactId>
101+
<version>${project.version}</version>
102+
<type>jar</type>
103+
<classifier>sources</classifier>
104+
<overWrite>false</overWrite>
105+
<outputDirectory>target/generated-sources/java</outputDirectory>
106+
<includes>**/*.java</includes>
107+
</artifactItem>
108+
<artifactItem>
109+
<groupId>${project.groupId}</groupId>
110+
<artifactId>cf-java-logging-support-servlet</artifactId>
111+
<version>${project.version}</version>
112+
<type>jar</type>
113+
<classifier>test-sources</classifier>
114+
<overWrite>false</overWrite>
115+
<outputDirectory>target/generated-test-sources/java</outputDirectory>
116+
<includes>**/*.java</includes>
117+
</artifactItem>
118+
<artifactItem>
119+
<groupId>${project.groupId}</groupId>
120+
<artifactId>cf-java-logging-support-servlet</artifactId>
121+
<version>${project.version}</version>
122+
<type>jar</type>
123+
<classifier>test-sources</classifier>
124+
<overWrite>false</overWrite>
125+
<outputDirectory>target/generated-test-sources/resources</outputDirectory>
126+
<includes>**/logback-test.xml</includes>
127+
</artifactItem>
128+
</artifactItems>
129+
</configuration>
130+
</execution>
131+
</executions>
132+
</plugin>
133+
134+
<plugin>
135+
<groupId>org.codehaus.mojo</groupId>
136+
<artifactId>build-helper-maven-plugin</artifactId>
137+
<version>${build-helper-maven-plugin.version}</version>
138+
<executions>
139+
<execution>
140+
<id>add-generated-sources</id>
141+
<goals>
142+
<goal>add-source</goal>
143+
</goals>
144+
<configuration>
145+
<sources>
146+
<source>target/generated-sources/java</source>
147+
</sources>
148+
</configuration>
149+
</execution>
150+
<execution>
151+
<id>add-generated-test-sources</id>
152+
<goals>
153+
<goal>add-test-source</goal>
154+
</goals>
155+
<configuration>
156+
<sources>
157+
<source>target/generated-test-sources/java</source>
158+
</sources>
159+
</configuration>
160+
</execution>
161+
<execution>
162+
<id>add-generated-test-resources</id>
163+
<goals>
164+
<goal>add-test-resource</goal>
165+
</goals>
166+
<configuration>
167+
<resources>
168+
<resource>
169+
<directory>target/generated-test-sources/resources</directory>
170+
</resource>
171+
</resources>
172+
</configuration>
173+
</execution>
174+
</executions>
175+
</plugin>
176+
177+
<plugin>
178+
<artifactId>maven-antrun-plugin</artifactId>
179+
<executions>
180+
<execution>
181+
<phase>process-sources</phase>
182+
<configuration>
183+
<tasks>
184+
<!-- replace javax.servlet with jakarta.servlet in generated-sources -->
185+
<replace dir="target/generated-sources/java"
186+
token="javax.servlet" value="jakarta.servlet">
187+
<include name="**/*.java" />
188+
</replace>
189+
<!-- replace javax.servlet with jakarta.servlet in generated-test-sources -->
190+
<replace dir="target/generated-test-sources/java"
191+
token="javax.servlet" value="jakarta.servlet">
192+
<include name="**/*.java" />
193+
</replace>
194+
</tasks>
195+
</configuration>
196+
<goals>
197+
<goal>run</goal>
198+
</goals>
199+
</execution>
200+
</executions>
201+
</plugin>
202+
203+
<plugin>
204+
<groupId>org.codehaus.mojo</groupId>
205+
<artifactId>animal-sniffer-maven-plugin</artifactId>
206+
<configuration>
207+
<skip>true</skip>
208+
</configuration>
209+
</plugin>
210+
211+
</plugins>
212+
</build>
213+
</project>

‎cf-java-logging-support-servlet/pom.xml

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
<properties>
1717
<servlet.api.version>3.1.0</servlet.api.version>
18+
<jetty.version>9.4.49.v20220914</jetty.version>
1819
</properties>
1920

2021
<dependencies>
@@ -47,33 +48,49 @@
4748
<dependency>
4849
<groupId>com.auth0</groupId>
4950
<artifactId>java-jwt</artifactId>
50-
<version>3.18.2</version>
51+
<version>${java-jwt.version}</version>
5152
</dependency>
5253
<dependency>
5354
<groupId>com.fasterxml.jackson.core</groupId>
5455
<artifactId>jackson-databind</artifactId>
55-
<version>2.13.4.1</version>
56+
<version>${jackson-databind.version}</version>
5657
</dependency>
5758

5859
<!-- testing -->
5960
<dependency>
6061
<groupId>org.eclipse.jetty</groupId>
6162
<artifactId>jetty-server</artifactId>
62-
<version>9.4.49.v20220914</version>
63+
<version>${jetty.version}</version>
6364
<scope>test</scope>
6465
</dependency>
6566
<dependency>
6667
<groupId>org.eclipse.jetty</groupId>
6768
<artifactId>jetty-servlet</artifactId>
68-
<version>9.4.49.v20220914</version>
69+
<version>${jetty.version}</version>
6970
<scope>test</scope>
7071
</dependency>
7172
<dependency>
7273
<groupId>org.apache.httpcomponents</groupId>
7374
<artifactId>httpclient</artifactId>
74-
<version>4.5.13</version>
75+
<version>${httpclient.version}</version>
7576
<scope>test</scope>
7677
</dependency>
7778

7879
</dependencies>
79-
</project>
80+
81+
<build>
82+
<plugins>
83+
<plugin>
84+
<artifactId>maven-source-plugin</artifactId>
85+
<executions>
86+
<execution>
87+
<goals>
88+
<goal>jar</goal>
89+
<goal>test-jar</goal>
90+
</goals>
91+
</execution>
92+
</executions>
93+
</plugin>
94+
</plugins>
95+
</build>
96+
</project>

‎pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,17 @@
183183
<javadoc.plugin.version>3.1.1</javadoc.plugin.version>
184184
<gpg.plugin.version>1.6</gpg.plugin.version>
185185
<maven.compiler.release>8</maven.compiler.release>
186+
<java-jwt.version>3.18.2</java-jwt.version>
187+
<jackson-databind.version>2.13.4.1</jackson-databind.version>
188+
<httpclient.version>4.5.13</httpclient.version>
186189
</properties>
187190

188191
<modules>
189192
<module>cf-java-logging-support-core</module>
190193
<module>cf-java-logging-support-logback</module>
191194
<module>cf-java-logging-support-log4j2</module>
192195
<module>cf-java-logging-support-servlet</module>
196+
<module>cf-java-logging-support-servlet-jakarta</module>
193197
<module>cf-java-logging-support-jersey</module>
194198
<module>cf-java-monitoring-custom-metrics-clients</module>
195199
<module>sample</module>

0 commit comments

Comments
 (0)