Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge in changes #71

Merged
merged 4 commits into from
Jun 20, 2024
Merged

merge in changes #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52e7bcc
fix: align secrets for gpg private key and passphrase with actual (#65)
iocanel Jun 19, 2024
0ad49e6
fix: gpg configuration (#67)
iocanel Jun 19, 2024
1c4dd46
Merge pull request #68 from snowdrop/release-0.0.7
iocanel Jun 19, 2024
25a1fb3
Build updates (#70)
BarDweller Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
distribution: temurin
java-version: 17
cache: 'maven'
server-id: ossrh
server-id: oss-sonatype-staging
server-username: OSS_SONATYPE_USERNAME
server-password: OSS_SONATYPE_PASSWORD
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Configure Git author
Expand All @@ -58,12 +58,12 @@ jobs:
git commit -m "chore: set release version: ${{steps.metadata.outputs.current-version}} in samples and README.md"
- name: Maven release ${{steps.metadata.outputs.current-version}}
run: |
mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
mvn -B release:prepare -Prelease -Darguments="-DskipTests" -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
mvn -B release:perform -Darguments="-DperformRelease -DskipTests" -DperformRelease -Prelease
env:
OSS_SONATYPE_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
OSS_SONATYPE_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
- name: Set dev version in the samples and readme
run: |
find ./samples/ -iwholename "*/pack.java" | while read f; do
Expand Down
56 changes: 47 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<name>Snowdrop :: Java Buildpack Client :: Project</name>
<description>A Buildpack client implementation written in Java</description>

<url>https://snowdrop.dev</url>
<url>http://github.com/snowdrop/java-buildpack-client</url>
<inceptionYear>2020</inceptionYear>

<organization>
Expand All @@ -34,8 +34,8 @@
</developers>

<scm>
<connection>scm:git:git@github.com:snowdrop/java-buildpack-client.git</connection>
<developerConnection>scm:git:git@github.com:snowdrop/java-buildpack-client.git</developerConnection>
<connection>scm:git:git://github.com/snowdrop/java-buildpack-client.git</connection>
<developerConnection>scm:git:ssh://git@github.com:snowdrop/java-buildpack-client.git</developerConnection>
<url>http://github.com/snowdrop/java-buildpack-client</url>
<tag>${project.version}</tag>
</scm>
Expand All @@ -46,6 +46,10 @@
<name>Sonatype Staging Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<id>oss-sonatype-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>

<properties>
Expand All @@ -63,15 +67,17 @@
<version.mockito>3.12.4</version.mockito>

<!-- Maven Plugin Versions -->
<version.maven-compiler-plugin>3.8.1</version.maven-compiler-plugin>
<version.maven-surefire-plugin>2.22.0</version.maven-surefire-plugin>
<version.maven-failsafe-plugin>2.22.0</version.maven-failsafe-plugin>
<version.maven-compiler-plugin>3.13.0</version.maven-compiler-plugin>
<version.maven-surefire-plugin>3.3.0</version.maven-surefire-plugin>
<version.maven-failsafe-plugin>3.3.0</version.maven-failsafe-plugin>

<!-- Release Plugins -->
<version.maven-gpg-plugin>1.6</version.maven-gpg-plugin>
<version.maven-release-plugin>3.1.0</version.maven-release-plugin>
<version.maven-gpg-plugin>3.2.4</version.maven-gpg-plugin>
<version.maven-enforcer-plugin>1.3.1</version.maven-enforcer-plugin>
<version.maven-javadoc-plugin>2.10.3</version.maven-javadoc-plugin>
<version.maven-source-plugin>2.4</version.maven-source-plugin>
<version.maven-javadoc-plugin>3.7.0</version.maven-javadoc-plugin>
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
<version.nexus-staging-maven-plugin>1.6.13</version.nexus-staging-maven-plugin>
</properties>

<modules>
Expand Down Expand Up @@ -212,6 +218,13 @@
<goals>
<goal>sign</goal>
</goals>
<configuration>
<!-- This is necessary for gpg to not try to use the pinentry programs -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
</plugin>
Expand Down Expand Up @@ -272,6 +285,31 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${version.maven-release-plugin}</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<tagNameFormat>@{project.version}</tagNameFormat>
<pushChanges>false</pushChanges>
<localCheckout>true</localCheckout>
<remoteTagging>false</remoteTagging>
<arguments>-DskipTests=true</arguments>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${version.nexus-staging-maven-plugin}</version>
<extensions>true</extensions>
<configuration>
<serverId>oss-sonatype-staging</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>60</stagingProgressTimeoutMinutes>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
Loading