diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 53069597..1da0fbdb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -285,7 +285,7 @@ jobs: fail-fast: false max-parallel: 16 matrix: - cassandra-version: ['3.11', '4.0', '4.1', '5.0'] + cassandra-version: ['4.0', '4.1', '5.0'] base-platform: ['ubuntu', 'ubi8'] itTest : ['LifecycleIT', 'KeepAliveIT', 'NonDestructiveOpsIT', 'DestructiveOpsIT', 'NonDestructiveOpsResourcesV2IT', 'DockerImageIT', 'AsyncRepairIT', 'PortOverrideIT', 'MetricsIT', 'NodetoolIT'] exclude: @@ -472,7 +472,7 @@ jobs: strategy: max-parallel: 4 matrix: - cassandra-version: ['3.11', '4.0', '4.1', '5.0'] + cassandra-version: ['4.0', '4.1', '5.0'] base-platform: ['ubuntu', 'ubi8'] exclude: - cassandra-version: '5.0' diff --git a/.github/workflows/docker-release.yaml b/.github/workflows/docker-release.yaml index 08223344..61e8dfb8 100644 --- a/.github/workflows/docker-release.yaml +++ b/.github/workflows/docker-release.yaml @@ -177,81 +177,82 @@ jobs: --target dse \ --platform linux/amd64 . - build-oss-3-11x: - strategy: - fail-fast: false - max-parallel: 4 - matrix: - cassandra-version: [3.11.7, 3.11.8, 3.11.11, 3.11.12, 3.11.13, 3.11.14, 3.11.15, 3.11.16, 3.11.17] - include: - - cassandra-version: 3.11.16 - latest: true - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Setup Buildx - id: buildx - uses: docker/setup-buildx-action@v3 - with: - version: latest - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PASSWORD }} - - if: ${{ matrix.latest }} - name: Publish ${{ matrix.cassandra-version }} to Registry - run: | - RELEASE_VERSION="${GITHUB_REF##*/}" - docker buildx build --push \ - --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ - --tag k8ssandra/cass-management-api:3.11 \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }} \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-$RELEASE_VERSION \ - --file cassandra/Dockerfile-3.11 \ - --target cassandra \ - --platform linux/amd64,linux/arm64 . - - if: ${{ !matrix.latest }} - name: Publish ${{ matrix.cassandra-version }} to Registry - run: | - RELEASE_VERSION="${GITHUB_REF##*/}" - docker buildx build --push \ - --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }} \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-$RELEASE_VERSION \ - --file cassandra/Dockerfile-3.11 \ - --target cassandra \ - --platform linux/amd64,linux/arm64 . - - if: ${{ matrix.latest }} - name: Publish ${{ matrix.cassandra-version }}-ubi to Registry - run: | - RELEASE_VERSION="${GITHUB_REF##*/}" - docker buildx build --push \ - --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ - --tag k8ssandra/cass-management-api:3.11-ubi8 \ - --tag k8ssandra/cass-management-api:3.11-ubi \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8 \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8-$RELEASE_VERSION \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi-$RELEASE_VERSION \ - --file cassandra/Dockerfile-3.11.ubi8 \ - --target cassandra \ - --platform linux/amd64,linux/arm64 . - - if: ${{ !matrix.latest }} - name: Publish ${{ matrix.cassandra-version }}-ubi8 to Registry - run: | - RELEASE_VERSION="${GITHUB_REF##*/}" - docker buildx build --push \ - --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8 \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8-$RELEASE_VERSION \ - --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi-$RELEASE_VERSION \ - --file cassandra/Dockerfile-3.11.ubi8 \ - --target cassandra \ - --platform linux/amd64,linux/arm64 . +# Cassandra 3.11 support is now deprecated +# build-oss-3-11x: +# strategy: +# fail-fast: false +# max-parallel: 4 +# matrix: +# cassandra-version: [3.11.7, 3.11.8, 3.11.11, 3.11.12, 3.11.13, 3.11.14, 3.11.15, 3.11.16, 3.11.17] +# include: +# - cassandra-version: 3.11.16 +# latest: true +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v3 +# - name: Setup Buildx +# id: buildx +# uses: docker/setup-buildx-action@v3 +# with: +# version: latest +# - name: Login to DockerHub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKER_HUB_USERNAME }} +# password: ${{ secrets.DOCKER_HUB_PASSWORD }} +# - if: ${{ matrix.latest }} +# name: Publish ${{ matrix.cassandra-version }} to Registry +# run: | +# RELEASE_VERSION="${GITHUB_REF##*/}" +# docker buildx build --push \ +# --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ +# --tag k8ssandra/cass-management-api:3.11 \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }} \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-$RELEASE_VERSION \ +# --file cassandra/Dockerfile-3.11 \ +# --target cassandra \ +# --platform linux/amd64,linux/arm64 . +# - if: ${{ !matrix.latest }} +# name: Publish ${{ matrix.cassandra-version }} to Registry +# run: | +# RELEASE_VERSION="${GITHUB_REF##*/}" +# docker buildx build --push \ +# --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }} \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-$RELEASE_VERSION \ +# --file cassandra/Dockerfile-3.11 \ +# --target cassandra \ +# --platform linux/amd64,linux/arm64 . +# - if: ${{ matrix.latest }} +# name: Publish ${{ matrix.cassandra-version }}-ubi to Registry +# run: | +# RELEASE_VERSION="${GITHUB_REF##*/}" +# docker buildx build --push \ +# --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ +# --tag k8ssandra/cass-management-api:3.11-ubi8 \ +# --tag k8ssandra/cass-management-api:3.11-ubi \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8 \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8-$RELEASE_VERSION \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi-$RELEASE_VERSION \ +# --file cassandra/Dockerfile-3.11.ubi8 \ +# --target cassandra \ +# --platform linux/amd64,linux/arm64 . +# - if: ${{ !matrix.latest }} +# name: Publish ${{ matrix.cassandra-version }}-ubi8 to Registry +# run: | +# RELEASE_VERSION="${GITHUB_REF##*/}" +# docker buildx build --push \ +# --build-arg CASSANDRA_VERSION=${{ matrix.cassandra-version }} \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8 \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi8-$RELEASE_VERSION \ +# --tag k8ssandra/cass-management-api:${{ matrix.cassandra-version }}-ubi-$RELEASE_VERSION \ +# --file cassandra/Dockerfile-3.11.ubi8 \ +# --target cassandra \ +# --platform linux/amd64,linux/arm64 . build-oss-4-0x: strategy: diff --git a/.github/workflows/jar-release.yaml b/.github/workflows/jar-release.yaml index 4559e5a1..75094839 100644 --- a/.github/workflows/jar-release.yaml +++ b/.github/workflows/jar-release.yaml @@ -46,7 +46,6 @@ jobs: zip jars.zip \ management-api-agent-shaded-libs/target/datastax-mgmtapi-agent-shaded-libs*.jar \ management-api-agent-common/target/datastax-mgmtapi-agent-*.jar \ - management-api-agent-3.x/target/datastax-mgmtapi-agent-*.jar \ management-api-agent-4.x/target/datastax-mgmtapi-agent-*.jar \ management-api-agent-4.1.x/target/datastax-mgmtapi-agent-*.jar \ management-api-agent-5.0.x/target/datastax-mgmtapi-agent-*.jar \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 23c43c7a..0e0e80f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Changelog for Management API, new PRs should update the `main / unreleased` sect ## unreleased * [CHANGE] [#556](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/556) Update Management API dependencies to address CVEs +* [CHANGE] [#547](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/547) Deprecate Cassandra 3.11 support * [FEATURE] [#551](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/551) Add Cassandra 5.0.2 to the build matrix * [FEATURE] [#549](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/549) Add DSE 6.9.3 to the build matrix * [ENHANCEMENT] [#552](https://github.com/k8ssandra/management-api-for-apache-cassandra/issues/552) Improve "liveness" probe implementation diff --git a/README.md b/README.md index fd163b99..54e708d7 100644 --- a/README.md +++ b/README.md @@ -54,38 +54,37 @@ The following versions of Cassandra and DSE are published to Docker and supported: -| Cassandra 3.11.x | Cassandra 4.0.x | Cassandra 4.1.x | Cassandra 5.0.x | DSE 6.8.x | DSE 6.9.x | HCD 1.0.x | -| ---------------- | --------------- | --------------- |-----------------| --------- | ------------- | ----------| -| 3.11.7 | 4.0.0 | 4.1.0 | 5.0.1 | 6.8.25 | 6.9.0 | 1.0.0 | -| 3.11.8 | 4.0.1 | 4.1.1 | 5.0.2 | 6.8.26 | 6.9.1 | | -| 3.11.11 | 4.0.3 | 4.1.2 | | 6.8.28 | 6.9.2 | | -| 3.11.12 | 4.0.4 | 4.1.3 | | 6.8.29 | | | -| 3.11.13 | 4.0.5 | 4.1.4 | | 6.8.30 | | | -| 3.11.14 | 4.0.6 | 4.1.5 | | 6.8.31 | | | -| 3.11.15 | 4.0.7 | 4.1.6 | | 6.8.32 | | | -| 3.11.16 | 4.0.8 | 4.1.7 | | 6.8.33 | | | -| 3.11.17 | 4.0.9 | | | 6.8.34 | | | -| | 4.0.10 | | | 6.8.35 | | | -| | 4.0.11 | | | 6.8.36 | | | -| | 4.0.12 | | | 6.8.37 | | | -| | 4.0.13 | | | 6.8.38 | | | -| | 4.0.14 | | | 6.8.39 | | | -| | | | | 6.8.40 | | | -| | | | | 6.8.41 | | | -| | | | | 6.8.42 | | | -| | | | | 6.8.43 | | | -| | | | | 6.8.44 | | | -| | | | | 6.8.46 | | | -| | | | | 6.8.47 | | | -| | | | | 6.8.48 | | | -| | | | | 6.8.49 | | | -| | | | | 6.8.50 | | | -| | | | | 6.8.51 | | | +| Cassandra 4.0.x | Cassandra 4.1.x | Cassandra 5.0.x | DSE 6.8.x | DSE 6.9.x | HCD 1.0.x | +| --------------- | --------------- |-----------------| --------- | ------------- | ----------| +| 4.0.0 | 4.1.0 | 5.0.1 | 6.8.25 | 6.9.0 | 1.0.0 | +| 4.0.1 | 4.1.1 | 5.0.2 | 6.8.26 | 6.9.1 | | +| 4.0.3 | 4.1.2 | | 6.8.28 | 6.9.2 | | +| 4.0.4 | 4.1.3 | | 6.8.29 | | | +| 4.0.5 | 4.1.4 | | 6.8.30 | | | +| 4.0.6 | 4.1.5 | | 6.8.31 | | | +| 4.0.7 | 4.1.6 | | 6.8.32 | | | +| 4.0.8 | 4.1.7 | | 6.8.33 | | | +| 4.0.9 | | | 6.8.34 | | | +| 4.0.10 | | | 6.8.35 | | | +| 4.0.11 | | | 6.8.36 | | | +| 4.0.12 | | | 6.8.37 | | | +| 4.0.13 | | | 6.8.38 | | | +| 4.0.14 | | | 6.8.39 | | | +| | | | 6.8.40 | | | +| | | | 6.8.41 | | | +| | | | 6.8.42 | | | +| | | | 6.8.43 | | | +| | | | 6.8.44 | | | +| | | | 6.8.46 | | | +| | | | 6.8.47 | | | +| | | | 6.8.48 | | | +| | | | 6.8.49 | | | +| | | | 6.8.50 | | | +| | | | 6.8.51 | | | - Apache Cassandra images are available in `linux/amd64` or `linux/arm64` formats. The DSE images are available only in the `linux/amd64` format. - All images (with the exception of Cassandra 5.0) are available as an Ubuntu based image or a RedHat UBI 8 based image. Cassandra 5.0 images are only RedHat UBI8 based. -- All Cassandra 3.11.x images come with JDK 8 - All Cassandra 4.0.x, 4.1.x and 5.0.x images come with JDK 11 - All DSE 6.8.x Ubuntu based images are available with either JDK 8 or JDK 11 (you have to pick, only one JDK is installed in an image) - All DSE 6.8.x RedHat UBI 8 based images come with JDK 8 @@ -93,13 +92,31 @@ Cassandra 5.0 images are only RedHat UBI8 based. - All DSE 6.9.x RedHat UBI 8 based images come with only JDK 11 - HCD images are not built within this repo. Only the Agent for HCD ois maintained within this repo -### Java versions in DOcker images +### Java versions in Docker images As of v0.1.88, all images produced from this repo will have Java 11 installed as the Management API server code must now run with Java 11. For images where the Cassandra/DSE version runs with Java 8 (see above), Both Java 8 and Java 11 will be available, with Java 8 being the default and Java 8 used to run the Cassandra/DSE process. +### Cassandra 3.11.x support is now deprecated + +Cassandra 3.11.x is no longer supported as of version v0.1.88. Images with Cassandra 3.11 are still available in DockerHub. +No new Management API functionality will be released for any Cassandra 3.11 versions going forward and no new Cassandra 3.11.x +patch version images will be published going forward. The table below shows the last published Cassandra 3.11.x versions: + +| Cassandra 3.11.x | +| ---------------- | +| 3.11.7 | +| 3.11.8 | +| 3.11.11 | +| 3.11.12 | +| 3.11.13 | +| 3.11.14 | +| 3.11.15 | +| 3.11.16 | +| 3.11.17 | + ### Docker coordinates for Cassandra OSS images #### Ubuntu based images (OSS) @@ -211,19 +228,15 @@ First, you will need to have the [Docker buildx plugin](https://docs.docker.com/ To build an image based on the desired Cassandra version see the examples below: - #Create a docker image with management api and C* 3.11 (version 3.11.7 and newer are supported, replace `3.11.16` with the version you want below) - docker buildx build --load --build-arg CASSANDRA_VERSION=3.11.16 --tag mgmtapi-3_11 --file cassandra/Dockerfile-3.11 --target cassandra --platform linux/amd64 . - #Create a docker image with management api and C* 4.0 (version 4.0.0 and newer are supported) docker buildx build --load --build-arg CASSANDRA_VERSION=4.0.6 --tag mgmtapi-4_0 --file cassandra/Dockerfile-4.0 --target cassandra --platform linux/amd64 . #Create a docker image with management api and C* 4.1 (version 4.1.0 and newer are supported) docker buildx build --load --build-arg CASSANDRA_VERSION=4.1.4 --tag mgmtapi-4_1 --file cassandra/Dockerfile-4.1 --target cassandra --platform linux/amd64 . -To build a RedHat Universal Base Image (UBI) based Cassandra image, use the `ubi8` Dockerfile. Examples: + # Cassandra 5.0 and newer images are based on RedHat Universal Base Images (see below) - #Create a UBI8 based image with management api and C* 3.11 (version 3.11.7 and newer are supported, replace `3.11.16` with the version you want below) - docker buildx build --load --build-arg CASSANDRA_VERSION=3.11.16 --tag mgmtapi-3_11_ubi8 --file cassandra/Dockerfile-3.11.ubi8 --target cassandra --platform linux/amd64 . +To build a RedHat Universal Base Image (UBI) based Cassandra image, use the `ubi8` Dockerfile. Examples: #Create a UBI8 based image with management api and C* 4.0 (version 4.0.0 and newer are supported) docker buildx build --load --build-arg CASSANDRA_VERSION=4.0.6 --tag mgmtapi-4_0_ubi8 --file cassandra/Dockerfile-4.0.ubi8 --target cassandra --platform linux/amd64 . @@ -231,13 +244,13 @@ To build a RedHat Universal Base Image (UBI) based Cassandra image, use the `ubi #Create a UBI8 based image with management api and C* 4.1 (version 4.1.0 and newer are supported) docker buildx build --load --build-arg CASSANDRA_VERSION=4.1.4 --tag mgmtapi-4_1_ubi8 --file cassandra/Dockerfile-4.1.ubi8 --target cassandra --platform linux/amd64 . -You can also build OSS Cassandra images for `linux/arm64` based platforms. Both Ubuntu and UBI8 based images support this. Simply change the `--platform` argument above to `--platform linux/arm64`. Examples: + #Create a UBI8 based image with management api and C* 5.0 (version 5.0.1 and newer are supported) + docker buildx build --load --build-arg CASSANDRA_VERSION=5.0.2 --tag mgmtapi-5_0_ubi8 --file cassandra/Dockerfile-5.0.ubi8 --target cassandra --platform linux/amd64 . - #Create an ARM64 docker image with management api and C* 3.11 (version 3.11.7 and newer are supported, replace `3.11.16` with the version you want below) - docker buildx build --load --build-arg CASSANDRA_VERSION=3.11.16 --tag mgmtapi-3_11 --file cassandra/Dockerfile-3.11 --target cassandra --platform linux/arm64 . +You can also build OSS Cassandra images for `linux/arm64` based platforms. Both Ubuntu and UBI8 based images support this. Simply change the `--platform` argument above to `--platform linux/arm64`. Examples: #Create an ARM64 UBI8 based image with management api and C* 4.0 (version 4.0.0 and newer are supported) - docker buildx build --load --build-arg CASSANDRA_VERSION=4.0.6 --tag mgmtapi-4_0_ubi8 --file cassandra/Dockerfile-4.0.ubi8 --target cassandra --platform linux/arm64 . + docker buildx build --load --build-arg CASSANDRA_VERSION=4.0.6 --tag mgmtapi-4_0_ubi8-arm --file cassandra/Dockerfile-4.0.ubi8 --target cassandra --platform linux/arm64 . To build an image based on DSE, see the [DSE README](management-api-agent-dse-6.8/README.md). @@ -316,9 +329,9 @@ For building an image based on DSE 6.9, see the [DSE 6.9 README](management-api- By default, all images will listen on port 8080 for Management API connections. This can be overridden by specifying the environment variable `MGMT_API_LISTEN_TCP_PORT` and setting it to your desired port. For example: - > docker run -e USE_MGMT_API=true -e MGMT_API_LISTEN_TCP_PORT=9090 -p 9090:9090 k8ssandra/cass-management-api:3.11.15 + > docker run -e USE_MGMT_API=true -e MGMT_API_LISTEN_TCP_PORT=9090 -p 9090:9090 k8ssandra/cass-management-api:4.0.14 -The above would run a Cassandra 3.11.15 image with Management API listening on port 9090 (instead of 8080). +The above would run a Cassandra 4.0.14 image with Management API listening on port 9090 (instead of 8080). ## Usage with DSE diff --git a/cassandra-trunk/Dockerfile.ubi8 b/cassandra-trunk/Dockerfile.ubi8 index 9a26eb96..21123777 100644 --- a/cassandra-trunk/Dockerfile.ubi8 +++ b/cassandra-trunk/Dockerfile.ubi8 @@ -82,7 +82,6 @@ COPY --from=cass-builder /root/.m2 /root/.m2 COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -94,7 +93,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -DskipOpenApi -P trunk && rm -rf target COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -104,7 +102,6 @@ RUN mkdir -m 775 ${MAAC_PATH} \ && cd /tmp \ && mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P trunk \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t ${MAAC_PATH} -i '{}' + \ - && rm ${MAAC_PATH}/datastax-mgmtapi-agent-3* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.1.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-*shaded* \ diff --git a/cassandra/Dockerfile-3.11 b/cassandra/Dockerfile-3.11 index 88907803..7742b23d 100644 --- a/cassandra/Dockerfile-3.11 +++ b/cassandra/Dockerfile-3.11 @@ -31,7 +31,7 @@ COPY management-api-agent-5.0.x ./management-api-agent-5.0.x COPY management-api-common ./management-api-common COPY management-api-server ./management-api-server RUN mkdir -m 775 ${MAAC_PATH} && \ - mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi && \ + mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P 311 && \ find /build -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + && \ rm $MAAC_PATH/datastax-mgmtapi-agent-4* && \ rm $MAAC_PATH/datastax-mgmtapi-agent-5* && \ diff --git a/cassandra/Dockerfile-3.11.ubi8 b/cassandra/Dockerfile-3.11.ubi8 index 663fdf77..5f2c4740 100644 --- a/cassandra/Dockerfile-3.11.ubi8 +++ b/cassandra/Dockerfile-3.11.ubi8 @@ -134,7 +134,7 @@ COPY management-api-common /tmp/management-api-common COPY management-api-server /tmp/management-api-server RUN mkdir -m 775 ${MAAC_PATH} \ && cd /tmp \ - && mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi \ + && mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P 311 \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t ${MAAC_PATH} -i '{}' + \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.1.x* \ diff --git a/cassandra/Dockerfile-4.0 b/cassandra/Dockerfile-4.0 index d072224e..24bfd691 100644 --- a/cassandra/Dockerfile-4.0 +++ b/cassandra/Dockerfile-4.0 @@ -12,7 +12,6 @@ ENV MAAC_PATH=/opt/management-api COPY pom.xml ./ COPY management-api-agent-shaded-libs/pom.xml ./management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml ./management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml ./management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml ./management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml ./management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml ./management-api-agent-5.0.x/pom.xml @@ -24,7 +23,6 @@ RUN mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -DskipOpenApi && COPY management-api-agent-shaded-libs ./management-api-agent-shaded-libs COPY management-api-agent-common ./management-api-agent-common -COPY management-api-agent-3.x ./management-api-agent-3.x COPY management-api-agent-4.x ./management-api-agent-4.x COPY management-api-agent-4.1.x ./management-api-agent-4.1.x COPY management-api-agent-5.0.x ./management-api-agent-5.0.x @@ -33,7 +31,6 @@ COPY management-api-server ./management-api-server RUN mkdir -m 775 ${MAAC_PATH} && \ mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi && \ find /build -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + && \ - rm $MAAC_PATH/datastax-mgmtapi-agent-3* && \ rm $MAAC_PATH/datastax-mgmtapi-agent-4.1.x* && \ rm $MAAC_PATH/datastax-mgmtapi-agent-5* && \ rm $MAAC_PATH/datastax-mgmtapi-*shaded* && \ diff --git a/cassandra/Dockerfile-4.0.ubi8 b/cassandra/Dockerfile-4.0.ubi8 index cd43df90..a23b4f2e 100644 --- a/cassandra/Dockerfile-4.0.ubi8 +++ b/cassandra/Dockerfile-4.0.ubi8 @@ -114,7 +114,6 @@ ENV MAAC_PATH=/opt/management-api COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -126,7 +125,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -136,7 +134,6 @@ RUN mkdir -m 775 ${MAAC_PATH} \ && cd /tmp \ && mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + \ - && rm ${MAAC_PATH}/datastax-mgmtapi-agent-3.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.1.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-5* \ && rm ${MAAC_PATH}/datastax-mgmtapi-*shaded* \ diff --git a/cassandra/Dockerfile-4.1 b/cassandra/Dockerfile-4.1 index 8cd38130..832bbbdb 100644 --- a/cassandra/Dockerfile-4.1 +++ b/cassandra/Dockerfile-4.1 @@ -13,7 +13,6 @@ ENV MAAC_PATH=/opt/management-api COPY pom.xml ./ COPY management-api-agent-shaded-libs/pom.xml ./management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml ./management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml ./management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml ./management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml ./management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml ./management-api-agent-5.0.x/pom.xml @@ -25,7 +24,6 @@ RUN mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -DskipOpenApi && COPY management-api-agent-shaded-libs ./management-api-agent-shaded-libs COPY management-api-agent-common ./management-api-agent-common -COPY management-api-agent-3.x ./management-api-agent-3.x COPY management-api-agent-4.x ./management-api-agent-4.x COPY management-api-agent-4.1.x ./management-api-agent-4.1.x COPY management-api-agent-5.0.x ./management-api-agent-5.0.x @@ -34,7 +32,6 @@ COPY management-api-server ./management-api-server RUN mkdir -m 775 ${MAAC_PATH} && \ mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi && \ find /build -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + && \ - rm $MAAC_PATH/datastax-mgmtapi-agent-3* && \ rm $MAAC_PATH/datastax-mgmtapi-agent-4.x* && \ rm $MAAC_PATH/datastax-mgmtapi-agent-5* && \ rm $MAAC_PATH/datastax-mgmtapi-*shaded* && \ diff --git a/cassandra/Dockerfile-4.1.ubi8 b/cassandra/Dockerfile-4.1.ubi8 index a61364e6..ac3d57e0 100644 --- a/cassandra/Dockerfile-4.1.ubi8 +++ b/cassandra/Dockerfile-4.1.ubi8 @@ -115,7 +115,6 @@ ENV MAAC_PATH=/opt/management-api COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -127,7 +126,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -137,7 +135,6 @@ RUN mkdir -m 775 ${MAAC_PATH} \ && cd /tmp \ && mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t ${MAAC_PATH} -i '{}' + \ - && rm ${MAAC_PATH}/datastax-mgmtapi-agent-3.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-5* \ && rm ${MAAC_PATH}/datastax-mgmtapi-*shaded* \ diff --git a/cassandra/Dockerfile-5.0.ubi8 b/cassandra/Dockerfile-5.0.ubi8 index 5d757dd5..ef60aa10 100644 --- a/cassandra/Dockerfile-5.0.ubi8 +++ b/cassandra/Dockerfile-5.0.ubi8 @@ -54,7 +54,6 @@ ENV MAAC_PATH=/opt/management-api COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -66,7 +65,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -76,7 +74,6 @@ RUN mkdir -m 775 ${MAAC_PATH} \ && cd /tmp \ && mvn -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t ${MAAC_PATH} -i '{}' + \ - && rm ${MAAC_PATH}/datastax-mgmtapi-agent-3* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-agent-4.1.x* \ && rm ${MAAC_PATH}/datastax-mgmtapi-*shaded* \ diff --git a/dse/Dockerfile-dse6.8.jdk11 b/dse/Dockerfile-dse6.8.jdk11 index d7a5c7b0..0925ebc2 100644 --- a/dse/Dockerfile-dse6.8.jdk11 +++ b/dse/Dockerfile-dse6.8.jdk11 @@ -82,7 +82,6 @@ ENV DSE_HOME=/opt/dse COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -97,7 +96,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -109,7 +107,6 @@ RUN mkdir -m 775 $MAAC_PATH \ && cd /tmp \ && mvn -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Daether.connector.http.connectionMaxTtl=25 -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P dse \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + \ - && rm $MAAC_PATH/datastax-mgmtapi-agent-3* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-4* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-5* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-dse-6.9* \ diff --git a/dse/Dockerfile-dse6.8.jdk8 b/dse/Dockerfile-dse6.8.jdk8 index e5de5e64..fab033a0 100644 --- a/dse/Dockerfile-dse6.8.jdk8 +++ b/dse/Dockerfile-dse6.8.jdk8 @@ -82,7 +82,6 @@ ENV DSE_HOME=/opt/dse COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -97,7 +96,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -109,7 +107,6 @@ RUN mkdir -m 775 $MAAC_PATH \ && cd /tmp \ && mvn -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Daether.connector.http.connectionMaxTtl=25 -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P dse \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + \ - && rm $MAAC_PATH/datastax-mgmtapi-agent-3* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-4* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-5* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-dse-6.9* \ diff --git a/dse/Dockerfile-dse6.8.ubi8 b/dse/Dockerfile-dse6.8.ubi8 index 0f353413..014243a8 100644 --- a/dse/Dockerfile-dse6.8.ubi8 +++ b/dse/Dockerfile-dse6.8.ubi8 @@ -15,7 +15,6 @@ ENV DSE_HOME=/opt/dse COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -30,7 +29,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -42,7 +40,6 @@ RUN mkdir -m 775 $MAAC_PATH \ && cd /tmp \ && mvn -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Daether.connector.http.connectionMaxTtl=25 -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P dse \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + \ - && rm $MAAC_PATH/datastax-mgmtapi-agent-3* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-4* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-5* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-dse-6.9* \ diff --git a/dse/Dockerfile-dse6.9.jdk11 b/dse/Dockerfile-dse6.9.jdk11 index e44e8970..84754c95 100644 --- a/dse/Dockerfile-dse6.9.jdk11 +++ b/dse/Dockerfile-dse6.9.jdk11 @@ -82,7 +82,6 @@ ENV DSE_HOME=/opt/dse COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -97,7 +96,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -109,7 +107,6 @@ RUN mkdir -m 775 $MAAC_PATH \ && cd /tmp \ && mvn -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Daether.connector.http.connectionMaxTtl=25 -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P dse \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + \ - && rm $MAAC_PATH/datastax-mgmtapi-agent-3* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-4* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-5* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-dse-6.8* \ diff --git a/dse/Dockerfile-dse6.9.ubi8 b/dse/Dockerfile-dse6.9.ubi8 index e79e307e..d8374989 100644 --- a/dse/Dockerfile-dse6.9.ubi8 +++ b/dse/Dockerfile-dse6.9.ubi8 @@ -15,7 +15,6 @@ ENV DSE_HOME=/opt/dse COPY pom.xml /tmp/pom.xml COPY management-api-agent-shaded-libs/pom.xml /tmp/management-api-agent-shaded-libs/pom.xml COPY management-api-agent-common/pom.xml /tmp/management-api-agent-common/pom.xml -COPY management-api-agent-3.x/pom.xml /tmp/management-api-agent-3.x/pom.xml COPY management-api-agent-4.x/pom.xml /tmp/management-api-agent-4.x/pom.xml COPY management-api-agent-4.1.x/pom.xml /tmp/management-api-agent-4.1.x/pom.xml COPY management-api-agent-5.0.x/pom.xml /tmp/management-api-agent-5.0.x/pom.xml @@ -30,7 +29,6 @@ RUN cd /tmp && mvn -q -ff -T 1C install -Dskip.surefire.tests -DskipTests -Dskip COPY management-api-agent-shaded-libs /tmp/management-api-agent-shaded-libs COPY management-api-agent-common /tmp/management-api-agent-common -COPY management-api-agent-3.x /tmp/management-api-agent-3.x COPY management-api-agent-4.x /tmp/management-api-agent-4.x COPY management-api-agent-4.1.x /tmp/management-api-agent-4.1.x COPY management-api-agent-5.0.x /tmp/management-api-agent-5.0.x @@ -42,7 +40,6 @@ RUN mkdir -m 775 $MAAC_PATH \ && cd /tmp \ && mvn -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3 -Daether.connector.http.connectionMaxTtl=25 -q -ff package -Dskip.surefire.tests -DskipTests -DskipOpenApi -P dse \ && find /tmp -type f -name "datastax-*.jar" -exec mv -t $MAAC_PATH -i '{}' + \ - && rm $MAAC_PATH/datastax-mgmtapi-agent-3* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-4* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-5* \ && rm $MAAC_PATH/datastax-mgmtapi-agent-dse-6.8* \ diff --git a/management-api-agent-3.x/pom.xml b/management-api-agent-3.x/pom.xml index 58f46afa..f44531e1 100644 --- a/management-api-agent-3.x/pom.xml +++ b/management-api-agent-3.x/pom.xml @@ -15,6 +15,9 @@ ${revision} datastax-mgmtapi-agent-3.x + + 3.11.17 + default diff --git a/management-api-agent-common/pom.xml b/management-api-agent-common/pom.xml index 2d1d802f..cede9890 100644 --- a/management-api-agent-common/pom.xml +++ b/management-api-agent-common/pom.xml @@ -40,7 +40,7 @@ org.apache.cassandra cassandra-all - ${cassandra3.version} + ${cassandra4.version} commons-codec diff --git a/management-api-common/pom.xml b/management-api-common/pom.xml index c963e9be..ea7d0187 100644 --- a/management-api-common/pom.xml +++ b/management-api-common/pom.xml @@ -40,7 +40,7 @@ org.apache.cassandra cassandra-all - ${cassandra3.version} + ${cassandra4.version} commons-codec diff --git a/management-api-server/pom.xml b/management-api-server/pom.xml index b0c2616b..30655806 100644 --- a/management-api-server/pom.xml +++ b/management-api-server/pom.xml @@ -175,7 +175,7 @@ - + @@ -191,9 +191,9 @@ - - - + + + ${skipTests} @@ -210,10 +210,10 @@ ${dseIncluded} ${basedir}/.. - ${basedir}/.cassandra-bin/apache-cassandra-${cassandra3.version} + ${basedir}/.cassandra-bin/apache-cassandra-${cassandra4.version} - -javaagent:${basedir}/../management-api-agent/target/datastax-mgmtapi-agent-3.x-${project.version}.jar + -javaagent:${basedir}/../management-api-agent/target/datastax-mgmtapi-agent-4.x-${project.version}.jar 1 1 diff --git a/pom.xml b/pom.xml index a97f5ff0..1dc19a99 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ build_version.sh 0.1.0-SNAPSHOT 4.15.0 - 3.11.17 4.0.14 3.3.6 4.13.2 @@ -54,7 +53,6 @@ management-api-agent-shaded-libs management-api-common management-api-agent-common - management-api-agent-3.x management-api-agent-4.x management-api-agent-4.1.x management-api-agent-5.0.x @@ -73,7 +71,6 @@ management-api-agent-shaded-libs management-api-common management-api-agent-common - management-api-agent-3.x management-api-agent-4.x management-api-agent-4.1.x management-api-agent-5.0.x @@ -94,7 +91,6 @@ management-api-agent-shaded-libs management-api-common management-api-agent-common - management-api-agent-3.x management-api-agent-4.x management-api-agent-4.1.x management-api-agent-5.0.x @@ -113,7 +109,6 @@ management-api-agent-shaded-libs management-api-common management-api-agent-common - management-api-agent-3.x management-api-agent-4.x management-api-agent-4.1.x management-api-agent-5.0.x @@ -121,6 +116,25 @@ management-api-server + + 311 + + false + + + false + + + management-api-agent-shaded-libs + management-api-common + management-api-agent-common + management-api-agent-3.x + management-api-agent-4.x + management-api-agent-4.1.x + management-api-agent-5.0.x + management-api-server + +