Move to Jakarta 10 (#412)

smallrye · Feb 27, 2023 · 18d68aa · 18d68aa
1 parent 6f4867b
commit 18d68aa
Show file tree

Hide file tree

Showing 108 changed files with 918 additions and 1,399 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - jakarta
     paths-ignore:
       - '.gitignore'
       - 'CODEOWNERS'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,8 +28,7 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          # https://issues.sonatype.org/browse/NEXUS-31214
-          java-version: 12
+          java-version: 17
 
       - name: maven release ${{steps.metadata.outputs.current-version}}
         run: |

diff --git a/api/pom.xml b/api/pom.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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>
     <parent>
         <artifactId>smallrye-context-propagation-parent</artifactId>
         <groupId>io.smallrye</groupId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>smallrye-context-propagation-api</artifactId>
+    <name>SmallRye Context Propagation: API</name>
 
     <dependencies>
         <dependency>

diff --git a/api/src/main/java/io/smallrye/context/api/CurrentThreadContext.java b/api/src/main/java/io/smallrye/context/api/CurrentThreadContext.java
@@ -43,7 +43,7 @@
     /**
      * Defines that the current thread context should be removed. This is mutually exclusive
      * with the other settings.
-     * 
+     *
      * @return a boolean indicating if the current thread context should be removed. Defaults to false.
      */
     @Nonbinding
@@ -151,7 +151,7 @@
      * For example, to run as the current application, but under the
      * transaction of the thread where the task executes:
      * </p>
-     * 
+     *
      * <pre>
      * <code> {@literal @}WithThreadContext(unchanged = ThreadContext.TRANSACTION,
      *                              propagated = ThreadContext.APPLICATION,

diff --git a/api/src/main/java/io/smallrye/context/api/ThreadContextConfig.java b/api/src/main/java/io/smallrye/context/api/ThreadContextConfig.java
@@ -190,7 +190,7 @@
      * For example, to run as the current application, but under the
      * transaction of the thread where the task executes:
      * </p>
-     * 
+     *
      * <pre>
      * <code> {@literal @}Inject {@literal @}ThreadContextConfig(unchanged = ThreadContext.TRANSACTION,
      *                              propagated = ThreadContext.APPLICATION,

diff --git a/application/pom.xml b/application/pom.xml
@@ -6,39 +6,19 @@
         <artifactId>smallrye-context-propagation-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
     <artifactId>smallrye-context-propagation-application</artifactId>
-    <name>smallrye-context-propagation-application</name>
+    <name>SmallRye Context Propagation: Application</name>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>smallrye-context-propagation</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.context-propagation</groupId>
             <artifactId>microprofile-context-propagation-api</artifactId>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 
 </project>
diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -6,52 +6,26 @@
         <artifactId>smallrye-context-propagation-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
+
     <artifactId>smallrye-context-propagation-cdi</artifactId>
-    <name>smallrye-context-propagation-cdi</name>
+    <name>SmallRye Context Propagation: CDI</name>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>smallrye-context-propagation</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>smallrye-context-propagation-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-api</artifactId>
-        </dependency>
-        <!--Weld core dependency is a workaround for WELD-2566-->
-        <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-core-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.microprofile.config</groupId>
-            <artifactId>microprofile-config-api</artifactId>
-            <version>${version.microprofile.config}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.smallrye.config</groupId>
-            <artifactId>smallrye-config</artifactId>
-            <version>${version.smallrye.config}</version>
-        </dependency>
     </dependencies>
 </project>
diff --git a/cdi/src/test/java/io/smallrye/context/inject/AppTest.java b/cdi/src/test/java/io/smallrye/context/inject/AppTest.java
diff --git a/core/build-release-8 b/core/build-release-8
diff --git a/core/pom.xml b/core/pom.xml
@@ -6,42 +6,34 @@
         <artifactId>smallrye-context-propagation-parent</artifactId>
         <version>2.0.1-SNAPSHOT</version>
     </parent>
-    <artifactId>smallrye-context-propagation</artifactId>
-    <name>smallrye-context-propagation</name>
 
-    <properties>
-        <jdk.min.version>12</jdk.min.version>
-    </properties>
+    <artifactId>smallrye-context-propagation</artifactId>
+    <name>SmallRye Context Propagation: Core</name>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.context-propagation</groupId>
             <artifactId>microprofile-context-propagation-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile.config</groupId>
+            <artifactId>microprofile-config-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>smallrye-context-propagation-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>smallrye-context-propagation-storage</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.microprofile.config</groupId>
-            <artifactId>microprofile-config-api</artifactId>
-            <version>${version.microprofile.config}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.threads</groupId>
             <artifactId>jboss-threads</artifactId>
-            <version>${version.jboss.threads}</version>
         </dependency>
     </dependencies>
 

diff --git a/core/src/main/java/io/smallrye/context/FastStorageThreadContextProvider.java b/core/src/main/java/io/smallrye/context/FastStorageThreadContextProvider.java
@@ -8,7 +8,7 @@
 /**
  * Special implementation of a {@link FastThreadContextProvider} if your context is using {@link StorageManager} to obtain its
  * ThreadLocal, in which case we can obtain it from there to propagate it, if we know its {@link StorageDeclaration}.
- * 
+ *
  * @param <Declaration> The StorageDeclaration for that ThreadLocal
  */
 public interface FastStorageThreadContextProvider<Declaration extends StorageDeclaration<?>> extends FastThreadContextProvider {

diff --git a/core/src/main/java/io/smallrye/context/FastThreadContextProvider.java b/core/src/main/java/io/smallrye/context/FastThreadContextProvider.java
@@ -15,7 +15,7 @@ public interface FastThreadContextProvider extends ThreadContextProvider {
     /**
      * Designates the ThreadLocal that we should capture/restore. Must always be
      * the same returned ThreadLocal.
-     * 
+     *
      * @param props properties
      * @return the ThreadLocal to capture/restore
      */
@@ -24,7 +24,7 @@ public interface FastThreadContextProvider extends ThreadContextProvider {
     /**
      * The cleared value. Defaults to null. Override this if your cleared value
      * is not null.
-     * 
+     *
      * @param props properties
      * @return the cleared value for the ThreadLocal
      */

diff --git a/core/src/main/java/io/smallrye/context/SmallRyeContextManager.java b/core/src/main/java/io/smallrye/context/SmallRyeContextManager.java
@@ -214,7 +214,7 @@ public DefaultValues getDefaultValues() {
     /**
      * Returns a {@link SmallRyeThreadContext} instance which propagates default contexts, possibly
      * configured via MP Config.
-     * 
+     *
      * @return a {@link SmallRyeThreadContext} instance which propagates default contexts, possibly
      *         configured via MP Config
      */
@@ -229,7 +229,7 @@ public SmallRyeThreadContext defaultThreadContext() {
 
     /**
      * Returns a {@link SmallRyeThreadContext} instance which propagates all thread contexts.
-     * 
+     *
      * @return a {@link SmallRyeThreadContext} instance which propagates all thread contexts.
      */
     public SmallRyeThreadContext allPropagatedThreadContext() {
@@ -246,7 +246,7 @@ public SmallRyeThreadContext allPropagatedThreadContext() {
 
     /**
      * Returns a {@link SmallRyeThreadContext} instance which clears all thread contexts.
-     * 
+     *
      * @return a {@link SmallRyeThreadContext} instance which clears all thread contexts.
      */
     public SmallRyeThreadContext allClearedThreadContext() {
@@ -345,7 +345,7 @@ public SmallRyeContextManager build() {
          * Registers the built instance to the current {@link SmallRyeContextManagerProvider} before any extensions
          * are loaded. This is useful because the extensions might require the built {@link SmallRyeContextManager}
          * to be registered on the current class loader in order to use it, so this prevents building two.
-         * 
+         *
          * @return this builder
          */
         public Builder registerOnProvider() {
@@ -359,7 +359,7 @@ public Builder registerOnProvider() {
          * {@link SmallRyeManagedExecutor.Builder#withExecutorService(ExecutorService)} and
          * {@link SmallRyeManagedExecutor.Builder#withNewExecutorService()}. Also serves as the default executor to use
          * by all {@link CompletionStage} and {@link CompletableFuture} wrapped by {@link ThreadContext}.
-         * 
+         *
          * @param executorService the executor service to delegate to. If <code>null</code>, all created {@link ManagedExecutor}
          *        will create new backing executor services, and all <code>*Async</code> methods of the
          *        {@link CompletionStage} and {@link CompletableFuture} wrapped by {@link ThreadContext} will throw due to a
@@ -373,7 +373,7 @@ public Builder withDefaultExecutorService(ExecutorService executorService) {
 
         /**
          * Enable or disable FastThreadContextProviders optimisations. Defaults to enabled.
-         * 
+         *
          * @param enable set to false to disable FastThreadContextProviders.
          * @return this builder.
          */

diff --git a/core/src/main/java/io/smallrye/context/SmallRyeManagedExecutor.java b/core/src/main/java/io/smallrye/context/SmallRyeManagedExecutor.java
@@ -312,7 +312,7 @@ public <T> CompletionStage<T> copy(CompletionStage<T> stage) {
     /**
      * Returns a <code>ThreadContext</code> which has the same propagation settings as this <code>ManagedExecutor</code>,
      * which uses this <code>ManagedExecutor</code> as its default executor.
-     * 
+     *
      * @return a ThreadContext with the same propagation settings as this ManagedExecutor.
      */
     public SmallRyeThreadContext getThreadContext() {
@@ -399,7 +399,7 @@ public Builder injectionPointName(String name) {
          * {@link SmallRyeContextManager.Builder#withDefaultExecutorService(ExecutorService)}. Set to <code>null</code> to
          * disable delegation
          * and force creating a new executor service.
-         * 
+         *
          * @param executorService the executor service to delegate to, or <code>null</code> to force creating a new executor
          *        service.
          * @return this builder
@@ -415,7 +415,7 @@ public Builder withExecutorService(ExecutorService executorService) {
          * Forces the creation of a new executor service. This is has the same effect as calling
          * {@link #withExecutorService(ExecutorService)} with
          * <code>null</code>.
-         * 
+         *
          * @return this builder
          * @see #withExecutorService(ExecutorService)
          * @see SmallRyeContextManager.Builder#withDefaultExecutorService(ExecutorService)