Skip to content

Commit 4d1a649

Browse files
jkremserjkremser
authored
Merge branch 'master' into dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.1.2
2 parents fc8e823 + 7b502c4 commit 4d1a649

File tree

1 file changed

+76
-46
lines changed

1 file changed

+76
-46
lines changed

‎pom.xml‎

Lines changed: 76 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>io.radanalytics</groupId>
55
<artifactId>operator-parent-pom</artifactId>
6-
<version>0.3.18-SNAPSHOT</version>
6+
<version>0.3.23-SNAPDHOT</version>
77
<packaging>pom</packaging>
88
<name>Operator Parent POM</name>
99
<description>parent pom.xml file that is supposed to be reused as parent pom in custom operators</description>
@@ -50,14 +50,16 @@
5050
<maven.compiler.source>1.8</maven.compiler.source>
5151
<maven.compiler.target>1.8</maven.compiler.target>
5252

53+
<quarkus.version>0.23.2</quarkus.version>
54+
5355
<maven.assembly.version>3.1.0</maven.assembly.version>
5456
<maven.buildnumber.version>1.4</maven.buildnumber.version>
55-
<maven.compilerplugin.version>3.8.0</maven.compilerplugin.version>
57+
<maven.compilerplugin.version>3.8.1</maven.compilerplugin.version>
5658
<maven.failsafe.version>2.20.1</maven.failsafe.version>
5759
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
58-
<maven.javadoc.plugin.version>3.1.0</maven.javadoc.plugin.version>
60+
<maven.javadoc.plugin.version>3.1.1</maven.javadoc.plugin.version>
5961
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
60-
<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
62+
<maven.source.plugin.version>3.1.0</maven.source.plugin.version>
6163
<maven.jarplugin.version>3.1.2</maven.jarplugin.version>
6264
<maven.nexus.staging.version>1.6.8</maven.nexus.staging.version>
6365
<maven.shade.version>3.2.1</maven.shade.version>
@@ -70,15 +72,12 @@
7072

7173
<commons-collections.version>3.2.2</commons-collections.version>
7274
<commons-lang.version>2.6</commons-lang.version>
73-
<fabric8.kubernetes-model.version>4.2.2</fabric8.kubernetes-model.version>
74-
<fabric8.kubernetes-client.version>4.2.2</fabric8.kubernetes-client.version>
75-
<fabric8.openshift-client.version>4.2.2</fabric8.openshift-client.version>
75+
<fabric8.openshift-client.version>4.4.2</fabric8.openshift-client.version>
7676
<fabric8.zjsonpatch.version>0.3.0</fabric8.zjsonpatch.version>
7777
<prometheus.metrics.version>0.6.0</prometheus.metrics.version>
7878
<guava.version>23.0</guava.version>
79-
<snakeyaml.version>1.24</snakeyaml.version>
80-
<reflections.version>0.9.11</reflections.version>
81-
<slf4j.version>1.7.26</slf4j.version>
79+
<snakeyaml.version>1.23</snakeyaml.version>
80+
<slf4j.version>1.7.16</slf4j.version>
8281
<junit.version>4.12</junit.version>
8382
</properties>
8483
<dependencyManagement>
@@ -93,32 +92,10 @@
9392
<artifactId>commons-lang</artifactId>
9493
<version>${commons-lang.version}</version>
9594
</dependency>
96-
<dependency>
97-
<groupId>io.fabric8</groupId>
98-
<artifactId>kubernetes-client</artifactId>
99-
<version>${fabric8.kubernetes-client.version}</version>
100-
<exclusions>
101-
<exclusion>
102-
<groupId>commons-collections</groupId>
103-
<artifactId>commons-collections</artifactId>
104-
</exclusion>
105-
</exclusions>
106-
</dependency>
10795
<dependency>
10896
<groupId>io.fabric8</groupId>
10997
<artifactId>openshift-client</artifactId>
11098
<version>${fabric8.openshift-client.version}</version>
111-
<exclusions>
112-
<exclusion>
113-
<groupId>commons-collections</groupId>
114-
<artifactId>commons-collections</artifactId>
115-
</exclusion>
116-
</exclusions>
117-
</dependency>
118-
<dependency>
119-
<groupId>io.fabric8</groupId>
120-
<artifactId>kubernetes-model</artifactId>
121-
<version>${fabric8.kubernetes-model.version}</version>
12299
</dependency>
123100
<dependency>
124101
<groupId>io.prometheus</groupId>
@@ -140,6 +117,28 @@
140117
<artifactId>simpleclient_log4j</artifactId>
141118
<version>${prometheus.metrics.version}</version>
142119
</dependency>
120+
<dependency>
121+
<groupId>io.quarkus</groupId>
122+
<artifactId>quarkus-arc</artifactId>
123+
<version>${quarkus.version}</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>io.quarkus</groupId>
127+
<artifactId>quarkus-kubernetes-client</artifactId>
128+
<version>${quarkus.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>io.quarkus</groupId>
132+
<artifactId>quarkus-bom</artifactId>
133+
<version>${quarkus.version}</version>
134+
<type>pom</type>
135+
<scope>import</scope>
136+
</dependency>
137+
<dependency>
138+
<groupId>io.quarkus</groupId>
139+
<artifactId>quarkus-core</artifactId>
140+
<version>${quarkus.version}</version>
141+
</dependency>
143142
<dependency>
144143
<groupId>org.slf4j</groupId>
145144
<artifactId>slf4j-api</artifactId>
@@ -160,17 +159,6 @@
160159
<artifactId>jcabi-manifests</artifactId>
161160
<version>${jcabi.version}</version>
162161
</dependency>
163-
<dependency>
164-
<groupId>org.reflections</groupId>
165-
<artifactId>reflections</artifactId>
166-
<version>${reflections.version}</version>
167-
<exclusions>
168-
<exclusion>
169-
<groupId>com.google.guava</groupId>
170-
<artifactId>guava</artifactId>
171-
</exclusion>
172-
</exclusions>
173-
</dependency>
174162
<dependency>
175163
<groupId>com.google.guava</groupId>
176164
<artifactId>guava</artifactId>
@@ -222,6 +210,21 @@
222210
</archive>
223211
</configuration>
224212
</plugin>
213+
<plugin>
214+
<groupId>io.quarkus</groupId>
215+
<artifactId>quarkus-maven-plugin</artifactId>
216+
<version>${quarkus.version}</version>
217+
<executions>
218+
<execution>
219+
<goals>
220+
<goal>build</goal>
221+
</goals>
222+
</execution>
223+
</executions>
224+
<configuration>
225+
<uberJar>true</uberJar>
226+
</configuration>
227+
</plugin>
225228
<plugin>
226229
<groupId>org.apache.maven.plugins</groupId>
227230
<artifactId>maven-shade-plugin</artifactId>
@@ -236,9 +239,6 @@
236239
<createDependencyReducedPom>false</createDependencyReducedPom>
237240
<transformers>
238241
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
239-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
240-
<mainClass>io.radanalytics.operator.Entrypoint</mainClass>
241-
</transformer>
242242
</transformers>
243243
<filters>
244244
<filter>
@@ -310,7 +310,15 @@
310310
<configuration>
311311
<sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
312312
<targetPackage>io.radanalytics.types</targetPackage>
313+
<customAnnotator>io.radanalytics.operator.annotator.RegisterForReflectionAnnotator</customAnnotator>
313314
</configuration>
315+
<dependencies>
316+
<dependency>
317+
<groupId>io.radanalytics</groupId>
318+
<artifactId>abstract-operator-annotator</artifactId>
319+
<version>0.6.7</version>
320+
</dependency>
321+
</dependencies>
314322
<executions>
315323
<execution>
316324
<goals>
@@ -412,5 +420,27 @@
412420
</repository>
413421
</distributionManagement>
414422
</profile>
423+
<profile>
424+
<id>native</id>
425+
<build>
426+
<plugins>
427+
<plugin>
428+
<groupId>io.quarkus</groupId>
429+
<artifactId>quarkus-maven-plugin</artifactId>
430+
<version>${quarkus.version}</version>
431+
<executions>
432+
<execution>
433+
<goals>
434+
<goal>native-image</goal>
435+
</goals>
436+
<configuration>
437+
<enableHttpUrlHandler>true</enableHttpUrlHandler>
438+
</configuration>
439+
</execution>
440+
</executions>
441+
</plugin>
442+
</plugins>
443+
</build>
444+
</profile>
415445
</profiles>
416446
</project>

0 commit comments

Comments
 (0)