Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 9 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 11
- name: Configure Sonatype mirror
uses: s4u/[email protected]
# Go to Sonatype directly to avoid delay syncs (could get rid of this if actions/setup-java were to support mirrors).
with:
mirrors: '[{"id": "oss-releases", "name": "Sonatype releases", "mirrorOf": "*", "url": "https://oss.sonatype.org/content/repositories/releases/"}]'
- name: Download Java dependencies
# We do as much as we can, but it may not be enough (https://issues.apache.org/jira/browse/MDEP-82)
run: |
Expand All @@ -69,28 +64,29 @@ jobs:
# Will be pushed as part of the release process, only if the release is successful
git commit -m "pom.xml: update killbill-oss-parent to ${{ github.event.inputs.parent_version }}"
- name: Configure settings.xml for release
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 11
server-id: ossrh-releases
server-username: OSSRH_USER
server-password: OSSRH_PASS
distribution: temurin
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
gpg-passphrase: GPG_PASSPHRASE
- name: Release artifacts
if: github.event.inputs.perform_version == ''
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
# It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above).
run: |
mvn ${MAVEN_FLAGS} release:clean release:prepare release:perform
- name: Perform release
if: github.event.inputs.perform_version != ''
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
# It will still check the remote but hopefully not download much (0 B at 0 B/s). -o isn't safe because of MDEP-82 (see above).
# See https://issues.apache.org/jira/browse/SCM-729 for why the release.properties file is required.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ jobs:
snapshot:
uses: killbill/gh-actions-shared/.github/workflows/snapshot.yml@main
secrets:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_PASS: ${{ secrets.OSSRH_PASS }}
MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
2 changes: 1 addition & 1 deletion base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-base</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion lifecycle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-lifecycle</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/eureka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-eureka</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/graphite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-graphite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/influxdb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-influxdb</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/kpm/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-kpm</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/logger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-logger</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/metrics/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-metrics</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-all-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/bundles/prometheus/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-prometheus</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/defaultbundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-all-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-defaultbundles</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/libs/killbill/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-lib-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-lib-killbill</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/libs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-all-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-lib-bundles</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/libs/slf4j-osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-lib-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-lib-slf4j-osgi</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-all-bundles</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/tests/beatrix/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-test-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-test-beatrix</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/tests/payment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-test-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-bundles-test-payment</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi-bundles/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform-osgi-all-bundles</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi-test-bundles</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-osgi</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions platform-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-api</artifactId>
<packaging>jar</packaging>
<name>killbill-platform-api</name>
<dependencies/>
<dependencies />
</project>
6 changes: 3 additions & 3 deletions platform-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-test</artifactId>
Expand Down Expand Up @@ -278,8 +278,8 @@
<phase>initialize</phase>
<configuration>
<tasks>
<copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-platform-osgi-bundles-test-beatrix-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-jar-with-dependencies.jar"/>
<copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-platform-osgi-bundles-test-payment-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-jar-with-dependencies.jar"/>
<copy file="${basedir}/../osgi-bundles/tests/beatrix/target/killbill-platform-osgi-bundles-test-beatrix-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-beatrix-jar-with-dependencies.jar" />
<copy file="${basedir}/../osgi-bundles/tests/payment/target/killbill-platform-osgi-bundles-test-payment-${project.version}.jar" tofile="${basedir}/src/test/resources/killbill-osgi-bundles-test-payment-jar-with-dependencies.jar" />
</tasks>
</configuration>
</execution>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<version>0.146.56</version>
</parent>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<packaging>pom</packaging>
<name>killbill-platform</name>
<description>Platform to build billing and payment infrastructures</description>
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.kill-bill.billing</groupId>
<artifactId>killbill-platform</artifactId>
<version>0.41.16-SNAPSHOT</version>
<version>0.41.17-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>killbill-platform-server</artifactId>
Expand Down