Use CI-friendly revision to set the project version (#12640)

This commit is contained in:
kezhenxu94 2024-09-24 17:53:14 +08:00 committed by GitHub
parent 7d1b65c639
commit a5d8777ee7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
94 changed files with 163 additions and 110 deletions

View File

@ -178,9 +178,10 @@ jobs:
run: | run: |
./mvnw clean install javadoc:javadoc -B -q -Pall \ ./mvnw clean install javadoc:javadoc -B -q -Pall \
-Dmaven.test.skip \ -Dmaven.test.skip \
-Dcheckstyle.skip -Dcheckstyle.skip \
-Dgpg.skip
- name: Verify builds are reproducible - name: Verify builds are reproducible
run: ./mvnw -Dmaven.test.skip clean verify artifact:compare -Pall run: ./mvnw -Dmaven.test.skip clean verify artifact:compare -Pall -Dgpg.skip
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
name: Upload distribution tar name: Upload distribution tar
with: with:

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>apm</artifactId> <artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-protocol</artifactId> <artifactId>oap-protocol</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>apm</artifactId> <artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>apm</artifactId> <artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -9,6 +9,7 @@
* Bump up skywalking-infra-e2e to work around GHA removing `docker-compose` v1. * Bump up skywalking-infra-e2e to work around GHA removing `docker-compose` v1.
* Bump up CodeQL GitHub Actions. * Bump up CodeQL GitHub Actions.
* Fix wrong phase of delombok plugin to reduce build warnings. * Fix wrong phase of delombok plugin to reduce build warnings.
* Use ci-friendly revision to set the project version.
#### OAP Server #### OAP Server

View File

@ -43,25 +43,56 @@ This step is only for testing purpose. If your env is correctly set, you don't n
``` ```
## Prepare for the release ## Prepare for the release
```
./mvnw release:clean - Make sure you local repo is clean, up-to-date, and no uncommitted changes.
./mvnw release:prepare -DautoVersionSubmodules=true -Darguments='-Dmaven.test.skip' -Pall
```bash
git checkout master
git pull
git checkout .
git clean -df
git submodule update
``` ```
- Set version number as x.y.z, and tag as **v**x.y.z (The version tag must start with **v**. You will find out why this is necessary in the next step.) - Set the version number that you are about to release.
_You could do a GPG signature before preparing for the release. If you need to input the password to sign, and the maven doesn't provide you with the opportunity to do so, this may lead to failure of the release. To resolve this, you may run `gpg --sign xxx` in any file. This will allow it to remember the password for long enough to prepare for the release._ ```bash
export RELEASE_VERSION=x.y.z # (example: RELEASE_VERSION=10.1.0)
```
- Update the property `revision` in `pom.xml` file, and commit it.
```bash
./mvnw versions:set-property -DgenerateBackupPoms=false -Dproperty=revision -DnewVersion=${RELEASE_VERSION}
git add pom.xml
git commit -m "Prepare for release ${RELEASE_VERSION}"
```
- Tag the commit and push it to the upstream.
```bash
git tag v${RELEASE_VERSION}
git push origin v${RELEASE_VERSION}
```
## Stage the release ## Stage the release
```bash
./mvnw install deploy -DskipTests
``` ```
./mvnw release:perform -Darguments='-Dmaven.test.skip' -Pall
This command will build, sign, and deploy the release to the Apache staging repository.
You should be prompted for your GPG passphrase during the deployment process.
If no prompt is present, you can set the passphrase in the environment variable `MAVEN_GPG_PASSPHRASE`:
```bash
MAVEN_GPG_PASSPHRASE=<your-gpg-passphrase> ./mvnw install deploy -DskipTests
``` ```
- The release will be automatically inserted into a temporary staging repository. - The release will be automatically inserted into a temporary staging repository.
## Build and sign the source code package ## Build and sign the source code package
```shell ```bash
export RELEASE_VERSION=x.y.z (example: RELEASE_VERSION=5.0.0-alpha)
cd tools/releasing cd tools/releasing
bash create_source_release.sh bash create_source_release.sh
``` ```

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>apm</artifactId> <artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<packaging>pom</packaging> <packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>analyzer</artifactId> <artifactId>analyzer</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>analyzer</artifactId> <artifactId>analyzer</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>analyzer</artifactId> <artifactId>analyzer</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>analyzer</artifactId> <artifactId>analyzer</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>apm</artifactId> <artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-cluster-plugin</artifactId> <artifactId>server-cluster-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-cluster-plugin</artifactId> <artifactId>server-cluster-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-cluster-plugin</artifactId> <artifactId>server-cluster-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>server-cluster-plugin</artifactId> <artifactId>server-cluster-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-cluster-plugin</artifactId> <artifactId>server-cluster-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>server-cluster-plugin</artifactId> <artifactId>server-cluster-plugin</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>configuration-k8s-configmap</artifactId> <artifactId>configuration-k8s-configmap</artifactId>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-configuration</artifactId> <artifactId>server-configuration</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>server-fetcher-plugin</artifactId> <artifactId>server-fetcher-plugin</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>server-fetcher-plugin</artifactId> <artifactId>server-fetcher-plugin</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-fetcher-plugin</artifactId> <artifactId>server-fetcher-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-library</artifactId> <artifactId>server-library</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-query-plugin</artifactId> <artifactId>server-query-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-query-plugin</artifactId> <artifactId>server-query-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-query-plugin</artifactId> <artifactId>server-query-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-query-plugin</artifactId> <artifactId>server-query-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-query-plugin</artifactId> <artifactId>server-query-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<artifactId>aws-firehose-receiver</artifactId> <artifactId>aws-firehose-receiver</artifactId>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -20,7 +20,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-receiver-plugin</artifactId> <artifactId>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-storage-plugin</artifactId> <artifactId>server-storage-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-storage-plugin</artifactId> <artifactId>server-storage-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-storage-plugin</artifactId> <artifactId>server-storage-plugin</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-telemetry</artifactId> <artifactId>server-telemetry</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>server-telemetry</artifactId> <artifactId>server-telemetry</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -23,7 +23,7 @@
<parent> <parent>
<artifactId>server-tools</artifactId> <artifactId>server-tools</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<artifactId>data-generator</artifactId> <artifactId>data-generator</artifactId>
<name>data-generator</name> <name>data-generator</name>

View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>oap-server</artifactId> <artifactId>oap-server</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@ -21,12 +21,12 @@
<parent> <parent>
<artifactId>server-tools</artifactId> <artifactId>server-tools</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>profile-exporter</artifactId> <artifactId>profile-exporter</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>

View File

@ -21,12 +21,12 @@
<parent> <parent>
<artifactId>profile-exporter</artifactId> <artifactId>profile-exporter</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>tool-profile-snapshot-bootstrap</artifactId> <artifactId>tool-profile-snapshot-bootstrap</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -21,12 +21,12 @@
<parent> <parent>
<artifactId>profile-exporter</artifactId> <artifactId>profile-exporter</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>tool-profile-snapshot-exporter</artifactId> <artifactId>tool-profile-snapshot-exporter</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -21,12 +21,12 @@
<parent> <parent>
<artifactId>profile-exporter</artifactId> <artifactId>profile-exporter</artifactId>
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>tool-profile-snapshot-server-mock</artifactId> <artifactId>tool-profile-snapshot-server-mock</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
<dependencies> <dependencies>
<dependency> <dependency>

32
pom.xml
View File

@ -22,7 +22,7 @@
<groupId>org.apache.skywalking</groupId> <groupId>org.apache.skywalking</groupId>
<artifactId>apm</artifactId> <artifactId>apm</artifactId>
<version>10.1.0-SNAPSHOT</version> <version>${revision}</version>
<parent> <parent>
<groupId>org.apache</groupId> <groupId>org.apache</groupId>
@ -146,6 +146,8 @@
</profiles> </profiles>
<properties> <properties>
<revision>10.1.0-SNAPSHOT</revision>
<!-- Built in properties --> <!-- Built in properties -->
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
@ -412,11 +414,18 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<configuration> <version>3.2.6</version>
<arguments>-DskipTests</arguments> <executions>
</configuration> <execution>
</plugin> <id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.cyclonedx</groupId> <groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId> <artifactId>cyclonedx-maven-plugin</artifactId>
@ -430,6 +439,13 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<retryFailedDeploymentCount>5</retryFailedDeploymentCount>
</configuration>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
@ -564,6 +580,10 @@
<groupId>org.cyclonedx</groupId> <groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId> <artifactId>cyclonedx-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>