Skip to content

Commit

Permalink
Merge branch 'main' into feature/repo-add-pass-credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
sschnabe authored Jun 24, 2024
2 parents 2a15220 + c2607c8 commit 9ea5ceb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 14 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
distribution: temurin
java-version: 8
cache: maven
- run: mvn $MAVEN_ARGS dependency:go-offline
- run: mvn $MAVEN_ARGS deploy
env:
SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
distribution: temurin
java-version: 8
cache: maven
- run: mvn $MAVEN_ARGS dependency:go-offline
- run: mvn $MAVEN_ARGS verify
- run: mvn $MAVEN_ARGS site
- uses: actions/upload-artifact@v4
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ jobs:
server-password: SERVER_PASSWORD
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg-passphrase: GPG_PASSPHRASE
- run: mvn $MAVEN_ARGS dependency:go-offline
- run: mvn $MAVEN_ARGS release:prepare -Darguments="$MAVEN_ARGS"
- run: mvn $MAVEN_ARGS release:perform -Darguments="$MAVEN_ARGS"
env:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Add following dependency to your pom.xml:
<dependency>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
</dependency>
```

Expand All @@ -49,7 +49,7 @@ The default setting is to construct the Helm download URL based upon the detecte
<plugin>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
<configuration>
<chartDirectory>${project.basedir}</chartDirectory>
<chartVersion>${project.version}</chartVersion>
Expand All @@ -70,7 +70,7 @@ If you leave `helmVersion` and `helmDownloadUrl` empty the plugin will determine
<plugin>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
<configuration>
<chartDirectory>${project.basedir}</chartDirectory>
<chartVersion>${project.version}</chartVersion>
Expand All @@ -94,7 +94,7 @@ When `useLocalHelmBinary` is enabled, the plugin by default will search for the
<plugin>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
<configuration>
<chartDirectory>${project.basedir}</chartDirectory>
<chartVersion>${project.version}</chartVersion>
Expand All @@ -117,7 +117,7 @@ and disables the auto-detection feature:
<plugin>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
<configuration>
<chartDirectory>${project.basedir}</chartDirectory>
<chartVersion>${project.version}</chartVersion>
Expand All @@ -141,7 +141,7 @@ and disables the auto-detection feature:
<plugin>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
<configuration>
<chartDirectory>${project.basedir}</chartDirectory>
<chartVersion>${project.version}</chartVersion>
Expand Down Expand Up @@ -173,7 +173,7 @@ and disables the auto-detection feature:
<plugin>
<groupId>io.kokuwa.maven</groupId>
<artifactId>helm-maven-plugin</artifactId>
<version>6.14.0</version>
<version>6.15.0</version>
<configuration>
<chartDirectory>${project.basedir}</chartDirectory>
<chartVersion>${project.version}</chartVersion>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
<parent>
<groupId>io.kokuwa.maven</groupId>
<artifactId>maven-parent</artifactId>
<version>0.6.15</version>
<version>0.6.16</version>
<relativePath />
</parent>

<artifactId>helm-maven-plugin</artifactId>
<version>6.14.1-SNAPSHOT</version>
<version>6.15.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>

<name>Helm Maven Plugin</name>
Expand Down Expand Up @@ -96,11 +96,11 @@
<!-- ============================= Versions ============================== -->
<!-- ===================================================================== -->

<version.org.apache.commons.compress>1.26.1</version.org.apache.commons.compress>
<version.org.apache.commons.compress>1.26.2</version.org.apache.commons.compress>
<version.org.junit.jupiter>5.10.2</version.org.junit.jupiter>
<version.org.mockito>4.11.0</version.org.mockito>
<version.org.projectlombok>1.18.32</version.org.projectlombok>
<version.com.fasterxml.jackson>2.17.0</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson>2.17.1</version.com.fasterxml.jackson>
<version.com.github.tomakehurst.wiremock>2.35.2</version.com.github.tomakehurst.wiremock>
<version.com.puppycrawl.tools.checkstyle>9.3</version.com.puppycrawl.tools.checkstyle>

Expand Down

0 comments on commit 9ea5ceb

Please sign in to comment.