Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: support midpoint 4.8 #60

Merged
merged 5 commits into from
May 2, 2024
Merged

feat: support midpoint 4.8 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
94c0c8c
feat: support midpoint 4.8
wadahiro Jan 11, 2024
ab92020
fix: NPE in forceUpdateCredential when the user doesn't have credenti…
wadahiro Jan 15, 2024
104f40b
fix: if the gRPC service account switches to the end user by OID, the…
wadahiro Jan 18, 2024
206133f
fix: can't call API by name
wadahiro Jan 18, 2024
6205ae0
fix: missing error handling for StatusRuntimeException
wadahiro Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
48 changes: 20 additions & 28 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand All @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down
20 changes: 5 additions & 15 deletions self-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
Loading
Loading