Skip to content

Commit f0b092a

Browse files
csviricsviri
authored
Merge branch 'main' into dependabot/maven/com.diffplug.spotless-spotless-maven-plugin-2.46.0
2 parents 6207a72 + 1971fbb commit f0b092a

File tree

5 files changed

+104
-24
lines changed

5 files changed

+104
-24
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ jobs:
1111
strategy:
1212
matrix:
1313
java: [ 17, 21, 24 ]
14-
kubernetes: [ '1.30.12', '1.31.8', '1.32.4','1.33.0' ]
14+
# Use the latest versions supported by minikube, otherwise GitHub it will
15+
# end up in a throttling requests from minikube and workflow will fail.
16+
# Minikube does such requests only if a version is not officially supported.
17+
kubernetes: [ '1.30.12', '1.31.8', '1.32.4','1.33.1' ]
1518
uses: ./.github/workflows/integration-tests.yml
1619
with:
1720
java-version: ${{ matrix.java }}

‎.github/workflows/e2e-test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Integration and end to end tests which runs locally and deploys the Operator to a Kubernetes
22
# (Minikube) cluster and creates custom resources to verify the operator's functionality
3-
name: Integration & End to End tests
3+
name: End to End tests
44
on:
55
pull_request:
66
paths-ignore:
@@ -32,8 +32,11 @@ jobs:
3232
- name: Setup Minikube-Kubernetes
3333
uses: manusa/[email protected]
3434
with:
35-
minikube version: v1.34.0
36-
kubernetes version: v1.33.0
35+
minikube version: v1.36.0
36+
# Use the latest versions supported by minikube, otherwise GitHub it will
37+
# end up in a throttling requests from minikube and workflow will fail.
38+
# Minikube does such requests only if a version is not officially supported.
39+
kubernetes version: v1.33.1
3740
github token: ${{ secrets.GITHUB_TOKEN }}
3841
driver: docker
3942

‎.github/workflows/integration-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
- name: Set up Minikube
4242
uses: manusa/[email protected]
4343
with:
44-
minikube version: 'v1.34.0'
44+
minikube version: 'v1.36.0'
4545
kubernetes version: '${{ inputs.kube-version }}'
46-
driver: 'docker'
47-
github token: ${{ secrets.GITHUB_TOKEN }}
46+
github token: ${{ github.token }}
47+
4848
- name: "${{inputs.it-category}} integration tests (kube: ${{ inputs.kube-version }} / java: ${{ inputs.java-version }} / client: ${{ inputs.http-client }})"
4949
run: |
5050
if [ -z "${{inputs.it-category}}" ]; then

‎operator-framework-bom/pom.xml

Lines changed: 80 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,12 @@
3333
<url>https://github.com/operator-framework/java-operator-sdk/tree/master</url>
3434
</scm>
3535

36-
<distributionManagement>
37-
<snapshotRepository>
38-
<id>ossrh</id>
39-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
40-
</snapshotRepository>
41-
</distributionManagement>
42-
4336
<properties>
44-
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
4537
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
4638
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
4739
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
4840
<spotless.version>2.44.3</spotless.version>
41+
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
4942
</properties>
5043

5144
<dependencyManagement>
@@ -109,4 +102,83 @@
109102
</plugin>
110103
</plugins>
111104
</build>
105+
106+
<profiles>
107+
<profile>
108+
<id>release</id>
109+
<build>
110+
<plugins>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-surefire-plugin</artifactId>
114+
<configuration>
115+
<excludes>
116+
<exclude>**/*IT.java</exclude>
117+
<exclude>**/*E2E.java</exclude>
118+
<exclude>**/InformerRelatedBehaviorTest.java</exclude>
119+
</excludes>
120+
</configuration>
121+
</plugin>
122+
<plugin>
123+
<groupId>org.apache.maven.plugins</groupId>
124+
<artifactId>maven-javadoc-plugin</artifactId>
125+
<version>${maven-javadoc-plugin.version}</version>
126+
<executions>
127+
<execution>
128+
<id>attach-javadocs</id>
129+
<goals>
130+
<goal>jar</goal>
131+
</goals>
132+
</execution>
133+
</executions>
134+
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-source-plugin</artifactId>
138+
<version>${maven-source-plugin.version}</version>
139+
<executions>
140+
<execution>
141+
<id>attach-sources</id>
142+
<goals>
143+
<goal>jar</goal>
144+
</goals>
145+
<phase>verify</phase>
146+
</execution>
147+
</executions>
148+
</plugin>
149+
<plugin>
150+
<groupId>org.apache.maven.plugins</groupId>
151+
<artifactId>maven-gpg-plugin</artifactId>
152+
<executions>
153+
<execution>
154+
<id>sign-artifacts</id>
155+
<goals>
156+
<goal>sign</goal>
157+
</goals>
158+
<phase>verify</phase>
159+
<configuration>
160+
<gpgArguments>
161+
<arg>--pinentry-mode</arg>
162+
<arg>loopback</arg>
163+
</gpgArguments>
164+
</configuration>
165+
</execution>
166+
</executions>
167+
</plugin>
168+
<plugin>
169+
<groupId>org.sonatype.central</groupId>
170+
<artifactId>central-publishing-maven-plugin</artifactId>
171+
<version>${central-publishing-maven-plugin.version}</version>
172+
<extensions>true</extensions>
173+
<configuration>
174+
<publishingServerId>central</publishingServerId>
175+
<tokenAuth>true</tokenAuth>
176+
<autoPublish>true</autoPublish>
177+
<waitUntil>published</waitUntil>
178+
</configuration>
179+
</plugin>
180+
</plugins>
181+
</build>
182+
</profile>
183+
</profiles>
112184
</project>

‎pom.xml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
<fmt-maven-plugin.version>2.11</fmt-maven-plugin.version>
7373
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
7474
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
75+
<central-publishing-maven-plugin.version>0.8.0</central-publishing-maven-plugin.version>
7576
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
7677
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
7778
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -286,6 +287,15 @@
286287
<groupId>org.apache.maven.plugins</groupId>
287288
<artifactId>maven-source-plugin</artifactId>
288289
<version>${maven-source-plugin.version}</version>
290+
<executions>
291+
<execution>
292+
<id>attach-sources</id>
293+
<goals>
294+
<goal>jar</goal>
295+
</goals>
296+
<phase>verify</phase>
297+
</execution>
298+
</executions>
289299
</plugin>
290300
<plugin>
291301
<groupId>org.apache.maven.plugins</groupId>
@@ -508,14 +518,6 @@
508518
<plugin>
509519
<groupId>org.apache.maven.plugins</groupId>
510520
<artifactId>maven-source-plugin</artifactId>
511-
<executions>
512-
<execution>
513-
<id>attach-sources</id>
514-
<goals>
515-
<goal>jar-no-fork</goal>
516-
</goals>
517-
</execution>
518-
</executions>
519521
</plugin>
520522
<plugin>
521523
<groupId>org.apache.maven.plugins</groupId>
@@ -539,7 +541,7 @@
539541
<plugin>
540542
<groupId>org.sonatype.central</groupId>
541543
<artifactId>central-publishing-maven-plugin</artifactId>
542-
<version>0.8.0</version>
544+
<version>${central-publishing-maven-plugin.version}</version>
543545
<extensions>true</extensions>
544546
<configuration>
545547
<publishingServerId>central</publishingServerId>

0 commit comments

Comments
 (0)