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

fix build: Fix broken build and update version to 4.9.1-SNAPSHOT #28

Open
wants to merge 3 commits into
base: support-4.9
Choose a base branch
from
Open

fix build: Fix broken build and update version to 4.9.1-SNAPSHOT #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c718969
fix build: Fix broken build and update version
Oct 28, 2024
8e381b3
fix build: Fix broken build and update version
Nov 4, 2024
a778f30
Merge branch 'support-4.9' into support-4.9
kpopovic Nov 4, 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
20 changes: 18 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 |
4 changes: 2 additions & 2 deletions jenkins-pipeline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions midpoint-client-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<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">
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>
Expand All @@ -34,4 +34,4 @@
<version>${midpoint.version}</version>
</dependency>
</dependencies>
</project>
</project>
8 changes: 0 additions & 8 deletions midpoint-client-impl-rest-jaxb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,6 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<!--dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
</dependency -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
Expand Down
109 changes: 57 additions & 52 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<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">
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>

<groupId>com.evolveum.midpoint.client</groupId>
Expand All @@ -32,21 +32,24 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.locale>en_US</project.build.locale>
<project.source.version>17</project.source.version>
<project.build.locale>en_US</project.build.locale>

<midpoint.version>4.9.1-SNAPSHOT</midpoint.version>

<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-versions.version>2.17.1</maven-versions.version>
<testng.version>7.10.2</testng.version>
<cxf.version>4.0.5</cxf.version>
<!-- Normally both versions are the same but sometimes databind is patched and core stays. -->
<jackson.version>2.18.1</jackson.version>
<jackson-databind.version>2.18.1</jackson-databind.version>
<httpclient.version>5.4.1</httpclient.version>
<jaxb-api.version>3.0.0</jaxb-api.version>
<jaxb.version>3.0.2</jaxb.version>
<jaxb-api.version>4.0.2</jaxb-api.version>
<jaxb.version>4.0.5</jaxb.version>
<activation.version>2.1.3</activation.version>
<surefire.version>3.5.2</surefire.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<javax.annotation.version>1.3.2</javax.annotation.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
</properties>

Expand Down Expand Up @@ -148,9 +151,9 @@
<version>${activation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -161,50 +164,52 @@
</dependencyManagement>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>${project.source.version}</source>
<target>${project.source.version}</target>
<fork>false</fork>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-unit.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>unit</value>
</property>
</properties>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>${maven-versions.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>${project.source.version}</source>
<target>${project.source.version}</target>
<fork>false</fork>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>testng-unit.xml</suiteXmlFile>
</suiteXmlFiles>
<properties>
<property>
<name>suitename</name>
<value>unit</value>
</property>
</properties>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-testng</artifactId>
<version>${surefire.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<dependencies>
<dependency> <!-- Not used, but required for surefire plugin not to complain -->
Expand Down