This is an automated email from the ASF dual-hosted git repository.
piergiorgio pushed a commit to branch CONNECTORS-1754
in repository https://gitbox.apache.org/repos/asf/manifoldcf.git
The following commit(s) were added to refs/heads/CONNECTORS-1754 by this push:
new 3dd109b1c Fix for the GitHub workflows (CONNECTORS-1754)
3dd109b1c is described below
commit 3dd109b1c0bf076cdc8ce2c851c3f75ee59c5453
Author: Piergiorgio Lucidi <[email protected]>
AuthorDate: Thu Jun 20 13:16:17 2024 +0200
Fix for the GitHub workflows (CONNECTORS-1754)
---
.github/workflows/publish-maven-release.yml | 15 ++++++++++-----
pom.xml | 10 ++++++++--
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/publish-maven-release.yml
b/.github/workflows/publish-maven-release.yml
index 87e2b517d..53659917e 100644
--- a/.github/workflows/publish-maven-release.yml
+++ b/.github/workflows/publish-maven-release.yml
@@ -82,6 +82,8 @@ jobs:
server-username: NEXUS_USER
server-password: NEXUS_PW
settings-path: ${{ github.workspace
}}/.github/asf-deploy-settings.xml
+ gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+ gpg-passphrase: GPG_PASSPHRASE # Environment variable name for the
GPG private key passphrase. Default is $GPG_PASSPHRASE
- name: Ant Build
env:
@@ -105,8 +107,8 @@ jobs:
MAVEN_SETTINGS: ${{ github.workspace
}}/.github/asf-deploy-settings.xml
MAVEN_USERNAME: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
- MAVEN_GPG_PASSPHRASE: ""
- #run: mvn deploy -B -e -q -DskipTests -DskipITs
-DrepositoryId=apache.releases.https -Papache-release
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+ GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
run: |
mvn -B -e -q org.sonatype.plugins:nexus-staging-maven-plugin:deploy \
-DskipTests \
@@ -114,7 +116,8 @@ jobs:
-Dcargo-build.profile=release \
-Dcargo-build.features=services-all \
-DserverId=apache.releases.https \
- -DnexusUrl=https://repository.apache.org
+ -DnexusUrl=https://repository.apache.org \
+ -Papache-release
- name: Deploy local staged artifacts
if: ${{ github.event_name != 'pull_request' }}
@@ -122,12 +125,14 @@ jobs:
./mvn org.sonatype.plugins:nexus-staging-maven-plugin:deploy-staged \
-DskipStagingRepositoryClose=true \
-DserverId=apache.releases.https \
- -DnexusUrl=https://repository.apache.org
+ -DnexusUrl=https://repository.apache.org \
+ -Papache-release
env:
NEXUS_USER: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
NEXUS_PW: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
MAVEN_SETTINGS: ${{ github.workspace
}}/.github/asf-deploy-settings.xml
MAVEN_USERNAME: ${{ secrets.NEXUS_STAGE_DEPLOYER_USER }}
MAVEN_CENTRAL_TOKEN: ${{ secrets.NEXUS_STAGE_DEPLOYER_PW }}
- MAVEN_GPG_PASSPHRASE: ""
+ MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+ GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/pom.xml b/pom.xml
index e3f69fb0d..8b19978ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>32</version>
+ <version>31</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -96,7 +96,7 @@
<jsoup.version>1.7.2</jsoup.version>
<cxf.version>3.5.0</cxf.version>
<jaxws-ri.version>2.3.2</jaxws-ri.version>
- <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
+ <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
<maven-rat-plugin.version>0.16.1</maven-rat-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
@@ -300,6 +300,12 @@
<goals>
<goal>sign</goal>
</goals>
+ <configuration>
+ <gpgArguments>
+ <arg>--pinentry-mode</arg>
+ <arg>loopback</arg>
+ </gpgArguments>
+ </configuration>
</execution>
</executions>
</plugin>
