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

Remove crd-generator-apt from operator (#32555)

Browse source 
* Remove crd-generator-apt from operator to avoid generating CRDs multiple times

Signed-off-by: Bernhard Strähle <bernhard.straehle@gmail.com>

* Add io.sundr/builder-annotations to managed dependencies

Signed-off-by: Bernhard Strähle <bernhard.straehle@gmail.com>

---------

Signed-off-by: Bernhard Strähle <bernhard.straehle@gmail.com>
This commit is contained in:
Bernhard Strähle 2024-09-13 12:01:55 +02:00 committed by GitHub
parent f0bf290c28
commit bfe9d2343c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
operator/pom.xml
View file

@ -10,7 +10,7 @@
<version>999.0.0-SNAPSHOT</version> <version>999.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<name>Keycloak Operator</name> <name>Keycloak Operator</name>
<artifactId>keycloak-operator</artifactId> <artifactId>keycloak-operator</artifactId>
@ -36,10 +36,17 @@
<dependencies> <dependencies>
<!-- Sundrio -->
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
<scope>provided</scope>
</dependency>
<!-- Fabric8 --> <!-- Fabric8 -->
<dependency> <dependency>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>crd-generator-apt</artifactId> <artifactId>generator-annotations</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -288,8 +295,8 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>operator-prod</id> <id>operator-prod</id>

12
pom.xml
View file

@ -143,6 +143,7 @@
<apacheds.codec.version>2.0.0</apacheds.codec.version> <apacheds.codec.version>2.0.0</apacheds.codec.version>
<google.zxing.version>3.4.0</google.zxing.version> <google.zxing.version>3.4.0</google.zxing.version>
<freemarker.version>2.3.32</freemarker.version> <freemarker.version>2.3.32</freemarker.version>
<sundrio.version>0.200.0</sundrio.version>
<!-- json-ld processing for oid4vci ld-proofs --> <!-- json-ld processing for oid4vci ld-proofs -->
<com.apicatalog.titanium-json-ld.version>1.3.3</com.apicatalog.titanium-json-ld.version> <com.apicatalog.titanium-json-ld.version>1.3.3</com.apicatalog.titanium-json-ld.version>
@ -179,7 +180,7 @@
<xml-apis.version>1.4.01</xml-apis.version> <xml-apis.version>1.4.01</xml-apis.version>
<subethasmtp.version>3.1.7</subethasmtp.version> <subethasmtp.version>3.1.7</subethasmtp.version>
<assertj-core.version>3.22.0</assertj-core.version> <assertj-core.version>3.22.0</assertj-core.version>
<!-- Maven Plugins --> <!-- Maven Plugins -->
<maven.plugins.version>3.13.1</maven.plugins.version> <maven.plugins.version>3.13.1</maven.plugins.version>
<replacer.plugin.version>1.4.1</replacer.plugin.version> <replacer.plugin.version>1.4.1</replacer.plugin.version>
@ -321,6 +322,11 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency>
<groupId>io.sundr</groupId>
<artifactId>builder-annotations</artifactId>
<version>${sundrio.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
@ -389,7 +395,7 @@
<artifactId>bcpkix-fips</artifactId> <artifactId>bcpkix-fips</artifactId>
<version>${bouncycastle.pkixfips.version}</version> <version>${bouncycastle.pkixfips.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId> <artifactId>bc-fips</artifactId>
@ -401,7 +407,7 @@
<artifactId>bctls-fips</artifactId> <artifactId>bctls-fips</artifactId>
<version>${bouncycastle.bctls-fips.version}</version> <version>${bouncycastle.bctls-fips.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.ua-parser</groupId> <groupId>com.github.ua-parser</groupId>
<artifactId>uap-java</artifactId> <artifactId>uap-java</artifactId>