You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by bd...@apache.org on 2022/11/28 20:41:03 UTC
[directory-scimple] 01/01: Update to Jakarta EE 10 and Weld 5.1
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch jakarta-ee-10
in repository https://gitbox.apache.org/repos/asf/directory-scimple.git
commit dc5203bfda16e52378fe5d9c4fabda608c1e32ad
Author: Brian Demers <bd...@apache.org>
AuthorDate: Mon Nov 28 15:40:43 2022 -0500
Update to Jakarta EE 10 and Weld 5.1
NOTE: v10 uses ws-api 3.1
---
pom.xml | 4 ++--
scim-server/src/main/resources/META-INF/beans.xml | 6 +++---
.../test/java/org/apache/directory/scim/server/it/testapp/App.java | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7b8d5209..e56bd238 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
- <version>4.0.2.Final</version>
+ <version>5.1.0.Final</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -164,7 +164,7 @@
<dependency>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-bom</artifactId>
- <version>9.1.0</version>
+ <version>10.0.0</version>
<scope>import</scope>
<type>pom</type>
</dependency>
diff --git a/scim-server/src/main/resources/META-INF/beans.xml b/scim-server/src/main/resources/META-INF/beans.xml
index f3962030..7de5edbf 100644
--- a/scim-server/src/main/resources/META-INF/beans.xml
+++ b/scim-server/src/main/resources/META-INF/beans.xml
@@ -14,8 +14,8 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
- version="1.1" bean-discovery-mode="annotated">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
+ version="4.0" bean-discovery-mode="annotated">
</beans>
diff --git a/scim-server/src/test/java/org/apache/directory/scim/server/it/testapp/App.java b/scim-server/src/test/java/org/apache/directory/scim/server/it/testapp/App.java
index 6094f498..8c2bdddb 100644
--- a/scim-server/src/test/java/org/apache/directory/scim/server/it/testapp/App.java
+++ b/scim-server/src/test/java/org/apache/directory/scim/server/it/testapp/App.java
@@ -19,6 +19,7 @@
package org.apache.directory.scim.server.it.testapp;
+import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Produces;
import jakarta.ws.rs.core.Application;
import org.apache.directory.scim.server.configuration.ServerConfiguration;
@@ -28,6 +29,7 @@ import java.util.Set;
import static org.apache.directory.scim.spec.schema.ServiceProviderConfiguration.AuthenticationSchema.httpBasic;
+@ApplicationScoped
public class App extends Application {
@Override