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
18 changes: 8 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ jobs:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
server-id: ossrh
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Check linting
run: mvn checkstyle:check
Expand All @@ -38,20 +39,17 @@ jobs:
run: .ci/scripts/check-project-version.sh

- name: Install gpg key
run: |
cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | base64 --decode | gpg --batch --import
run: echo -e "${{ secrets.GPG_SECRET_KEY }}" | base64 --decode | gpg --batch --import

- name: Maven deploy
run: |
mvn --no-transfer-progress --batch-mode \
-Dgpg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' \
-DskipTests deploy -P release
run: mvn --no-transfer-progress --batch-mode -DskipTests deploy -P release
env:
MAVEN_USERNAME: ${{ secrets.D11_NEXUS_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.D11_NEXUS_PASSWORD }}
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_KEY_PASS_PHRASE }}

- name: Upload to codecov
uses: codecov/codecov-action@v1.5.0
with:
file: ./target/site/jacoco/jacoco.xml
fail_ci_if_error: true
fail_ci_if_error: false
15 changes: 7 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,23 @@ jobs:
java-version: '11'
distribution: 'adopt'
cache: 'maven'
server-id: ossrh
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Update version pom.xml
run: mvn versions:set -DnewVersion=${{ steps.get_version.outputs.VERSION }}

- name: Install gpg key
run: cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | base64 --decode | gpg --batch --import
run: echo -e "${{ secrets.GPG_SECRET_KEY }}" | base64 --decode | gpg --batch --import

- name: Publish
run: |
mvn --no-transfer-progress --batch-mode \
-Dgpg.passphrase='${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}' \
deploy -P release
run: mvn --no-transfer-progress --batch-mode deploy -P release
env:
MAVEN_USERNAME: ${{ secrets.D11_NEXUS_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.D11_NEXUS_PASSWORD }}
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_KEY_PASS_PHRASE }}

- name: Bump version
run: .ci/scripts/bump-version.sh
8 changes: 4 additions & 4 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# vertx-rest
[![Continuous Integration](https://github.com/dream11/vertx-rest/actions/workflows/ci.yml/badge.svg)](https://github.com/dream11/vertx-rest/actions/workflows/ci.yml)
[![Code Coverage](https://codecov.io/gh/dream11/vertx-rest/branch/master/graph/badge.svg)](https://codecov.io/gh/dream11/vertx-rest)
[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://raw.githubusercontent.com/dream11/vertx-rest/master/LICENSE)
[![Continuous Integration](https://github.com/dream-horizon-org/vertx-rest/actions/workflows/ci.yml/badge.svg)](https://github.com/dream-horizon-org/vertx-rest/actions/workflows/ci.yml)
[![Code Coverage](https://codecov.io/gh/dream-horizon-org/vertx-rest/branch/master/graph/badge.svg)](https://codecov.io/gh/dream-horizon-org/vertx-rest)
[![License](https://img.shields.io/badge/license-MIT-green.svg)](https://raw.githubusercontent.com/dream-horizon-org/vertx-rest/master/LICENSE)

- [Overview](#overview)
- [Setup](#setup)
Expand Down Expand Up @@ -45,7 +45,7 @@ Add the following dependency to the `dependencies` section of your build descrip
}
```

Note: Replace `x.y.z` above with one of the [released versions](https://github.com/dream11/vertx-rest/releases)
Note: Replace `x.y.z` above with one of the [released versions](https://github.com/dream-horizon-org/vertx-rest/releases)

## Usage

Expand Down
42 changes: 24 additions & 18 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@

<name>${project.groupId}:${project.artifactId}</name>
<description>Vertx library for writing rest application based on JAX-RS annotations</description>
<url>https://github.com/dream11/vertx-rest</url>
<url>https://github.com/dream-horizon-org/vertx-rest</url>

<scm>
<developerConnection>scm:git:https://github.com/dream11/vertx-rest.git</developerConnection>
<connection>scm:git:https://github.com/dream11/vertx-rest.git</connection>
<url>https://github.com/dream11/vertx-rest</url>
<developerConnection>scm:git:https://github.com/dream-horizon-org/vertx-rest.git</developerConnection>
<connection>scm:git:https://github.com/dream-horizon-org/vertx-rest.git</connection>
<url>https://github.com/dream-horizon-org/vertx-rest</url>
<tag>HEAD</tag>
</scm>

<licenses>
<license>
<name>MIT License</name>
<url>https://github.com/dream11/vertx-rest/raw/master/LICENSE</url>
<url>https://github.com/dream-horizon-org/vertx-rest/raw/master/LICENSE</url>
</license>
</licenses>

Expand All @@ -36,14 +36,21 @@

<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
<id>central</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>

<repositories>
<repository>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
<name>Central Portal Snapshots</name>
<id>central-portal-snapshots</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</distributionManagement>
</repositories>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -77,8 +84,8 @@
<maven.failsafe.plugin.version>3.0.0-M5</maven.failsafe.plugin.version>
<maven.jacoco.plugin.version>0.8.8</maven.jacoco.plugin.version>
<maven.source.plugin.version>3.2.1</maven.source.plugin.version>
<maven.gpg.plugin.version>3.0.1</maven.gpg.plugin.version>
<maven.nexus.plugin.version>1.6.13</maven.nexus.plugin.version>
<maven.gpg.plugin.version>3.2.7</maven.gpg.plugin.version>
<central.publishing.plugin.version>0.8.0</central.publishing.plugin.version>
<maven.checkstyle.plugin.version>3.2.0</maven.checkstyle.plugin.version>
<maven.swagger.plugin.jakarta.version>2.2.6</maven.swagger.plugin.jakarta.version>
<maven.dependency.plugin.version>3.1.2</maven.dependency.plugin.version>
Expand Down Expand Up @@ -401,14 +408,13 @@
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${maven.nexus.plugin.version}</version>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central.publishing.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
</configuration>
</plugin>

Expand Down
Loading