libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Seperate version properties for hibernate-enhance and quarkus-maven (#20264)

Browse source 
This will allow them to be defined seperately from aligned dependency
versions suitable for product

Closes #20261
This commit is contained in:
Alex Szczuczko 2023-05-18 08:37:55 -06:00 committed by GitHub
parent 33215ab6f4
commit 1578506475
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/map-jpa/pom.xml
View file

@ -51,7 +51,7 @@
<plugin> <plugin>
<groupId>org.hibernate.orm.tooling</groupId> <groupId>org.hibernate.orm.tooling</groupId>
<artifactId>hibernate-enhance-maven-plugin</artifactId> <artifactId>hibernate-enhance-maven-plugin</artifactId>
<version>${hibernate-orm.version}</version> <version>${hibernate-orm.plugin.version}</version>
<executions> <executions>
<execution> <execution>
<configuration> <configuration>

6
operator/pom.xml
View file

@ -36,7 +36,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.operator.sdk.version>6.0.1</quarkus.operator.sdk.version> <quarkus.operator.sdk.version>6.0.1</quarkus.operator.sdk.version>
<quarkus.version>3.0.0.Final</quarkus.version> <quarkus.operator.build.version>3.0.0.Final</quarkus.operator.build.version>
<quarkus.container-image.group>keycloak</quarkus.container-image.group> <quarkus.container-image.group>keycloak</quarkus.container-image.group>
</properties> </properties>
@ -160,7 +160,7 @@
<plugin> <plugin>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId> <artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version> <version>${quarkus.operator.build.version}</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
@ -172,7 +172,7 @@
<plugin> <plugin>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId> <artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version> <version>${quarkus.operator.build.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

2
pom.xml
View file

@ -44,6 +44,7 @@
<jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url> <jboss.snapshots.repo.url>https://s01.oss.sonatype.org/content/repositories/snapshots/</jboss.snapshots.repo.url>
<quarkus.version>3.0.2.Final</quarkus.version> <quarkus.version>3.0.2.Final</quarkus.version>
<quarkus.build.version>3.0.2.Final</quarkus.build.version>
<project.build-time>${timestamp}</project.build-time> <project.build-time>${timestamp}</project.build-time>
@ -81,6 +82,7 @@
<dom4j.version>2.1.3</dom4j.version> <dom4j.version>2.1.3</dom4j.version>
<h2.version>2.1.214</h2.version> <h2.version>2.1.214</h2.version>
<hibernate-orm.version>6.2.1.Final</hibernate-orm.version> <hibernate-orm.version>6.2.1.Final</hibernate-orm.version>
<hibernate-orm.plugin.version>6.2.1.Final</hibernate-orm.plugin.version>
<hibernate.c3p0.version>${hibernate-orm.version}</hibernate.c3p0.version> <hibernate.c3p0.version>${hibernate-orm.version}</hibernate.c3p0.version>
<infinispan.version>14.0.8.Final</infinispan.version> <infinispan.version>14.0.8.Final</infinispan.version>
<infinispan.protostream.processor.version>4.6.2.Final</infinispan.protostream.processor.version> <infinispan.protostream.processor.version>4.6.2.Final</infinispan.protostream.processor.version>

2
quarkus/deployment/pom.xml
View file

@ -118,7 +118,7 @@
<path> <path>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId> <artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version> <version>${quarkus.build.version}</version>
</path> </path>
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>

4
quarkus/runtime/pom.xml
View file

@ -691,7 +691,7 @@
<plugin> <plugin>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-maven-plugin</artifactId> <artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${quarkus.version}</version> <version>${quarkus.build.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -712,7 +712,7 @@
<path> <path>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId> <artifactId>quarkus-extension-processor</artifactId>
<version>${quarkus.version}</version> <version>${quarkus.build.version}</version>
</path> </path>
</annotationProcessorPaths> </annotationProcessorPaths>
</configuration> </configuration>

2
quarkus/server/pom.xml
View file

@ -42,7 +42,7 @@
<plugin> <plugin>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
<artifactId>quarkus-maven-plugin</artifactId> <artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version> <version>${quarkus.build.version}</version>
<configuration> <configuration>
<finalName>keycloak</finalName> <finalName>keycloak</finalName>
<systemProperties> <systemProperties>

2
quarkus/set-quarkus-version.sh
View file

@ -49,7 +49,7 @@ fi
QUARKUS_BOM=$(curl -s "$QUARKUS_BOM_URL") QUARKUS_BOM=$(curl -s "$QUARKUS_BOM_URL")
echo "Setting Quarkus version: $QUARKUS_VERSION" echo "Setting Quarkus version: $QUARKUS_VERSION"
$(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null) $(mvn versions:set-property -f ../pom.xml -Dproperty=quarkus.version,quarkus.build.version -DnewVersion="$QUARKUS_VERSION" 1> /dev/null)
DEPENDENCIES_LIST="resteasy jackson-bom hibernate-orm mysql-jdbc postgresql-jdbc microprofile-metrics-api wildfly-common wildfly-elytron" DEPENDENCIES_LIST="resteasy jackson-bom hibernate-orm mysql-jdbc postgresql-jdbc microprofile-metrics-api wildfly-common wildfly-elytron"