Skip to content

Commit 5e5ec42

Browse files
artem-vartem-v
committed
Merge branch 'master' into bug-fix-for-allowedRoles
2 parents 7d35cdf + eaee3d9 commit 5e5ec42

File tree

13 files changed

+30
-30
lines changed

13 files changed

+30
-30
lines changed

‎.github/workflows/pre-release-ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ jobs:
3838
with:
3939
java-version: 17
4040
distribution: zulu
41-
server-id: ossrh
41+
server-id: central
4242
server-username: MAVEN_USERNAME
4343
server-password: MAVEN_PASSWORD
4444
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
4545
gpg-passphrase: MAVEN_GPG_PASSPHRASE
46-
- name: Deploy pre-release version to the Maven Central Repository
46+
- name: Deploy pre-release version to Maven Central Repository
4747
run: |
4848
pre_release_version=${{ github.event.release.tag_name }}
4949
echo Pre-release version $pre_release_version
5050
mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false
5151
mvn versions:commit
5252
mvn deploy -Pdeploy2Maven -DskipTests -B -V
5353
env:
54-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
55-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
54+
MAVEN_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
55+
MAVEN_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
5656
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5757
- name: Rollback pre-release (remove tag)
5858
if: failure()

‎.github/workflows/release-ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
-DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \
4545
-Darguments="-DskipTests=true"
4646
echo release_tag=$(git describe --tags --abbrev=0) >> $GITHUB_OUTPUT
47-
- name: Perform release
47+
- name: Perform release to GitHub Packages
4848
run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Pdeploy2Github"
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -54,21 +54,21 @@ jobs:
5454
with:
5555
java-version: 17
5656
distribution: zulu
57-
server-id: ossrh
57+
server-id: central
5858
server-username: MAVEN_USERNAME
5959
server-password: MAVEN_PASSWORD
6060
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
6161
gpg-passphrase: MAVEN_GPG_PASSPHRASE
62-
- name: Deploy release version to the Maven Central Repository
62+
- name: Deploy release version to Maven Central Repository
6363
run: |
6464
release_version=$(echo ${{ steps.prepare_release.outputs.release_tag }} | sed "s/release-//")
6565
echo release version $release_version
6666
mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false
6767
mvn versions:commit
6868
mvn deploy -Pdeploy2Maven -DskipTests -B -V
6969
env:
70-
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
71-
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
70+
MAVEN_USERNAME: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
71+
MAVEN_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
7272
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
7373
- name: Rollback release
7474
if: failure()

‎pom.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
35
<modelVersion>4.0.0</modelVersion>
46

57
<parent>
68
<groupId>io.scalecube</groupId>
79
<artifactId>scalecube-parent</artifactId>
8-
<version>0.3.1</version>
10+
<version>0.3.12</version>
911
</parent>
1012

1113
<artifactId>scalecube-services-parent</artifactId>
1214
<version>2.13.2-SNAPSHOT</version>
1315
<packaging>pom</packaging>
14-
<name>ScaleCube-Services</name>
16+
<name>${project.artifactId}</name>
1517

1618
<repositories>
1719
<repository>
@@ -57,13 +59,13 @@
5759
</scm>
5860

5961
<properties>
60-
<scalecube-cluster.version>2.7.1</scalecube-cluster.version>
61-
<scalecube-security.version>1.1.1</scalecube-security.version>
62+
<scalecube-cluster.version>2.7.2</scalecube-cluster.version>
63+
<scalecube-security.version>1.1.3</scalecube-security.version>
6264

63-
<reactor.version>2020.0.32</reactor.version>
64-
<jackson.version>2.18.2</jackson.version>
65-
<netty.version>4.1.118.Final</netty.version>
66-
<rsocket.version>1.1.4</rsocket.version>
65+
<reactor.version>2024.0.8</reactor.version>
66+
<netty.version>4.2.3.Final</netty.version>
67+
<jackson.version>2.19.2</jackson.version>
68+
<rsocket.version>1.1.5</rsocket.version>
6769
<jsr305.version>3.0.2</jsr305.version>
6870
<slf4j.version>1.7.36</slf4j.version>
6971

‎services-api/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</parent>
1111

1212
<artifactId>scalecube-services-api</artifactId>
13+
<name>${project.artifactId}</name>
1314

1415
<dependencies>
1516
<dependency>

‎services-discovery/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
</parent>
99

1010
<artifactId>scalecube-services-discovery</artifactId>
11+
<name>${project.artifactId}</name>
1112

1213
<dependencies>
1314
<dependency>

‎services-examples/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</parent>
1010

1111
<artifactId>scalecube-services-examples</artifactId>
12+
<name>${project.artifactId}</name>
1213

1314
<dependencies>
1415
<dependency>

‎services-gateway/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</parent>
1010

1111
<artifactId>scalecube-services-gateway</artifactId>
12+
<name>${project.artifactId}</name>
1213

1314
<dependencies>
1415
<dependency>

‎services-security/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</parent>
1010

1111
<artifactId>scalecube-services-security</artifactId>
12+
<name>${project.artifactId}</name>
1213

1314
<dependencies>
1415
<dependency>

‎services-testlib/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
</parent>
1010

1111
<artifactId>scalecube-services-testlib</artifactId>
12+
<name>${project.artifactId}</name>
1213

1314
<dependencies>
1415
<dependency>

‎services-transport-parent/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<artifactId>scalecube-services-transport-parent</artifactId>
1212
<packaging>pom</packaging>
13+
<name>${project.artifactId}</name>
1314

1415
<modules>
1516
<module>services-transport-jackson</module>

0 commit comments

Comments
 (0)