Prepating for 2.2.0-SNAPSHOT release with `maven-parent-1.2.0`, `keycloak-parent-22.0.4` and switch to JDK17
This commit is contained in:
parent
cfa92d73e5
commit
f67d6987c8
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "keycloak-d4science-spi-parent"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
- Added new [protocol-mapper](protocol-mapper/README.md) module to make the custom protocol mappers available
|
||||
- Revised terms, EU links, D4Science and Blue-Cloud logo updated (#25444)
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "avatar-importer"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>avatar-importer</artifactId>
|
||||
|
@ -37,7 +37,6 @@
|
|||
<dependency>
|
||||
<groupId>commons-codec</groupId>
|
||||
<artifactId>commons-codec</artifactId>
|
||||
<version>${commons-codec.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "avatar-realm-resource"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,16 +7,19 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>avatar-realm-resource</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}.git</developerConnection>
|
||||
<url>https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}</url>
|
||||
<connection>
|
||||
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}.git</connection>
|
||||
<developerConnection>
|
||||
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}.git</developerConnection>
|
||||
<url>
|
||||
https://code-repo.d4science.org/gCubeSystem/${project.parent.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
<dependencies>
|
||||
|
@ -26,6 +29,21 @@
|
|||
<version>${project.version}</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.minio</groupId>
|
||||
<artifactId>minio</artifactId>
|
||||
<version>${minio.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
<artifactId>okhttp</artifactId>
|
||||
<version>${okhttp3.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build />
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "avatar-storage"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>avatar-storage</artifactId>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "delete-account"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>delete-account</artifactId>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "event-listener-provider"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>event-listener-provider</artifactId>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "identity-provider-mapper"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>identity-provider-mapper</artifactId>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "keycloak-d4science-themes"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>keycloak-d4science-script</artifactId>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "keycloak-d4science-themes"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
- Revised terms, EU links, D4Science and Blue-Cloud logo updated (#25444)
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>keycloak-d4science-theme</artifactId>
|
||||
|
|
|
@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "keycloak-extension-spi"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
Changes in other sub-components
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ldap-storage-mapper</artifactId>
|
||||
|
|
85
pom.xml
85
pom.xml
|
@ -1,25 +1,29 @@
|
|||
<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>
|
||||
<artifactId>maven-parent</artifactId>
|
||||
<groupId>org.gcube.tools</groupId>
|
||||
<version>1.1.0</version>
|
||||
</parent>
|
||||
<!-- <parent>-->
|
||||
<!-- <artifactId>maven-parent</artifactId>-->
|
||||
<!-- <groupId>org.gcube.tools</groupId>-->
|
||||
<!-- <version>1.2.0</version>-->
|
||||
<!-- </parent>-->
|
||||
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<java.version>11</java.version>
|
||||
<java.version>17</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
<maven.compiler.target>${java.version}</maven.compiler.target>
|
||||
<json-simple.version>1.1.1</json-simple.version>
|
||||
<dns-java.version>3.2.2</dns-java.version>
|
||||
<commons-codec.version>1.15</commons-codec.version>
|
||||
<minio.version>8.5.6</minio.version>
|
||||
<okhttp3.version>4.11.0</okhttp3.version>
|
||||
<okio.version>3.2.0</okio.version>
|
||||
</properties>
|
||||
|
||||
<modules>
|
||||
|
@ -33,7 +37,7 @@
|
|||
<module>keycloak-d4science-theme</module>
|
||||
<module>ldap-storage-mapper</module>
|
||||
<module>protocol-mapper</module>
|
||||
<!-- <module>keycloak-d4science-bundle</module>-->
|
||||
<!-- <module>keycloak-d4science-bundle</module>-->
|
||||
</modules>
|
||||
|
||||
<dependencyManagement>
|
||||
|
@ -41,8 +45,7 @@
|
|||
<dependency>
|
||||
<groupId>org.keycloak</groupId>
|
||||
<artifactId>keycloak-parent</artifactId>
|
||||
<version>19.0.2</version>
|
||||
<!-- <version>22.0.0</version>-->
|
||||
<version>22.0.4</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
@ -50,8 +53,10 @@
|
|||
</dependencyManagement>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
<connection>
|
||||
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>
|
||||
scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
|
||||
</scm>
|
||||
|
||||
|
@ -92,11 +97,29 @@
|
|||
<version>${json-simple.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.minio</groupId>
|
||||
<artifactId>minio</artifactId>
|
||||
<version>${minio.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup.okhttp3</groupId>
|
||||
<artifactId>okhttp</artifactId>
|
||||
<version>${okhttp3.version}</version>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.squareup.okio</groupId>
|
||||
<artifactId>okio</artifactId>
|
||||
<version>${okio.version}</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<scope>test</scope>
|
||||
<!-- <version>2.0.6</version>-->
|
||||
<version>2.0.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
|
@ -111,23 +134,23 @@
|
|||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>${maven.compiler.source}</source>
|
||||
<target>${maven.compiler.target}</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.wildfly.plugins</groupId>
|
||||
<artifactId>wildfly-maven-plugin</artifactId>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <source>${maven.compiler.source}</source>-->
|
||||
<!-- <target>${maven.compiler.target}</target>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.wildfly.plugins</groupId>-->
|
||||
<!-- <artifactId>wildfly-maven-plugin</artifactId>-->
|
||||
<!-- <version>${wildfly.plugin.version}</version> -->
|
||||
<version>2.0.0.Final</version>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- <version>2.0.0.Final</version>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <skip>true</skip>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
|
@ -2,5 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for "identity-provider-mapper"
|
||||
|
||||
## [v2.2.0-SNAPSHOT]
|
||||
|
||||
## [v2.1.0]
|
||||
- Provided the `D4ScienceContextMapper` that maps the D4S context requested in a customizable HTTP header as token's claim having the configured name (defaulting to the 'aud' claim). Can also shrink the `resource access` token claim to have only the requested context entry.
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<parent>
|
||||
<groupId>org.gcube.iam</groupId>
|
||||
<artifactId>keycloak-d4science-spi-parent</artifactId>
|
||||
<version>2.1.0</version>
|
||||
<version>2.2.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>protocol-mapper</artifactId>
|
||||
|
@ -25,7 +25,6 @@
|
|||
<properties>
|
||||
<junit-jupiter.version>5.8.2</junit-jupiter.version>
|
||||
<assertj-core.version>3.22.0</assertj-core.version>
|
||||
<org-mockito.version>4.5.1</org-mockito.version>
|
||||
<javax.ws.rs.version>2.1.1</javax.ws.rs.version>
|
||||
</properties>
|
||||
|
||||
|
@ -44,7 +43,6 @@
|
|||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
<version>${org-mockito.version}</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
|
|
Loading…
Reference in New Issue