Upgrade qpid.jms.client.version to 1.10.0 and add new repository

.github/dependabot.yml

@@ -26,3 +26,12 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "docker"
+    labels: ["image"]
+    directory: "/"
+    schedule:
+      interval: "daily"

interop/pom.xml → .github/workflows/bintray-mirror-settings.xml

@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019 Red Hat, Inc.
+  ~ Copyright (c) 2022 Red Hat, Inc.
   ~
   ~ Licensed to the Apache Software Foundation (ASF) under one or more
   ~ contributor license agreements. See the NOTICE file distributed with
@@ -18,18 +17,15 @@
   ~ limitations under the License.
   -->
 
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>parent</artifactId>
-        <groupId>com.redhat.cli-java</groupId>
-        <version>1.2.2-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>interop</artifactId>
-
-
-</project>
+<!--To make it easier not to use bintray.
+https://stackoverflow.com/questions/74258160/is-jcenter-down-permanently-31-oct-->
+<settings>
+    <mirrors>
+        <mirror>
+            <id>bintray-maven-central</id>
+            <name>Bintray Maven Central mirror</name>
+            <url>https://jcenter.bintray.com</url>
+            <mirrorOf>central</mirrorOf>
+        </mirror>
+    </mirrors>
+</settings>

.github/workflows/bintray-repository-settings.xml

@@ -0,0 +1,50 @@
+<!--
+  ~ Copyright (c) 2022 Red Hat, Inc.
+  ~
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!--To make it easier not to use bintray.
+https://stackoverflow.com/questions/74258160/is-jcenter-down-permanently-31-oct-->
+<settings>
+    <profiles>
+        <profile>
+            <id>bintray</id>
+            <repositories>
+                <repository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>bintray</id>
+                    <url>https://jcenter.bintray.com</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>bintray-plugins</id>
+                    <url>https://jcenter.bintray.com</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <activeProfiles>
+        <activeProfile>bintray</activeProfile>
+    </activeProfiles>
+</settings>

.github/workflows/google-mirror-settings.xml

@@ -0,0 +1,29 @@
+<!--
+  ~ Copyright (c) 2022 Red Hat, Inc.
+  ~
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<settings>
+    <mirrors>
+        <mirror>
+          <id>google-maven-central</id>
+          <name>GCS Maven Central mirror</name>
+          <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+          <mirrorOf>central</mirrorOf>
+        </mirror>
+    </mirrors>
+</settings>

.github/workflows/google-repository-settings.xml

@@ -0,0 +1,48 @@
+<!--
+  ~ Copyright (c) 2022 Red Hat, Inc.
+  ~
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements. See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License. You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<settings>
+    <profiles>
+        <profile>
+            <id>google-maven-central</id>
+            <repositories>
+                <repository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>google-maven-central</id>
+                    <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <id>google-maven-central-plugins</id>
+                    <url>https://maven-central.storage-download.googleapis.com/maven2/</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
+    <activeProfiles>
+        <activeProfile>google-maven-central</activeProfile>
+    </activeProfiles>
+</settings>

.github/workflows/image_build.yml

@@ -0,0 +1,44 @@
+name: Build and Push Image
+on:
+  push:
+    branches:
+      - 'main'
+
+env:
+  IMAGE_NAME: cli-java
+  IMAGE_REGISTRY: quay.io
+  IMAGE_NAMESPACE: rhmessagingqe
+
+jobs:
+  build:
+    name: Build and push image
+    runs-on: ubuntu-22.04
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Build Image
+      id: build-image
+      uses: redhat-actions/buildah-build@v2
+      with:
+        image: ${{ env.IMAGE_NAME }}
+        tags: latest ${{ github.sha }} ${{ github.ref_name }}
+        archs: amd64, arm64, ppc64le, s390x
+        containerfiles: |
+          ./Dockerfile
+
+    - name: Push To quay.io
+      id: push-to-quay
+      uses: redhat-actions/push-to-registry@v2
+      with:
+        image: ${{ steps.build-image.outputs.image }}
+        tags: ${{ steps.build-image.outputs.tags }}
+        registry: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAMESPACE }}
+        username: ${{ secrets.QUAY_USER }}
+        password: ${{ secrets.QUAY_TOKEN }}
+
+    - name: Print images URL
+      run: echo "Images pushed to ${{ steps.push-to-quay.outputs.registry-paths }}"

.github/workflows/maven.yml

@@ -10,38 +10,42 @@ on:
     branches: [ main, qpid-jms-1.x ]
   workflow_dispatch:
 
+env:
+  # https://maven.apache.org/configure.html#maven_args-environment-variable
+  MAVEN_ARGS: "-Dmaven.artifact.threads=42 --no-transfer-progress --settings=.github/workflows/google-repository-settings.xml"
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'adopt-openj9'
         java-version: '11'
 
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package --file pom.xml ${{env.MAVEN_ARGS}}
 
     - name: Install the qpid-jms subtree (needed for the next step)
-      run: mvn clean install -DskipTests -pl :cli-qpid-jms -am
+      run: mvn clean install -DskipTests -pl :cli-qpid-jms -am ${{env.MAVEN_ARGS}}
 
     - name: Run a single test (remember that JUnit5 issue)
-      run: mvn surefire:test -Dtest=QPIDJMS484Test -pl :cli-qpid-jms
+      run: mvn surefire:test -Dtest=QPIDJMS484Test -pl :cli-qpid-jms ${{env.MAVEN_ARGS}}
 
   test:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'adopt-openj9'
         java-version: '11'
@@ -56,7 +60,7 @@ jobs:
       run: sleep 10
 
     - name: mvn package
-      run: mvn clean package -Ptests,coverage
+      run: mvn clean package -Ptests,coverage ${{env.MAVEN_ARGS}}
 
     - name: bash ./tests.sh
       run: bash ./tests.sh

Dockerfile

@@ -0,0 +1,53 @@
+# Arguments for DEV's (comment static FROM and uncomnnet #DEV ones)
+ARG UBI_VERSION=9
+ARG OPENJDK_VERSION=17
+ARG UBI_BUILD_TAG=latest
+ARG UBI_RUNTIME_TAG=latest
+ARG IMAGE_BUILD=registry.access.redhat.com/ubi${UBI_VERSION}/openjdk-${OPENJDK_VERSION}:${UBI_TAG}
+ARG IMAGE_BASE=registry.access.redhat.com/ubi${UBI_VERSION}/openjdk-${OPENJDK_VERSION}-runtime:${UBI_RUNTIME_TAG}
+
+#DEV FROM $IMAGE_BUILD AS build
+FROM registry.access.redhat.com/ubi9/openjdk-17:1.14-2.1679391793 AS build
+
+USER root
+COPY . /app
+WORKDIR /app
+
+ENV MAVEN_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dmaven.repo.local=/app/.m2 -Dmaven.artifact.threads=42"
+RUN mvn -T 1C package -DskipTests=true --no-transfer-progress
+
+RUN mkdir targets && \
+    cp cli-qpid-jms/target/cli-qpid-jms-*[0-9].jar targets/cli-qpid.jar && \
+    cp cli-artemis-jms/target/cli-artemis-jms-*[0-9].jar targets/cli-artemis.jar && \
+    cp cli-paho-java/target/cli-paho-java-*[0-9].jar targets/cli-paho.jar && \
+    cp cli-activemq/target/cli-activemq-*[0-9].jar targets/cli-activemq.jar && \
+    cp cli-protonj2/target/cli-protonj2-*[0-9].jar targets/cli-protonj2.jar && \
+    echo "package info:("$(ls cli-*/target/cli-*.jar)")" >> VERSION.txt
+
+#DEV FROM $IMAGE_BASE
+FROM registry.access.redhat.com/ubi9/openjdk-17-runtime:1.14-2.1679391794
+
+LABEL name="Red Hat Messagign QE - Java CLI Image" \
+      run="podman run --rm -ti <image_name:tag> /bin/bash cli-*"
+
+USER root
+
+RUN mkdir /licenses 
+COPY ./LICENSE /licenses/LICENSE.txt
+COPY ./image/bin /usr/local/bin
+COPY --from=build /app/targets/ /opt/cli-java
+COPY --from=build /app/VERSION.txt /opt/cli-java
+
+RUN chmod 0755 /usr/local/bin/cli-* && \
+    chmod +x /usr/local/bin/cli-*
+
+RUN mkdir /var/lib/cli-java && \
+    chown -R 1001:0 /var/lib/cli-java  && \
+    chmod -R g=u /var/lib/cli-java
+
+USER 1001
+
+VOLUME /var/lib/cli-java
+WORKDIR /var/lib/cli-java
+
+CMD ["/bin/bash"]