Skip to content

Commit 48d7297

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4344 from yue9944882/sanitize-release-plugin
Sanitize release plugin to fix release GH workflow
2 parents 303d4ee + ee0fd9f commit 48d7297

File tree

7 files changed

+2
-82
lines changed

7 files changed

+2
-82
lines changed

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
run: |
6464
git checkout -b 'automated-release-${{ github.event.inputs.releaseVersion }}'
6565
./mvnw --batch-mode \
66-
release:prepare \
66+
org.apache.maven.plugins:maven-release-plugin:prepare \
6767
-Dtag=v${{ github.event.inputs.releaseVersion }} \
6868
-DconnectionUrl=https://${{ github.token }}@github.com/${{ github.repository }}.git \
6969
-DreleaseVersion=${{ github.event.inputs.releaseVersion }} \
@@ -78,7 +78,7 @@ jobs:
7878
GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }}
7979
run: |
8080
# The tests are already executed in the prepare, skipping
81-
./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests release:perform
81+
./mvnw -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -DlocalCheckout=true -Darguments=-DskipTests org.apache.maven.plugins:maven-release-plugin:perform
8282
git push https://${{ github.token }}@github.com/${{ github.repository }}.git \
8383
automated-release-${{ github.event.inputs.releaseVersion }}:automated-release-${{ github.event.inputs.releaseVersion }}
8484
git push https://${{ github.token }}@github.com/${{ github.repository }}.git v${{ github.event.inputs.releaseVersion }}

‎client-java-contrib/admissionreview/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@
3333

3434
<build>
3535
<plugins>
36-
<plugin>
37-
<groupId>org.sonatype.plugins</groupId>
38-
<artifactId>nexus-staging-maven-plugin</artifactId>
39-
<extensions>true</extensions>
40-
<configuration>
41-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
42-
</configuration>
43-
</plugin>
4436
<plugin>
4537
<groupId>com.diffplug.spotless</groupId>
4638
<artifactId>spotless-maven-plugin</artifactId>

‎client-java-contrib/cert-manager/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@
2121
</dependencies>
2222
<build>
2323
<plugins>
24-
<plugin>
25-
<groupId>org.sonatype.plugins</groupId>
26-
<artifactId>nexus-staging-maven-plugin</artifactId>
27-
<extensions>true</extensions>
28-
<configuration>
29-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
30-
</configuration>
31-
</plugin>
3224
<plugin>
3325
<groupId>com.diffplug.spotless</groupId>
3426
<artifactId>spotless-maven-plugin</artifactId>

‎client-java-contrib/prometheus-operator/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@
2020
</dependencies>
2121
<build>
2222
<plugins>
23-
<plugin>
24-
<groupId>org.sonatype.plugins</groupId>
25-
<artifactId>nexus-staging-maven-plugin</artifactId>
26-
<extensions>true</extensions>
27-
<configuration>
28-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
29-
</configuration>
30-
</plugin>
3123
<plugin>
3224
<groupId>com.diffplug.spotless</groupId>
3325
<artifactId>spotless-maven-plugin</artifactId>

‎examples/examples-release-latest/pom.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,4 @@
6969

7070
</dependencies>
7171

72-
<build>
73-
<plugins>
74-
<plugin>
75-
<groupId>org.sonatype.plugins</groupId>
76-
<artifactId>nexus-staging-maven-plugin</artifactId>
77-
<extensions>true</extensions>
78-
<configuration>
79-
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
80-
</configuration>
81-
</plugin>
82-
<plugin>
83-
<groupId>org.apache.maven.plugins</groupId>
84-
<artifactId>maven-deploy-plugin</artifactId>
85-
<configuration>
86-
<skip>true</skip>
87-
</configuration>
88-
</plugin>
89-
</plugins>
90-
</build>
91-
9272
</project>

‎examples/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@
2525
<artifactId>maven-bundle-plugin</artifactId>
2626
<extensions>true</extensions>
2727
</plugin>
28-
<plugin>
29-
<groupId>org.apache.maven.plugins</groupId>
30-
<artifactId>maven-deploy-plugin</artifactId>
31-
<configuration>
32-
<skip>true</skip>
33-
</configuration>
34-
</plugin>
3528
</plugins>
3629
</build>
3730

‎pom.xml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -379,11 +379,6 @@
379379
<artifactId>maven-compiler-plugin</artifactId>
380380
<version>3.14.1</version>
381381
</plugin>
382-
<plugin>
383-
<groupId>org.sonatype.plugins</groupId>
384-
<artifactId>nexus-staging-maven-plugin</artifactId>
385-
<version>1.7.0</version>
386-
</plugin>
387382
<plugin>
388383
<groupId>org.codehaus.mojo</groupId>
389384
<artifactId>build-helper-maven-plugin</artifactId>
@@ -402,11 +397,6 @@
402397
<trimStackTrace>false</trimStackTrace> <!-- SUREFIRE-1226 workaround -->
403398
</configuration>
404399
</plugin>
405-
<plugin>
406-
<groupId>org.apache.maven.plugins</groupId>
407-
<artifactId>maven-deploy-plugin</artifactId>
408-
<version>3.1.4</version>
409-
</plugin>
410400
<plugin>
411401
<groupId>org.codehaus.gmavenplus</groupId>
412402
<artifactId>gmavenplus-plugin</artifactId>
@@ -454,25 +444,6 @@
454444
<skip>true</skip>
455445
</configuration>
456446
</plugin>
457-
<plugin>
458-
<groupId>org.sonatype.central</groupId>
459-
<artifactId>central-publishing-maven-plugin</artifactId>
460-
<version>0.9.0</version>
461-
<extensions>true</extensions>
462-
<configuration>
463-
<publishingServerId>ossrh</publishingServerId>
464-
</configuration>
465-
</plugin>
466-
<plugin>
467-
<groupId>org.sonatype.plugins</groupId>
468-
<artifactId>nexus-staging-maven-plugin</artifactId>
469-
<extensions>true</extensions>
470-
<configuration>
471-
<serverId>ossrh</serverId>
472-
<nexusUrl>https://ossrh-staging-api.central.sonatype.com/</nexusUrl>
473-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
474-
</configuration>
475-
</plugin>
476447
<plugin>
477448
<groupId>com.diffplug.spotless</groupId>
478449
<artifactId>spotless-maven-plugin</artifactId>

0 commit comments

Comments
 (0)