[JAVA-18177] Moved server modules to jdk9-and-above profile (#13523)

* [JAVA-18177]  Moved server modules to jdk9-and-above profile

* [JAVA-18177]  Upgraded maven-war-plugin version

* [JAVA-18146]  Moved json-modules to jdk9-and-above profile

* [JAVA-18151]  Moved libraries-data module to jdk9-and-above profile

* [JAVA-18176] Moved saas-modules to jdk9-and-above profile

* [JAVA-18165] Moved patterns-modules to jdk9-and-above profile

* [JAVA-18146] Fixed tests at gson module

* [JAVA-18165] Upgraded maven-war-plugin version

* [JAVA-16377] Moved apache-cxf-module to jdk9-and-above profile + comment out cxf spring

* [JAVA-18151] Testing maven compiler plugin

* [JAVA-18151] Ignored 2 test cases

* [JAVA-18151] import javassist dependency manually

* [JAVA-16377] Upgraded spring version + uncomment cxf-spring module
This commit is contained in:
panos-kakos 2023-02-26 18:25:24 +02:00 committed by GitHub
parent 3b2d9be8b3
commit 428f69a966
35 changed files with 184 additions and 82 deletions

View File

@ -23,6 +23,16 @@
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta-xml.version}</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>${jakarta.jws.version}</version>
</dependency>
</dependencies>
<build>
@ -37,4 +47,10 @@
</plugins>
</build>
<properties>
<cxf.version>4.0.0</cxf.version>
<jakarta-xml.version>4.0.0</jakarta-xml.version>
<jakarta.jws.version>3.0.0</jakarta.jws.version>
</properties>
</project>

View File

@ -2,8 +2,8 @@ package com.baeldung.cxf.introduction;
import java.util.Map;
import javax.jws.WebService;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.jws.WebService;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@WebService
public interface Baeldung {

View File

@ -3,7 +3,7 @@ package com.baeldung.cxf.introduction;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.jws.WebService;
import jakarta.jws.WebService;
@WebService(endpointInterface = "com.baeldung.cxf.introduction.Baeldung")
public class BaeldungImpl implements Baeldung {

View File

@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
import javax.xml.ws.Endpoint;
import jakarta.xml.ws.Endpoint;
public class Server {
public static void main(String args[]) throws InterruptedException {

View File

@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlJavaTypeAdapter(StudentAdapter.class)
public interface Student {

View File

@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StudentAdapter extends XmlAdapter<StudentImpl, Student> {
public StudentImpl marshal(Student student) throws Exception {

View File

@ -1,6 +1,6 @@
package com.baeldung.cxf.introduction;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlType;
@XmlType(name = "Student")
public class StudentImpl implements Student {

View File

@ -3,8 +3,8 @@ package com.baeldung.cxf.introduction;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import jakarta.xml.bind.annotation.XmlElement;
import jakarta.xml.bind.annotation.XmlType;
@XmlType(name = "StudentMap")
public class StudentMap {

View File

@ -3,7 +3,7 @@ package com.baeldung.cxf.introduction;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import jakarta.xml.bind.annotation.adapters.XmlAdapter;
public class StudentMapAdapter extends XmlAdapter<StudentMap, Map<Integer, Student>> {
public StudentMap marshal(Map<Integer, Student> boundMap) throws Exception {

View File

@ -5,8 +5,8 @@ import static org.junit.Assert.assertEquals;
import java.util.Map;
import javax.xml.namespace.QName;
import javax.xml.ws.Service;
import javax.xml.ws.soap.SOAPBinding;
import jakarta.xml.ws.Service;
import jakarta.xml.ws.soap.SOAPBinding;
import org.junit.Before;
import org.junit.Test;

View File

@ -16,12 +16,28 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
<version>${cxf.version}</version>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
<version>${jakarta-xml.version}</version>
</dependency>
<dependency>
<groupId>jakarta.jws</groupId>
<artifactId>jakarta.jws-api</artifactId>
<version>${jakarta-jws.version}</version>
</dependency>
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-web-api</artifactId>
<version>${jakarta-platform.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@ -50,6 +66,9 @@
<properties>
<httpclient.version>4.5.2</httpclient.version>
<jakarta-xml.version>4.0.0</jakarta-xml.version>
<jakarta-jws.version>3.0.0</jakarta-jws.version>
<jakarta-platform.version>9.0.0</jakarta-platform.version>
</properties>
</project>

View File

@ -1,8 +1,8 @@
package com.baeldung.cxf.jaxrs.implementation;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import jakarta.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;

View File

@ -1,7 +1,7 @@
package com.baeldung.cxf.jaxrs.implementation;
import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

View File

@ -1,6 +1,6 @@
package com.baeldung.cxf.jaxrs.implementation;
import javax.xml.bind.annotation.XmlRootElement;
import jakarta.xml.bind.annotation.XmlRootElement;
@XmlRootElement(name = "Student")
public class Student {

View File

@ -7,7 +7,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import javax.xml.bind.JAXB;
import jakarta.xml.bind.JAXB;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpDelete;

View File

@ -40,10 +40,22 @@
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<version>2.3.3</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${javax.servlet-api.version}</version>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
</dependencies>
@ -103,8 +115,9 @@
</profiles>
<properties>
<spring.version>4.3.4.RELEASE</spring.version>
<spring.version>5.3.25</spring.version>
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

View File

@ -23,6 +23,11 @@
<artifactId>cxf-rt-rs-sse</artifactId>
<version>${cxf-version}</version>
</dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta-ws.version}</version>
</dependency>
</dependencies>
<build>
@ -55,7 +60,8 @@
</build>
<properties>
<cxf-version>3.2.0</cxf-version>
<cxf-version>4.0.0</cxf-version>
<jakarta-ws.version>3.1.0</jakarta-ws.version>
</properties>
</project>

View File

@ -1,10 +1,10 @@
package com.baeldung.sse.jaxrs.client;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.sse.InboundSseEvent;
import javax.ws.rs.sse.SseEventSource;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.sse.InboundSseEvent;
import jakarta.ws.rs.sse.SseEventSource;
import java.util.function.Consumer;
public class SseClientApp {

View File

@ -1,10 +1,10 @@
package com.baeldung.sse.jaxrs.client;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.sse.InboundSseEvent;
import javax.ws.rs.sse.SseEventSource;
import jakarta.ws.rs.client.Client;
import jakarta.ws.rs.client.ClientBuilder;
import jakarta.ws.rs.client.WebTarget;
import jakarta.ws.rs.sse.InboundSseEvent;
import jakarta.ws.rs.sse.SseEventSource;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;

View File

@ -15,16 +15,14 @@
<dependencies>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${rs-api.version}</version>
<scope>provided</scope>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
<version>${jakarta-ws.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${cdi-api.version}</version>
<scope>provided</scope>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>${jakarta-cdi-api}</version>
</dependency>
<dependency>
<groupId>javax.json.bind</groupId>
@ -37,6 +35,11 @@
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>net.wasdev.wlp.maven.plugins</groupId>
<artifactId>liberty-maven-plugin</artifactId>
@ -78,9 +81,10 @@
<liberty-maven-plugin.version>2.4.2</liberty-maven-plugin.version>
<failOnMissingWebXml>false</failOnMissingWebXml>
<openliberty-version>18.0.0.2</openliberty-version>
<rs-api.version>2.1</rs-api.version>
<cdi-api.version>2.0</cdi-api.version>
<jakarta-ws.version>3.1.0</jakarta-ws.version>
<jakarta-cdi-api>4.0.1</jakarta-cdi-api>
<bind-api.version>1.0</bind-api.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

View File

@ -1,7 +1,7 @@
package com.baeldung.sse.jaxrs;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.core.Application;
import jakarta.ws.rs.ApplicationPath;
import jakarta.ws.rs.core.Application;
@ApplicationPath("sse")
public class AppConfig extends Application {

View File

@ -1,15 +1,15 @@
package com.baeldung.sse.jaxrs;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.sse.OutboundSseEvent;
import javax.ws.rs.sse.Sse;
import javax.ws.rs.sse.SseBroadcaster;
import javax.ws.rs.sse.SseEventSink;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.sse.OutboundSseEvent;
import jakarta.ws.rs.sse.Sse;
import jakarta.ws.rs.sse.SseBroadcaster;
import jakarta.ws.rs.sse.SseEventSink;
@ApplicationScoped
@Path("stock")

View File

@ -1,11 +1,11 @@
package com.baeldung.sse.jaxrs;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.context.Initialized;
import javax.enterprise.event.Event;
import javax.enterprise.event.Observes;
import javax.inject.Inject;
import javax.inject.Named;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.Initialized;
import jakarta.enterprise.event.Event;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;

View File

@ -23,8 +23,8 @@ public class GsonSerializeUnitTest {
ActorGson rudyYoungblood = new ActorGson("nm2199632", sdf.parse("21-09-1982"), Arrays.asList("Apocalypto", "Beatdown", "Wind Walkers"));
Movie movie = new Movie("tt0472043", "Mel Gibson", Arrays.asList(rudyYoungblood));
String expectedOutput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"Sep 21, 1982 12:00:00 AM\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}";
Assert.assertEquals(new Gson().toJson(movie), expectedOutput);
String expectedOutput = "{\"imdbId\":\"tt0472043\",\"director\":\"Mel Gibson\",\"actors\":[{\"imdbId\":\"nm2199632\",\"dateOfBirth\":\"Sep 21, 1982, 12:00:00 AM\",\"filmography\":[\"Apocalypto\",\"Beatdown\",\"Wind Walkers\"]}]}";
Assert.assertEquals(expectedOutput, new Gson().toJson(movie));
}
@Test

View File

@ -1,7 +1,7 @@
package com.baeldung.gson.serialization.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.lang.reflect.Type;
import java.util.Collection;
@ -88,7 +88,7 @@ public class GsonSerializationUnitTest {
String jsonDate = gson.toJson(sourceDate, sourceDateType);
System.out.println("jsonDate:\n" + jsonDate);
String expectedResult = "\"Jan 1, 2000 12:00:00 AM\"";
String expectedResult = "\"Jan 1, 2000, 12:00:00 AM\"";
assertEquals(expectedResult, jsonDate);
}

View File

@ -3,7 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId>
<artifactId>json-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
@ -119,6 +118,11 @@
<version>RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
</dependencies>
<build>

View File

@ -58,6 +58,11 @@
<artifactId>crunch-core</artifactId>
<version>${org.apache.crunch.crunch-core.version}</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>${javassist.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
@ -138,6 +143,15 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@ -166,6 +180,8 @@
</build>
<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<assembly.plugin.version>2.3</assembly.plugin.version>
<httpclient.version>3.1</httpclient.version>
<storm.version>1.2.2</storm.version>
@ -178,6 +194,7 @@
<org.apache.crunch.crunch-core.version>1.0.0</org.apache.crunch.crunch-core.version>
<org.apache.hadoop.hadoop-client>2.2.0</org.apache.hadoop.hadoop-client>
<jmapper.version>1.6.0.1</jmapper.version>
<javassist.version>3.29.2-GA</javassist.version>
</properties>
</project>

View File

@ -7,6 +7,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.crunch.FilterFn;
import org.apache.crunch.PCollection;
import org.apache.crunch.impl.mem.MemPipeline;
import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableList;

View File

@ -6,6 +6,7 @@ import org.apache.crunch.PCollection;
import org.apache.crunch.impl.mem.MemPipeline;
import org.apache.crunch.types.writable.Writables;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import com.google.common.collect.ImmutableList;

View File

@ -65,7 +65,7 @@
<properties>
<camel.version>3.7.4</camel.version>
<spring-boot.version>2.2.2.RELEASE</spring-boot.version>
<spring-boot.version>2.7.8</spring-boot.version>
<log4j2.version>2.17.1</log4j2.version>
</properties>

View File

@ -25,10 +25,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty-maven-plugin.version}</version>
<configuration>
<webApp>
<contextPath>/front-controller</contextPath>
@ -38,4 +40,9 @@
</plugins>
</build>
<properties>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
<jetty-maven-plugin.version>11.0.13</jetty-maven-plugin.version>
</properties>
</project>

View File

@ -30,6 +30,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
@ -46,4 +47,8 @@
</plugins>
</build>
<properties>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

29
pom.xml
View File

@ -330,7 +330,6 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>apache-cxf-modules</module>
<module>azure</module>
<module>checker-plugin</module>
@ -364,15 +363,12 @@
<module>jmh</module>
<module>jsf</module>
<module>json-modules</module>
<module>kubernetes-modules</module>
<!-- <module>lagom</module> --> <!-- Not a maven project -->
<module>language-interop</module>
<module>libraries-3</module>
<module>libraries-data</module>
<module>libraries-data-db</module>
<module>libraries-security</module>
@ -393,7 +389,6 @@
<module>osgi</module>
<module>orika</module>
<module>patterns-modules</module>
<module>performance-tests</module>
<module>persistence-modules</module>
@ -446,8 +441,6 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>saas-modules</module>
<module>server-modules</module>
<module>spf4j</module>
<module>spring-4</module>
<module>spring-aop</module>
@ -584,7 +577,6 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>apache-cxf-modules</module>
<module>azure</module>
<module>checker-plugin</module>
@ -615,14 +607,13 @@
<module>jmh</module>
<module>jsf</module>
<module>json-modules</module>
<module>kubernetes-modules</module>
<!-- <module>lagom</module> --> <!-- Not a maven project -->
<module>language-interop</module>
<module>libraries-3</module>
<module>libraries-data</module>
<module>libraries-data-db</module>
@ -643,7 +634,6 @@
<module>osgi</module>
<module>orika</module>
<module>patterns-modules</module>
<module>performance-tests</module>
<module>persistence-modules</module>
@ -688,8 +678,7 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>saas-modules</module>
<module>server-modules</module>
<module>spf4j</module>
<module>spring-4</module>
<module>spring-batch</module>
@ -845,9 +834,17 @@
</build>
<modules>
<module>patterns-modules</module>
<module>json-modules</module>
<module>libraries-data</module>
<module>saas-modules</module>
<module>server-modules</module>
<module>apache-cxf-modules</module>
<module>spring-aop</module>
<module>jmeter</module>
<module>spring-aop-2</module>
<module>algorithms-modules</module>
<module>apache-libraries</module>
<module>apache-poi</module>
@ -1072,6 +1069,12 @@
</build>
<modules>
<module>patterns-modules</module>
<module>json-modules</module>
<module>libraries-data</module>
<module>saas-modules</module>
<module>server-modules</module>
<module>apache-cxf-modules</module>
<module>algorithms-modules</module>
<module>apache-libraries</module>
<module>apache-poi</module>

View File

@ -15,6 +15,7 @@
<properties>
<sentry.version>6.11.0</sentry.version>
<cargo.version>1.10.4</cargo.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
<dependencies>

View File

@ -13,7 +13,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>
@ -63,6 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<archive>
<manifestEntries>
@ -74,4 +75,8 @@
</plugins>
</build>
<properties>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>