Switching to cui-parent 0.2.9

cuioss · Jul 31, 2023 · f0d1ae8 · f0d1ae8
1 parent fd2233c
commit f0d1ae8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 33 deletions.
diff --git a/modules/authentication/portal-authentication-oauth/pom.xml b/modules/authentication/portal-authentication-oauth/pom.xml
@@ -38,38 +38,16 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client-microprofile</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.reactivestreams</groupId>
-                    <artifactId>reactive-streams</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.interceptor</groupId>
-                    <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.annotation</groupId>
-                    <artifactId>jboss-annotations-api_1.3_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxb-provider</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.xml.bind</groupId>
-                    <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/modules/pom.xml b/modules/pom.xml
@@ -1,4 +1,6 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>de.cuioss.portal</groupId>
@@ -9,11 +11,6 @@
     <packaging>pom</packaging>
     <name>portal-core modules</name>
     <description>Aggreagator for all portal-core-modules</description>
-    <properties>
-        <version.cui.parent>0.2.7</version.cui.parent>
-        <version.zipkin.brave>5.16.0</version.zipkin.brave>
-        <version.zipkin.reporter>2.16.4</version.zipkin.reporter>
-    </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -46,7 +43,8 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <!-- Reporting Spans to Zipkin https://github.com/openzipkin/zipkin-reporter-java -->
+                <!-- Reporting Spans to Zipkin
+                https://github.com/openzipkin/zipkin-reporter-java -->
                 <groupId>io.zipkin.reporter2</groupId>
                 <artifactId>zipkin-reporter</artifactId>
                 <version>${version.zipkin.reporter}</version>

diff --git a/.../java/de/cuioss/portal/core/test/mocks/authentication/PortalAuthenticationFacadeMock.java b/.../java/de/cuioss/portal/core/test/mocks/authentication/PortalAuthenticationFacadeMock.java
@@ -9,7 +9,6 @@
 
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
 import javax.servlet.http.HttpServletRequest;
 
 import de.cuioss.portal.authentication.AuthenticatedUserInfo;
@@ -29,7 +28,6 @@
  * @author Oliver Wolff
  */
 @ApplicationScoped
-@Named
 @PortalAuthenticationFacade
 @ToString
 public class PortalAuthenticationFacadeMock implements FormBasedAuthenticationFacade {

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>de.cuioss</groupId>
         <artifactId>cui-java-parent</artifactId>
-        <version>0.2.7</version>
+        <version>0.2.9</version>
         <relativePath />
     </parent>
     <groupId>de.cuioss.portal</groupId>
@@ -28,7 +28,11 @@
         <url>https://github.com/cuioss/cui-portal-core/issues</url>
         <system>GitHub Issues</system>
     </issueManagement>
-
+    <properties>
+        <version.cui.parent>0.2.9</version.cui.parent>
+        <version.zipkin.brave>5.16.0</version.zipkin.brave>
+        <version.zipkin.reporter>2.16.4</version.zipkin.reporter>
+    </properties>
     <modules>
         <module>bom</module>
         <module>modules</module>