diff --git a/.github/workflows/re-release.yml b/.github/workflows/re-release.yml deleted file mode 100644 index bbf2929b5e4..00000000000 --- a/.github/workflows/re-release.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Re-release ScyllaDB Java Driver - -on: - workflow_dispatch: - inputs: - version_tag: - type: string - description: 'version or tag to release it again' - required: true - -jobs: - release: - name: Release - runs-on: ubuntu-latest - - permissions: - contents: write - - steps: - - name: Checkout Repository - uses: actions/checkout@v5 - - - name: Checkout Code One Commit Before ${{ inputs.version_tag }} - run: | - git fetch --prune --unshallow || true - git checkout ${{ inputs.version_tag }}~1 - git tag -d ${{ inputs.version_tag }} - - - name: Set up Java - uses: actions/setup-java@v5 - with: - java-version: '8' - distribution: 'temurin' - server-id: ossrh - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD - - - name: Configure Git user - run: | - git config user.name "ScyllaDB Promoter" - git config user.email "github-promoter@scylladb.com" - - - name: Prepare release - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run: make release-prepare - - - name: Perform release - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - run: make release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49a964cbe81..208ea3b9c6f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,10 +3,20 @@ name: Release ScyllaDB Java Driver on: workflow_dispatch: inputs: - dryrun: + dry-run: type: boolean - description: 'dryrun: run without publishing the package' - default: true + description: 'dry-run: run without pushing SCM changes to upstream' + default: false + + skip-tests: + type: boolean + description: 'skip-tests: do not run tests while releasing' + default: false + + target-tag: + type: string + description: 'target-tag: tag or branch name to release. Use to re-release tagged releases' + default: scylla-4.x jobs: release: @@ -20,53 +30,63 @@ jobs: MVNCMD: mvn -B -X -ntp steps: - - name: Checkout Repository - uses: actions/checkout@v5 + - name: Checkout Repository + uses: actions/checkout@v5 - - name: Set up Java - uses: actions/setup-java@v5 - with: - java-version: '8' - distribution: 'temurin' - server-id: ossrh - gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} - server-username: OSSRH_USERNAME - server-password: OSSRH_PASSWORD + - name: Checkout Code One Commit Before ${{ inputs.version_tag }} + if: inputs.target-tag != 'scylla-4.x' + env: + RELEASE_TARGET_TAG: ${{ inputs.version_tag }} + run: make checkout-one-commit-before - - name: Configure Git user - run: | - git config user.name "ScyllaDB Promoter" - git config user.email "github-promoter@scylladb.com" + - name: Set up Java + uses: actions/setup-java@v5 + with: + java-version: '8' + distribution: 'temurin' + server-id: central + gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} + server-username: SONATYPE_TOKEN_USERNAME + server-password: SONATYPE_TOKEN_PASSWORD + cache: maven - - name: Clean project - run: $MVNCMD clean + - name: Configure Git user + run: | + git config user.name "ScyllaDB Promoter" + git config user.email "github-promoter@scylladb.com" - - name: Clean release - run: $MVNCMD release:clean + - name: Prepare release + env: + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + RELEASE_SKIP_TESTS: ${{ inputs.skip-tests }} + run: make release-prepare - - name: Prepare release - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - run: make release-prepare + - name: Perform release + if: inputs.dry-run == false + env: + RELEASE_SKIP_TESTS: ${{ inputs.skip-tests }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + SONATYPE_TOKEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_USERNAME }} + SONATYPE_TOKEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }} + run: make release - - name: Perform release - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - if: ${{ github.event.inputs.dryrun == false }} - run: make release + - name: Perform release dry-run + if: inputs.dry-run == true + env: + RELEASE_SKIP_TESTS: ${{ inputs.skip-tests }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + SONATYPE_TOKEN_USERNAME: ${{ secrets.SONATYPE_TOKEN_USERNAME }} + SONATYPE_TOKEN_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }} + run: make release-dry-run - - name: Perform dry-run release - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} - if: ${{ github.event.inputs.dryrun == true }} - run: make release-dry-run + - name: Upload release logs + uses: actions/upload-artifact@v4 + with: + name: maven-stdout + path: /tmp/java-driver-release-logs/*.log - - name: Push changes to SCM - if: ${{ github.event.inputs.dryrun == false }} - run: | - git status && git log -3 - git push origin --follow-tags -v + - name: Push changes to SCM + if: ${{ inputs.dry-run == false && inputs.target-tag == 'scylla-4.x' }} + run: | + git status && git log -3 + git push origin --follow-tags -v \ No newline at end of file diff --git a/.github/workflows/tests@v1.yml b/.github/workflows/tests@v1.yml index fafd4bab49c..55bf093a51e 100644 --- a/.github/workflows/tests@v1.yml +++ b/.github/workflows/tests@v1.yml @@ -7,7 +7,6 @@ on: - "docs/**" - .github/workflows/docs-pages.yml - .github/workflows/docs-pr.yml - - .github/workflows/re-release.yml - .github/workflows/release.yml - "*.md" - "*.sh" @@ -20,7 +19,6 @@ on: - "docs/**" - .github/workflows/docs-pages.yml - .github/workflows/docs-pr.yml - - .github/workflows/re-release.yml - .github/workflows/release.yml - "*.md" - "*.sh" diff --git a/Makefile b/Makefile index d97d58ce665..75f5e8d189a 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,15 @@ CCM_SCYLLA_VERSION ?= master SCYLLA_EXT_OPTS ?= --smp=2 --memory=4G MVNCMD ?= mvn -B -X -ntp -GPG_PASSPHRASE ?= -OSSRH_USERNAME ?= + +MAVEN_GPG_PASSPHRASE ?= +SONATYPE_TOKEN_USERNAME ?= +SONATYPE_TOKEN_PASSWORD ?= + MAVEN_OPTS ?= +RELEASE_SKIP_TESTS ?= + ifeq (${CCM_CONFIG_DIR},) CCM_CONFIG_DIR = ~/.ccm endif @@ -153,6 +158,14 @@ resolve-scylla-version: .prepare-get-version fi echo "$${SCYLLA_VERSION_RESOLVED}" >${SCYLLA_VERSION_FILE} +checkout-one-commit-before: + @if [[ "${RELEASE_TARGET_TAG}" == 4.* ]]; then + echo "Checking out one commit before ${RELEASE_TARGET_TAG}" + git fetch --prune --unshallow || git fetch --prune || true + git checkout ${RELEASE_TARGET_TAG}~1 + git tag -d ${RELEASE_TARGET_TAG} + fi + download-cassandra: .prepare-scylla-ccm resolve-cassandra-version @if [[ -z "$${CASSANDRA_VERSION_RESOLVED}" ]]; then CASSANDRA_VERSION_RESOLVED=$$(cat '${CASSANDRA_VERSION_FILE}') @@ -180,42 +193,48 @@ download-scylla: .prepare-scylla-ccm resolve-scylla-version rm -rf /tmp/download.ccm .require-release-prepare-env: - @if [[ -z "${GPG_PASSPHRASE}" ]]; then - echo "GPG_PASSPHRASE is empty" + @if [[ -z "${MAVEN_GPG_PASSPHRASE}" ]]; then + echo "MAVEN_GPG_PASSPHRASE is empty" exit 1 fi .require-release-env: - @if [[ -z "${GPG_PASSPHRASE}" ]]; then - echo "GPG_PASSPHRASE is empty" + @if [[ -z "${MAVEN_GPG_PASSPHRASE}" ]]; then + echo "MAVEN_GPG_PASSPHRASE is empty" exit 1 fi - if [[ -z "${OSSRH_USERNAME}" ]]; then - echo "OSSRH_USERNAME is empty" + if [[ -z "${SONATYPE_TOKEN_USERNAME}" ]]; then + echo "SONATYPE_TOKEN_USERNAME is empty" exit 1 fi - if [[ -z "${OSSRH_PASSWORD}" ]]; then - echo "OSSRH_PASSWORD is empty" + if [[ -z "${SONATYPE_TOKEN_PASSWORD}" ]]; then + echo "SONATYPE_TOKEN_PASSWORD is empty" exit 1 fi release-prepare: .require-release-prepare-env - @if [[ -n "${RELEASE_SKIP_TESTS}" ]]; then + @if [[ "${RELEASE_SKIP_TESTS}" == "true" ]] || [[ "${RELEASE_SKIP_TESTS}" == "1" ]]; then export MAVEN_OPTS="${MAVEN_OPTS} -DskipTests=true -DskipITs=true" fi - $(MVNCMD) release:prepare -DpushChanges=false -Dgpg.passphrase=${GPG_PASSPHRASE} + # There is bug in release plugin that leads to pom.xml files being reformatted + # Resulted format does not conform to `xml-format-maven-plugin` requirements + # As result `release:prepare` stage fails + # That is why xml-formatting is disabled here + $(MVNCMD) release:prepare -DpushChanges=false -Dxml-format.skip=true release: .require-release-env - @if [[ -n "${RELEASE_SKIP_TESTS}" ]]; then + @if [[ "${RELEASE_SKIP_TESTS}" == "true" ]] || [[ "${RELEASE_SKIP_TESTS}" == "1" ]]; then export MAVEN_OPTS="${MAVEN_OPTS} -DskipTests=true -DskipITs=true" fi - $(MVNCMD) release:perform -Drelease.autopublish=true -Dgpg.passphrase=${GPG_PASSPHRASE} > >(tee /tmp/logs-stdout.log) 2> >(tee /tmp/logs-stderr.log) + mkdir /tmp/java-driver-release-logs/ 2>/dev/null || true + $(MVNCMD) release:perform -Drelease.autopublish=true > >(tee /tmp/java-driver-release-logs/stdout.log) 2> >(tee /tmp/java-driver-release-logs/stderr.log) release-dry-run: .require-release-env - @if [[ -n "${RELEASE_SKIP_TESTS}" ]]; then + @if [[ "${RELEASE_SKIP_TESTS}" == "true" ]] || [[ "${RELEASE_SKIP_TESTS}" == "1" ]]; then export MAVEN_OPTS="${MAVEN_OPTS} -DskipTests=true -DskipITs=true" fi - $(MVNCMD) release:perform -Dgpg.passphrase=${GPG_PASSPHRASE} > >(tee /tmp/logs-stdout.log) 2> >(tee /tmp/logs-stderr.log) + mkdir /tmp/java-driver-release-logs/ 2>/dev/null || true + $(MVNCMD) release:perform > >(tee /tmp/java-driver-release-logs/stdout.log) 2> >(tee /tmp/java-driver-release-logs/stderr.log) compile-all: .install-guava-shaded mvn -B compile test-compile -Dfmt.skip=true -Dclirr.skip=true -Danimal.sniffer.skip=true @@ -264,6 +283,7 @@ clean: find -name 'pom.xml.next' -delete find -name 'target' -exec rm -rf {} + find -name 'dependency-reduced-pom.xml' -exec rm -f {} + + rm -f release.properties 2>/dev/null for dir in driver-core driver-examples driver-extras driver-mapping driver-tests driver-dist testing; do rm -rf $$dir 2>/dev/null done diff --git a/bom/pom.xml b/bom/pom.xml index 72c4527de52..81eff725309 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -33,60 +33,6 @@ java-driver-bom pom Java driver for Scylla and Apache Cassandra(R) - Bill Of Materials - - - - com.scylladb - java-driver-core - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-core-shaded - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-mapper-processor - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-mapper-runtime - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-query-builder - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-guava-shaded - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-test-infra - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-metrics-micrometer - 4.19.0.2-SNAPSHOT - - - com.scylladb - java-driver-metrics-microprofile - 4.19.0.2-SNAPSHOT - - - com.scylladb - native-protocol - 1.5.2.1 - - - diff --git a/core-shaded/pom.xml b/core-shaded/pom.xml index d905c9bb492..58b2a2721b2 100644 --- a/core-shaded/pom.xml +++ b/core-shaded/pom.xml @@ -32,17 +32,16 @@ java-driver-core-shaded Java driver for Scylla and Apache Cassandra(R) - core with shaded deps - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - + Shaded distribution of the ScyllaDB Java Driver core module with relocated third-party dependencies. + https://github.com/scylladb/java-driver + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + Apache License Version 2.0 + + - org.jctools - jctools-core - 4.0.5 + org.xerial.snappy + snappy-java + ${snappy.version} + + + org.lz4 + lz4-java + ${lz4.version} + + + org.apache.tinkerpop + gremlin-core + ${tinkerpop.version} + + + org.apache.tinkerpop + tinkergraph-gremlin + ${tinkerpop.version} com.esri.geometry esri-geometry-api - 2.2.4 + ${esri.version} diff --git a/core/pom.xml b/core/pom.xml index 0855ed77a8c..162f4bb98eb 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -33,17 +33,6 @@ java-driver-core bundle Java driver for Scylla and Apache Cassandra(R) - core - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - com.scylladb diff --git a/distribution-source/pom.xml b/distribution-source/pom.xml index 3a26872a6f0..57869ba650d 100644 --- a/distribution-source/pom.xml +++ b/distribution-source/pom.xml @@ -71,13 +71,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - @@ -107,7 +100,6 @@ net.nicoulaj.maven.plugins checksum-maven-plugin - 1.11 diff --git a/distribution-tests/pom.xml b/distribution-tests/pom.xml index f830c38c157..538b08b10a3 100644 --- a/distribution-tests/pom.xml +++ b/distribution-tests/pom.xml @@ -32,17 +32,6 @@ java-driver-distribution-tests Scylla Java Driver - distribution tests - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - com.scylladb @@ -115,13 +104,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - diff --git a/distribution/pom.xml b/distribution/pom.xml index a6cc3c8f149..f23d7834ff9 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -38,37 +38,22 @@ These dependencies are only here to ensure proper build order and proper inclusion of binaries in the final tarball --> - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - - ${project.groupId} + com.scylladb java-driver-core - ${project.version} - ${project.groupId} + com.scylladb java-driver-query-builder - ${project.version} - ${project.groupId} + com.scylladb java-driver-mapper-runtime - ${project.version} - ${project.groupId} + com.scylladb java-driver-mapper-processor - ${project.version} @@ -109,107 +94,112 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - org.apache.maven.plugins maven-gpg-plugin - 3.2.8 true - - - - - release - - - - maven-javadoc-plugin - - - attach-javadocs - package - - jar - - - true - Java driver for Scylla and Apache Cassandra® ${project.version} API - Java driver for Scylla and Apache Cassandra(R) ${project.version} API - - - org.lz4 - lz4-java - ${lz4.version} - - - org.xerial.snappy - snappy-java - ${snappy.version} - - - org.apache.tinkerpop - gremlin-core - ${tinkerpop.version} - - - org.apache.tinkerpop - tinkergraph-gremlin - ${tinkerpop.version} - - - - - - - - maven-assembly-plugin - - - assemble-binary-tarball - package - - single - - - + + maven-javadoc-plugin + + + attach-javadocs + package + + jar + - false - - src/assembly/binary-tarball.xml - - posix + true + Java driver for Scylla and Apache Cassandra® ${project.version} API + Java driver for Scylla and Apache Cassandra(R) ${project.version} API + + + org.lz4 + lz4-java + ${lz4.version} + + + org.xerial.snappy + snappy-java + ${snappy.version} + + + org.apache.tinkerpop + gremlin-core + ${tinkerpop.version} + + + org.apache.tinkerpop + tinkergraph-gremlin + ${tinkerpop.version} + + - - - net.nicoulaj.maven.plugins - checksum-maven-plugin - 1.11 - - - - artifacts - - - + + + + + maven-assembly-plugin + + + assemble-binary-tarball + package + + single + + + + + false + + src/assembly/binary-tarball.xml + + posix + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-dist-as-primary + package + + attach-artifact + - true - - sha256 - sha512 - + + + ${project.build.directory}/${project.finalName}.tar.gz + tar.gz + + - - - - - + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.11 + + + + artifacts + + + + + true + + sha256 + sha512 + + + + + diff --git a/examples/pom.xml b/examples/pom.xml index e9710bfabf7..f0dd06f2478 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -33,30 +33,20 @@ java-driver-examples Java driver for Scylla and Apache Cassandra(R) - examples. A collection of examples to demonstrate Java Driver for Scylla and Apache Cassandra(R). - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - - ${project.groupId} + com.scylladb java-driver-core - ${project.groupId} + com.scylladb java-driver-query-builder - ${project.groupId} + com.scylladb java-driver-mapper-runtime + compile @@ -166,6 +156,11 @@ java-driver-mapper-processor ${project.version} + + com.scylladb + java-driver-mapper-runtime + ${project.version} + @@ -210,13 +205,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 234540d3bb6..1e17e039ed4 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -39,17 +39,6 @@ ${skipITs} ${skipITs} - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - com.scylladb @@ -336,13 +325,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - diff --git a/mapper-processor/pom.xml b/mapper-processor/pom.xml index d4769da1130..75159d2ef57 100644 --- a/mapper-processor/pom.xml +++ b/mapper-processor/pom.xml @@ -32,21 +32,25 @@ java-driver-mapper-processor Java driver for Scylla and Apache Cassandra(R) - object mapper processor - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - + Annotation processor that generates mapper implementations for the ScyllaDB Java Driver. + https://github.com/scylladb/java-driver + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + Apache License Version 2.0 + + + + com.scylladb + java-driver-core + com.scylladb java-driver-mapper-runtime + compile com.scylladb diff --git a/mapper-runtime/pom.xml b/mapper-runtime/pom.xml index 596242b42a2..dc3d56f89a7 100644 --- a/mapper-runtime/pom.xml +++ b/mapper-runtime/pom.xml @@ -33,24 +33,13 @@ java-driver-mapper-runtime bundle Java driver for Scylla and Apache Cassandra(R) - object mapper runtime - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - - ${project.groupId} + com.scylladb java-driver-core - ${project.groupId} + com.scylladb java-driver-query-builder diff --git a/metrics/micrometer/pom.xml b/metrics/micrometer/pom.xml index 55c387f3db4..68b5409a3a9 100644 --- a/metrics/micrometer/pom.xml +++ b/metrics/micrometer/pom.xml @@ -34,17 +34,16 @@ java-driver-metrics-micrometer bundle Java driver for Scylla and Apache Cassandra(R) - Metrics - Micrometer - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - + Micrometer metrics integration for the ScyllaDB Java Driver. + https://github.com/scylladb/java-driver + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + Apache License Version 2.0 + + io.micrometer diff --git a/metrics/microprofile/pom.xml b/metrics/microprofile/pom.xml index 17e2cab6ac0..65e7d3b88ac 100644 --- a/metrics/microprofile/pom.xml +++ b/metrics/microprofile/pom.xml @@ -34,17 +34,16 @@ java-driver-metrics-microprofile bundle Java driver for Scylla and Apache Cassandra(R) - Metrics - Microprofile - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - + Eclipse MicroProfile Metrics integration for the ScyllaDB Java Driver. + https://github.com/scylladb/java-driver + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + Apache License Version 2.0 + + org.eclipse.microprofile.metrics diff --git a/osgi-tests/pom.xml b/osgi-tests/pom.xml index 279b0a4635c..7f037dd40c3 100644 --- a/osgi-tests/pom.xml +++ b/osgi-tests/pom.xml @@ -33,17 +33,6 @@ java-driver-osgi-tests jar Java driver for Scylla and Apache Cassandra(R) - OSGi tests - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - com.scylladb @@ -56,10 +45,12 @@ com.scylladb java-driver-mapper-processor + compile com.scylladb java-driver-mapper-runtime + compile com.github.stephenc.jcip @@ -296,13 +287,6 @@ true - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - diff --git a/pom.xml b/pom.xml index d7f0f9ef8f2..d5b26d77d60 100644 --- a/pom.xml +++ b/pom.xml @@ -98,16 +98,80 @@ 22.0.0.2 false ${skipTests} + false false + + + com.scylladb + java-driver-guava-shaded + ${project.version} + com.scylladb java-driver-core ${project.version} + + + com.scylladb + java-driver-query-builder + ${project.version} + + + com.scylladb + java-driver-test-infra + test + ${project.version} + + + com.scylladb + java-driver-mapper-processor + test + ${project.version} + + + com.scylladb + java-driver-mapper-runtime + test + ${project.version} + + + com.scylladb + java-driver-core + test test-jar + ${project.version} + + + com.scylladb + java-driver-metrics-micrometer + test + ${project.version} + + + com.scylladb + java-driver-metrics-microprofile + test + ${project.version} + + + com.scylladb + java-driver-bom + ${project.version} + + + com.scylladb + java-driver-core-shaded + ${project.version} + + + + com.scylladb + native-protocol + 1.5.2.1 io.netty @@ -477,6 +541,16 @@ + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.1 + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.11 + maven-compiler-plugin 3.8.1 @@ -537,18 +611,13 @@ maven-jar-plugin 3.4.2 - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - maven-gpg-plugin 3.2.8 maven-release-plugin - 3.1.1 + 2.5.3 maven-install-plugin @@ -621,6 +690,18 @@ + + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 + true + + central + java-driver-distribution-source,java-driver-distribution-tests,java-driver-distribution,java-driver-examples,java-driver-integration-tests,java-driver-osgi-tests + ${release.autopublish} + validated + + maven-compiler-plugin @@ -726,17 +807,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://oss.sonatype.org/ - true - - - maven-source-plugin @@ -874,15 +944,13 @@ height="0" width="0" style="display:none;visibility:hidden"> true ${pushChanges} forked-path - -Dgpg.passphrase=${gpg.passphrase} - - -DskipITs + -DskipITs -Drelease.autopublish=${release.autopublish} -Dxml-format.skip=true org.apache.maven.scm maven-scm-provider-gitexe - 2.2.1 + 1.9.5 @@ -1053,12 +1121,12 @@ height="0" width="0" style="display:none;visibility:hidden"> - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central + https://central.sonatype.com/repository/maven-snapshots - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + central + https://central.sonatype.com/repository/maven-releases diff --git a/query-builder/pom.xml b/query-builder/pom.xml index 3f19f428889..37202a7b4a2 100644 --- a/query-builder/pom.xml +++ b/query-builder/pom.xml @@ -33,17 +33,16 @@ java-driver-query-builder bundle Java driver for Scylla and Apache Cassandra(R) - query builder - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - + Fluent CQL builder for the ScyllaDB Java Driver, enabling type-safe query construction. + https://github.com/scylladb/java-driver + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + Apache License Version 2.0 + + com.scylladb diff --git a/test-infra/pom.xml b/test-infra/pom.xml index 14d704d535a..07c7a006a10 100644 --- a/test-infra/pom.xml +++ b/test-infra/pom.xml @@ -33,22 +33,20 @@ java-driver-test-infra bundle Java driver for Scylla and Apache Cassandra(R) - test infrastructure tools - - - - ${project.groupId} - java-driver-bom - ${project.version} - pom - import - - - + Supporting utilities and fixtures used by ScyllaDB Java Driver integration and performance tests. + https://github.com/scylladb/java-driver + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + Apache License Version 2.0 + + com.scylladb java-driver-core - ${project.parent.version} com.github.spotbugs