From c718969c8cb387ae099cbd035b867d830d4fdea9 Mon Sep 17 00:00:00 2001 From: a927399 Date: Mon, 28 Oct 2024 08:58:36 +0100 Subject: [PATCH 1/2] fix build: Fix broken build and update version -Could not resolve dependencies for project com.evolveum.midpoint.client:midpoint-client-api:jar:4.9-SNAPSHOT: Could not find artifact com.evolveum.midpoint.infra:schema-pure-jaxb:jar:4.9-SNAPSHOT in evolveum (https://nexus.evolveum.com/nexus/content/groups/public/) - Upgrade pom.xml to 4.9 version (midpoint 4.9 dependency) - Upgrade to Java 17 dependency - Improve README.md --- README.md | 20 +++- jenkins-pipeline | 4 +- midpoint-client-api/pom.xml | 2 +- midpoint-client-impl-prism/pom.xml | 2 +- midpoint-client-impl-rest-jaxb/pom.xml | 14 +-- pom.xml | 128 +++++++++++++------------ 6 files changed, 92 insertions(+), 78 deletions(-) diff --git a/README.md b/README.md index d5c0e99..e1a3af3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,21 @@ # midpoint-client-java -Java client library for midPoint services -[Documentation](https://wiki.evolveum.com/display/midPoint/MidPoint+Client+Library) +Java client library for midPoint services. [Documentation](https://wiki.evolveum.com/display/midPoint/MidPoint+Client+Library) +[![License](https://img.shields.io/github/license/cbeust/testng.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) +![Java](https://img.shields.io/badge/Java-ED8B00?style=flat&logo=openjdk&logoColor=white) +#### Property versions: mvn versions:display-property-updates +| property | version | +|----------------------------------|----------| +| ${activation.version} | 2.1.3 | +| ${commons-lang3.version} | 3.17.0 | +| ${cxf.version} | 4.0.5 | +| ${jackson-databind.version} | 2.18.0 | +| ${jackson.version} | 2.18.0 | +| ${javax.annotation.version} | 1.3.2 | +| ${jaxb-api.version} | 4.0.2 | +| ${jaxb.version} | 4.0.5 | +| ${maven-versions.version} | 2.17.1 | +| ${surefire.version} | 3.5.1 | +| ${surefire.version} | 7.10.2 | +| ${maven-compiler-plugin.version} | 3.13.0 | \ No newline at end of file diff --git a/jenkins-pipeline b/jenkins-pipeline index 7483764..d77906b 100644 --- a/jenkins-pipeline +++ b/jenkins-pipeline @@ -6,14 +6,14 @@ podTemplate( workspaceVolume: dynamicPVC(requestsSize: "5Gi"), containers: [ containerTemplate(name: 'jnlp', - image: 'jenkins/inbound-agent:4.13-2-alpine', + image: 'jenkins/inbound-agent:latest-jdk17', runAsUser: '0', resourceRequestCpu: '1', resourceLimitCpu: '1', resourceRequestMemory: '1Gi', resourceLimitMemory: '1Gi'), containerTemplate(name: 'maven', - image: "${params.BUILDER_IMAGE ?: 'maven:3.8.5-openjdk-11-slim'}", + image: "${params.BUILDER_IMAGE ?: 'maven:3.9.9-eclipse-temurin-17'}", runAsUser: '0', ttyEnabled: true, command: 'cat', diff --git a/midpoint-client-api/pom.xml b/midpoint-client-api/pom.xml index 9de72c1..2c45862 100644 --- a/midpoint-client-api/pom.xml +++ b/midpoint-client-api/pom.xml @@ -22,7 +22,7 @@ com.evolveum.midpoint.client parent - 4.9-SNAPSHOT + 4.9 midpoint-client-api diff --git a/midpoint-client-impl-prism/pom.xml b/midpoint-client-impl-prism/pom.xml index 890d7bd..45d7f66 100644 --- a/midpoint-client-impl-prism/pom.xml +++ b/midpoint-client-impl-prism/pom.xml @@ -22,7 +22,7 @@ parent com.evolveum.midpoint.client - 4.9-SNAPSHOT + 4.9 midpoint-client-impl-prism diff --git a/midpoint-client-impl-rest-jaxb/pom.xml b/midpoint-client-impl-rest-jaxb/pom.xml index 885b77d..de2c312 100644 --- a/midpoint-client-impl-rest-jaxb/pom.xml +++ b/midpoint-client-impl-rest-jaxb/pom.xml @@ -22,7 +22,7 @@ com.evolveum.midpoint.client parent - 4.9-SNAPSHOT + 4.9 midpoint-client-impl-rest-jaxb @@ -42,14 +42,6 @@ jakarta.xml.bind jakarta.xml.bind-api - com.fasterxml.jackson.core jackson-core @@ -59,8 +51,8 @@ jackson-databind - com.sun.activation - javax.activation + jakarta.activation + jakarta.activation-api javax.annotation diff --git a/pom.xml b/pom.xml index c7b94e6..0635ea6 100644 --- a/pom.xml +++ b/pom.xml @@ -16,12 +16,12 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.evolveum.midpoint.client parent - 4.9-SNAPSHOT + 4.9 pom @@ -32,22 +32,26 @@ UTF-8 - 11 + en_US + 17 + 17 + en_US - 4.9-SNAPSHOT + 4.9 - 7.6.1 - 4.0.1 - - 2.13.4 - 2.13.4.2 - 5.1.3 - 3.0.0 - 3.0.2 - 1.2.0 - 3.0.0-M5 + 3.13.0 + 2.17.1 + 7.10.2 + 4.0.5 + 2.18.0 + 2.18.0 + 5.4 + 4.0.2 + 4.0.5 + 2.1.3 + 3.5.1 1.3.2 - 3.12.0 + 3.17.0 @@ -143,8 +147,8 @@ ${jaxb.version} - com.sun.activation - javax.activation + jakarta.activation + jakarta.activation-api ${activation.version} @@ -161,50 +165,52 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - ${project.source.version} - ${project.source.version} - false - - - - org.apache.maven.plugins - maven-resources-plugin - 3.1.0 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - testng-unit.xml - - - - suitename - unit - - - false - - - - org.apache.maven.surefire - surefire-testng - ${surefire.version} - - - - - + + + org.codehaus.mojo + versions-maven-plugin + ${maven-versions.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${project.source.version} + ${project.source.version} + false + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + testng-unit.xml + + + + suitename + unit + + + false + + + + org.apache.maven.surefire + surefire-testng + ${surefire.version} + + + + From 8e381b3f7c8acdab4a861fbcaf8d94b4a76629bc Mon Sep 17 00:00:00 2001 From: a927399 Date: Mon, 4 Nov 2024 17:07:09 +0100 Subject: [PATCH 2/2] fix build: Fix broken build and update version -Could not resolve dependencies for project com.evolveum.midpoint.client:midpoint-client-api:jar:4.9-SNAPSHOT: Could not find artifact com.evolveum.midpoint.infra:schema-pure-jaxb:jar:4.9-SNAPSHOT in evolveum (https://nexus.evolveum.com/nexus/content/groups/public/) - Upgrade pom.xml to 4.9.1-SNAPSHOT version (4.9.1-SNAPSHOT) - Upgrade to Java 17 dependency - Improve README.md --- midpoint-client-api/pom.xml | 6 +++--- midpoint-client-impl-prism/pom.xml | 2 +- midpoint-client-impl-rest-jaxb/pom.xml | 2 +- pom.xml | 13 ++++++------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/midpoint-client-api/pom.xml b/midpoint-client-api/pom.xml index 2c45862..95d98ea 100644 --- a/midpoint-client-api/pom.xml +++ b/midpoint-client-api/pom.xml @@ -16,13 +16,13 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.evolveum.midpoint.client parent - 4.9 + 4.9.1-SNAPSHOT midpoint-client-api @@ -34,4 +34,4 @@ ${midpoint.version} - + \ No newline at end of file diff --git a/midpoint-client-impl-prism/pom.xml b/midpoint-client-impl-prism/pom.xml index 45d7f66..d6e7591 100644 --- a/midpoint-client-impl-prism/pom.xml +++ b/midpoint-client-impl-prism/pom.xml @@ -22,7 +22,7 @@ parent com.evolveum.midpoint.client - 4.9 + 4.9.1-SNAPSHOT midpoint-client-impl-prism diff --git a/midpoint-client-impl-rest-jaxb/pom.xml b/midpoint-client-impl-rest-jaxb/pom.xml index de2c312..fe3444a 100644 --- a/midpoint-client-impl-rest-jaxb/pom.xml +++ b/midpoint-client-impl-rest-jaxb/pom.xml @@ -22,7 +22,7 @@ com.evolveum.midpoint.client parent - 4.9 + 4.9.1-SNAPSHOT midpoint-client-impl-rest-jaxb diff --git a/pom.xml b/pom.xml index 0635ea6..2bfa13a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.evolveum.midpoint.client parent - 4.9 + 4.9.1-SNAPSHOT pom @@ -33,23 +33,22 @@ UTF-8 en_US - 17 17 en_US - 4.9 + 4.9.1-SNAPSHOT 3.13.0 2.17.1 7.10.2 4.0.5 - 2.18.0 - 2.18.0 - 5.4 + 2.18.1 + 2.18.1 + 5.4.1 4.0.2 4.0.5 2.1.3 - 3.5.1 + 3.5.2 1.3.2 3.17.0