Skip to content

Commit c51550c

Browse files
authored
Merge branch 'develop' into documentation
2 parents 867c41e + 9df1a80 commit c51550c

File tree

3 files changed

+4
-13
lines changed

3 files changed

+4
-13
lines changed

.github/workflows/deploy-snapshots.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
uses: actions/checkout@v4
1616

1717
- name: Deploy SNAPSHOT version
18-
uses: secure-software-engineering/actions/deployment/maven-deployment@maven-central-deploy
18+
uses: secure-software-engineering/actions/deployment/maven-deployment@develop
1919
with:
2020
java-distribution: adopt
2121
java-version: 11

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v4
1717

1818
- name: Deploy version
19-
uses: secure-software-engineering/actions/deployment/maven-deployment@maven-central-deploy
19+
uses: secure-software-engineering/actions/deployment/maven-deployment@develop
2020
with:
2121
java-distribution: adopt
2222
java-version: 11

pom.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,20 +363,11 @@
363363
<version>0.9.0</version>
364364
<extensions>true</extensions>
365365
<configuration>
366-
<deploymentName>${project.artifactId} ${project.version}</deploymentName>
367366
<!-- Same id as in the deployment workflow -->
368367
<publishingServerId>central</publishingServerId>
369-
<waitUntil>published</waitUntil>
370368
<autoPublish>true</autoPublish>
371-
</configuration>
372-
</plugin>
373-
<!-- Disable the default deploy plugin to avoid clashes with the central-publishing plugin -->
374-
<plugin>
375-
<groupId>org.apache.maven.plugins</groupId>
376-
<artifactId>maven-deploy-plugin</artifactId>
377-
<version>3.1.4</version>
378-
<configuration>
379-
<skip>true</skip>
369+
<waitUntil>validated</waitUntil>
370+
<deploymentName>${project.name} ${project.version}</deploymentName>
380371
</configuration>
381372
</plugin>
382373
</plugins>

0 commit comments

Comments
 (0)