Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 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
1 change: 1 addition & 0 deletions .github/actions/setup-jdk/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ runs:
server-id: ${{ inputs.server-id }}
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-passphrase: MAVEN_GPG_PASSPHRASE
gpg-private-key: ${{ inputs.gpg-private-key }}
11 changes: 3 additions & 8 deletions .github/workflows/deploy-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,17 @@ jobs:
with:
ref: "${{ env.TAG }}"
- name: Setup JDK
uses: actions/setup-java@v4
uses: ./.github/actions/setup-jdk
with:
java-version: 17
distribution: 'temurin'
cache: 'maven'
server-id: 'release-repository'
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: Deploy release
run: ./mvnw --batch-mode deploy -Prelease -DskipTests -DretryFailedDeploymentCount=3 -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }}
run: ./mvnw deploy --activate-profiles release -DskipTests -DretryFailedDeploymentCount=3
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
MAVEN_ARGS: --batch-mode --no-transfer-progress
- name: Create GitHub Release
uses: softprops/action-gh-release@v2
with:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/deploy-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Setup JDK
uses: actions/setup-java@v4
uses: ./.github/actions/setup-jdk
with:
java-version: 17
distribution: 'temurin'
cache: 'maven'
server-id: 'snapshot-repository'
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: Deploy snapshot
run: ./mvnw deploy -Prelease-snapshot --batch-mode --update-snapshots -DskipTests -DretryFailedDeploymentCount=3 -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }}
run: ./mvnw deploy --activate-profiles release-snapshot --update-snapshots -DskipTests -DretryFailedDeploymentCount=3
env:
MAVEN_USERNAME: ${{ secrets.SONATYPE_OSS_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.SONATYPE_OSS_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
MAVEN_ARGS: --batch-mode --no-transfer-progress
11 changes: 6 additions & 5 deletions .github/workflows/pr-builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ jobs:
# using ubicloud instead of "standard" ubuntu-latest fixes issue with members not being able to connect via multicast
runs-on: ubicloud-standard-8
needs: check_for_membership

env:
MAVEN_ARGS: --batch-mode --no-transfer-progress
steps:
- name: Detect untrusted community PR
if: ${{ needs.check_for_membership.outputs.check-result == 'false' }}
Expand All @@ -33,7 +34,7 @@ jobs:
exit 1

- name: Get all the letters, words and paragraphs needed for the spell!
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
ref: refs/pull/${{ github.event.pull_request.number }}/merge

Expand All @@ -42,15 +43,15 @@ jobs:

- name: Build
run: |
mvn clean install -DskipTests -B -P checkstyle -U
mvn clean install --activate-profiles checkstyle --update-snapshots -DskipTests

- name: Findbugs
run: |
mvn compile -Pfindbugs -B
mvn compile --activate-profiles findbugs

- name: Verify
run: |
mvn verify -B -Dmaven.test.failure.ignore=false
mvn verify -Dmaven.test.failure.ignore=false

- name: Publish Test results
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b
Expand Down
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should upgrade this separately and it should be managed automatically. I will take a look.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks
revert or keep?
worth checking hazelcast-jdbc also

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry missed the approval so will keep

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks revert or keep? worth checking hazelcast-jdbc also

I've already done hazelcast-jdbc. Not sure how this was missed when I first introduced it.
I'd say revert to make this PR smaller but I don't really mind.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great.
prefer to keep.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

git fetch --all
git merge origin/master --strategy-option theirs

6399716

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could just've done it from the GitHub web UI...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't come to mind.
preferred manual just in case!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but GH UI still showing Update branch 😞
looks like known behavior
says change base branch temporarily via PR edit.
I will skip but good to know!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ignore. just updated. master was truly updated #217

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
wrapperVersion=3.3.4
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
38 changes: 18 additions & 20 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,18 @@
</scm>
<developers>
<developer>
<id>oztalip</id>
<name>talip ozturk</name>
<email>talip@hazelcast.com</email>
</developer>
<developer>
<id>fuad</id>
<name>fuad malikov</name>
<email>fuad@hazelcast.com</email>
<name>Hazelcast team</name>
<email>info@hazelcast.com</email>
<organization>Hazelcast, Inc.</organization>
<organizationUrl>https://hazelcast.com</organizationUrl>
</developer>
</developers>

<distributionManagement>
<repository>
<id>release-repository</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
<snapshotRepository>
<id>snapshot-repository</id>
<name>Maven2 Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<url>https://central.sonatype.com/repository/maven-snapshots</url>
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
Expand All @@ -110,7 +102,7 @@
<repository>
<id>snapshot-repository</id>
<name>Maven2 Snapshot Repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<url>https://central.sonatype.com/repository/maven-snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
Expand Down Expand Up @@ -635,14 +627,20 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.7.0</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.9.0</version>
<extensions>true</extensions>
<configuration>
<serverId>release-repository</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<!-- server id comes from settings.xml -->
<publishingServerId>release-repository</publishingServerId>
<!--
wait until the artifacts are actually published automatically using 'autoPublish'.
the default is `validated` which would then require manual publishing
-->
<waitUntil>published</waitUntil>
<autoPublish>true</autoPublish>
<checksums>required</checksums>
</configuration>
</plugin>
</plugins>
Expand Down
Loading