Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # pom.xml
soot-oss · Feb 8, 2024 · 3758100 · 3758100
2 parents 2385b53 + 6e1e880
commit 3758100
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,8 +27,8 @@ jobs:
  # -U force updates just to make sure we are using latest dependencies
  # -B Batch mode (do not ask for user input), just in case
  # -P activate profile
- mvn -U -B clean deploy -P release
+ mvn -U -B clean deploy -Prelease -DskipTests
  env:
  SIGN_KEY_PASS: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
  OSSRH_USERNAME: ${{ secrets.SONATYPE_USER }}
- OSSRH_PASSWORD: ${{ secrets.SONATYPE_PW }}
+ OSSRH_PASSWORD: ${{ secrets.SONATYPE_PW }}
diff --git a/pom.xml b/pom.xml
@@ -94,7 +94,7 @@
  <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
  <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
  <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
- <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+ <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
  <licence-check.failOnMissingHeader>true</licence-check.failOnMissingHeader>
  <reactorRootsTarget>${basedir}/target</reactorRootsTarget>
  </properties>
@@ -201,14 +201,14 @@
  <autoReleaseAfterClose>true</autoReleaseAfterClose>
  </configuration>
  </plugin>
-  <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>${maven-release-plugin.version}</version>
- <configuration>
- <tagNameFormat>@{project.version}</tagNameFormat>
- </configuration>
-  </plugin>
+  <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>${maven-release-plugin.version}</version>
+ <configuration>
+ <tagNameFormat>@{project.version}</tagNameFormat>
+ </configuration>
+  </plugin>
  </plugins>
  </build>
  </profile>