Merge pull request #60 from openstandia/feat-mp48

feat: support midpoint 4.8
openstandia · May 2, 2024 · e14fc82 · e14fc82
2 parents f862c6b + 6205ae0
commit e14fc82
Show file tree

Hide file tree

Showing 15 changed files with 763 additions and 692 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -11,11 +11,11 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
           cache: 'maven'
           server-id: ossrh
           server-username: OSSRH_JIRA_USERNAME

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,11 +12,11 @@ jobs:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 11
+          java-version: 17
           cache: 'maven'
           server-id: ossrh
           server-username: OSSRH_JIRA_USERNAME

diff --git a/pom.xml b/pom.xml
@@ -50,12 +50,18 @@
     </distributionManagement>
 
     <properties>
-        <version.midpoint>4.4</version.midpoint>
-        <version.spring-boot>2.5.2</version.spring-boot>
-        <version.grpc-java>1.42.0</version.grpc-java>
-        <version.protoc>3.10.0</version.protoc>
+        <version.midpoint>4.8</version.midpoint>
+        <version.grpc-java>1.55.1</version.grpc-java>
+        <version.protoc>3.22.3</version.protoc>
+        <!--
+            The version of Spring Boot that midpoint depends on must match the major version of Spring Boot that grpc-spring-boot-starter depends on.
 
-        <java.version>1.8</java.version>
+            https://github.com/Evolveum/midpoint/blob/support-4.8/pom.xml
+            https://central.sonatype.com/artifact/io.github.lognet/grpc-spring-boot-starter/4.5.10
+        -->
+        <version.grpc-spring-boot-starter>5.1.2</version.grpc-spring-boot-starter>
+
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <junit.jupiter.version>5.8.1</junit.jupiter.version>
 
@@ -92,7 +98,7 @@
             <dependency>
                 <groupId>io.github.lognet</groupId>
                 <artifactId>grpc-spring-boot-starter</artifactId>
-                <version>4.5.10</version>
+                <version>${version.grpc-spring-boot-starter}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework.boot</groupId>
@@ -112,34 +118,20 @@
                 <groupId>com.evolveum.midpoint.gui</groupId>
                 <artifactId>admin-gui</artifactId>
                 <version>${version.midpoint}</version>
-                <type>jar</type>
-                <classifier>classes</classifier>
             </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
                 <version>${version.protoc}</version>
             </dependency>
-
-            <!-- OAuth2.0 -->
+            <!--
+                For grpc-java
+                https://github.com/grpc/grpc-java/issues/5343
+            -->
             <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
-                <version>${version.spring-boot}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.springframework.boot</groupId>
-                        <artifactId>spring-boot-starter</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework.security</groupId>
-                        <artifactId>spring-security-config</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework.security</groupId>
-                        <artifactId>spring-security-core</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>javax.annotation</groupId>
+                <artifactId>javax.annotation-api</artifactId>
+                <version>1.3.2</version>
             </dependency>
 
             <!-- For client-spi -->
@@ -251,7 +243,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.5.1</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>

diff --git a/self-services/pom.xml b/self-services/pom.xml
@@ -23,8 +23,6 @@
         <dependency>
             <groupId>com.evolveum.midpoint.gui</groupId>
             <artifactId>admin-gui</artifactId>
-            <type>jar</type>
-            <classifier>classes</classifier>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -37,6 +35,11 @@
             <artifactId>protobuf-java</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -48,19 +51,6 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>net.tirasa.connid</groupId>
-            <artifactId>connector-framework</artifactId>
-            <version>1.5.0.18</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.tirasa.connid</groupId>
-            <artifactId>connector-framework-internal</artifactId>
-            <version>1.5.0.18</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>