Merge branch 'eugenp:master' into master

2023-02-28 10:06:11 +01:00
parent ef6752a198 c1564c38a0
commit 1a60cdbf0d
510 changed files with 5213 additions and 3043 deletions
@@ -107,4 +107,11 @@ spring-boot-modules/spring-boot-properties-3/*.log
 .sdkmanrc

 # Localstack
-**/.localstack
+**/.localstack
+
+#libraries-2
+libraries-2/employee*
+libraries-2/src/test/resources/crawler4j/**
+
+#web-modules/ninja
+devDb*.db
@@ -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>
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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 {
@@ -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;
@@ -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>
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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>
@@ -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>
@@ -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 {
@@ -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;

@@ -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>
@@ -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 {
@@ -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")
@@ -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;
@@ -1,4 +1,4 @@
-## Apache HttpClient
+## Apache HttpClient 4

 This module contains articles about Apache HttpClient 4.5

@@ -3,9 +3,9 @@
         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>
-    <artifactId>httpclient4</artifactId>
+    <artifactId>apache-httpclient4</artifactId>
    <version>0.1-SNAPSHOT</version>
-    <name>httpclient4</name>
+    <name>apache-httpclient4</name>
    <packaging>war</packaging>

    <parent>
--- a/Show More
+++ b/Show More