Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pipeline test #127

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9de79f5
#87: fix imports for quarkus 3.0.0.Alpha1
turing85 Oct 26, 2022
ae62bbd
Release 3.0.0.Alpha2
turing85 Oct 31, 2022
18a0261
Merge pull request #97 from quarkiverse/release
turing85 Oct 31, 2022
783a723
[maven-release-plugin] prepare release 3.0.0.Alpha2
actions-user Oct 31, 2022
b50939f
[maven-release-plugin] prepare for next development iteration
actions-user Oct 31, 2022
e9508f2
Update stable version for documentation
actions-user Oct 31, 2022
9f7a44f
#87 Switched from artemis-jms-client to artemis-jakarta-client
turing85 Nov 1, 2022
c41fe51
Release 3.0.0.Alpha3
turing85 Nov 1, 2022
8903bd1
Merge pull request #98 from quarkiverse/release
turing85 Nov 1, 2022
ef4816f
[maven-release-plugin] prepare release 3.0.0.Alpha3
actions-user Nov 1, 2022
d37d058
[maven-release-plugin] prepare for next development iteration
actions-user Nov 1, 2022
e7aa0db
Update stable version for documentation
actions-user Nov 1, 2022
8aa0f10
Merge branch 'main' into feature/87-prepare-for-quarkus-3
turing85 Nov 3, 2022
5650ae5
#87: import-update from main-merge
turing85 Nov 3, 2022
62aa43d
Merge branch 'main' into feature/87-prepare-for-quarkus-3
turing85 Nov 9, 2022
024ee10
#87: import reorder
turing85 Nov 9, 2022
a5285f7
Merge branch 'main' into feature/87-prepare-for-quarkus-3
turing85 Nov 9, 2022
3dab074
Merge branch 'main' into feature/87-prepare-for-quarkus-3
turing85 Nov 22, 2022
a783e29
Merge branch 'main' into feature/87-prepare-for-quarkus-3
turing85 Dec 7, 2022
62bbdbb
#87: Bump quarkus.version form 3.0.0.Alpha1 to 3.0.0.Alpha2
turing85 Dec 7, 2022
789191b
Release 3.0.0.Alpha4
turing85 Dec 7, 2022
3841cd1
Merge pull request #117 from quarkiverse/release
turing85 Dec 7, 2022
0575c1d
[maven-release-plugin] prepare release 3.0.0.Alpha4
actions-user Dec 7, 2022
feccd81
[maven-release-plugin] prepare for next development iteration
actions-user Dec 7, 2022
4fb3299
Update stable version for documentation
actions-user Dec 7, 2022
2142983
Updated tests from main
turing85 Jan 4, 2023
6db1d73
updated pipeline from main
turing85 Jan 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
release:
current-version: 2.0.3
current-version: 3.0.0.Alpha4
next-version: 999-SNAPSHOT
118 changes: 99 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,114 @@ on:
- '.all-contributorsrc'

jobs:
build:

populate-cache:
runs-on: ubuntu-latest

outputs:
cache-hit: ${{ steps.populate.outputs.cache-hit }}

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: temurin
java-version: 11
distribution: 'temurin'
cache: 'maven'
id: setup

- name: Get Date
id: get-date
- name: Populate Maven Cache and run verify
id: populate
run: |
echo "::set-output name=date::$(/bin/date -u "+%Y-%m")"
shell: bash
- name: Cache Maven Repository
id: cache-maven
uses: actions/cache@v2
if [[ ${{ steps.setup.outputs.cache-hit }} != 'true' ]]
then
mvn -B dependency:go-offline verify -Dno-verify
echo "cache-hit=false" >> $GITHUB_OUTPUT
else
echo "cache-hit=true" >> $GITHUB_OUTPUT
fi

build:
needs: populate-cache
runs-on: ubuntu-latest
strategy:
matrix:
integration-test-module:
- integration-tests/core/empty-config,
- integration-tests/core/with-default,
- integration-tests/core/with-default-and-external,
- integration-tests/core/with-default-change-url,
- integration-tests/core/with-external,
- integration-tests/core/without-default,
- integration-tests/jms/empty-config,
- integration-tests/jms/with-default,
- integration-tests/jms/with-default-and-external,
- integration-tests/jms/with-default-change-url,
- integration-tests/jms/with-external,
- integration-tests/jms/without-default

steps:
- if: ${{ needs.populate-cache.outputs.cache-hit == 'true' }}
uses: actions/checkout@v3

- if: ${{ needs.populate-cache.outputs.cache-hit == 'true' }}
name: Set up JDK 11
uses: actions/setup-java@v3
with:
path: ~/.m2/repository
# refresh cache every month to avoid unlimited growth
key: maven-repo-${{ runner.os }}-${{ steps.get-date.outputs.date }}
java-version: 11
distribution: 'temurin'
cache: 'maven'

- name: Build with Maven
run: mvn -B formatter:validate impsort:check verify --file pom.xml
- if: ${{ needs.populate-cache.outputs.cache-hit == 'true' }}
name: Build with Maven (${{ matrix.integration-test-module }})
run: |
mvn -B clean verify \
-pl core/deployment,jms/deployment,integration-tests/camel-jms/with-default \
-am \
-Dno-format

- name: Build with Native
run: mvn -B verify --file pom.xml -Dnative -Dquarkus.native.container-build=true -Dnative.surefire.skip=true
test-native:
needs: build
runs-on: ubuntu-latest
strategy:
matrix:
integration-test-module:
- integration-tests/core/empty-config,
- integration-tests/core/with-default,
- integration-tests/core/with-default-and-external,
- integration-tests/core/with-default-change-url,
- integration-tests/core/with-external,
- integration-tests/core/without-default,
- integration-tests/jms/empty-config,
- integration-tests/jms/with-default,
- integration-tests/jms/with-default-and-external,
- integration-tests/jms/with-default-change-url,
- integration-tests/jms/with-external,
- integration-tests/jms/without-default

steps:
- uses: actions/checkout@v3

- name: Get Maven Cache
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'temurin'
cache: 'maven'

- name: Set up GraalVM 17
uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: 17
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build with Maven (Native, ${{matrix.integration-test-module}})
run: |
mvn -B verify \
-pl core/deployment,jms/deployment,${{ matrix.integration-test-module }} \
-am \
-Dnative \
-Dnative.surefire.skip
2 changes: 1 addition & 1 deletion bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-jms-client</artifactId>
<artifactId>artemis-jakarta-client</artifactId>
<version>${artemis.version}</version>
<exclusions>
<!-- Excluding the JSON api and implementation (no longer needed for >= Artemis 2.20.0) -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.util.*;
import java.util.function.Supplier;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Default;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;

import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* <p>
* We use this configuration to access the configuration structure, and to extract the names of configurations
* present at build-time, so we can create the {@link org.apache.activemq.artemis.api.core.client.ServerLocator} /
* {@link javax.jms.ConnectionFactory} beans. Most importantly, we only query the presence of keys and/or values, we do
* {@link jakarta.jms.ConnectionFactory} beans. Most importantly, we only query the presence of keys and/or values, we do
* * not access values, since they could change at runtime.
*/
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* <p>
* We use this configuration to access the configuration structure, and to extract the names of configurations
* present at build-time, so we can create the {@link org.apache.activemq.artemis.api.core.client.ServerLocator} /
* {@link javax.jms.ConnectionFactory} beans. Most importantly, we only query the presence of keys and/or values, we do
* {@link jakarta.jms.ConnectionFactory} beans. Most importantly, we only query the presence of keys and/or values, we do
* not access values, since they could change at runtime.
*/
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.Optional;
import java.util.Set;

import javax.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.ApplicationScoped;

import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
import io.quarkus.artemis.core.deployment.ArtemisBootstrappedBuildItem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ArtemisBuildTimeConfig {
public Optional<Boolean> healthExclude = Optional.empty();

/**
* Support to expose {@link javax.jms.XAConnectionFactory}. Is not activated by default.
* Support to expose {@link jakarta.jms.XAConnectionFactory}. Is not activated by default.
*/
@ConfigItem
public Optional<Boolean> xaEnabled = Optional.empty();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class ArtemisRuntimeConfigs {

/**
* Whether configurations ({@link org.apache.activemq.artemis.api.core.client.ServerLocator}s in case of the
* {@code artemis-core} extension, {@link javax.jms.ConnectionFactory}s in case of the
* {@code artemis-core} extension, {@link jakarta.jms.ConnectionFactory}s in case of the
* {@code artemis-jms} extension) should be included in the health check. Defaults to {@code true} if not set.
*/
@ConfigItem(name = "health.external.enabled")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.lang.annotation.Annotation;
import java.util.*;

import javax.enterprise.inject.Any;
import jakarta.enterprise.inject.Any;

import io.quarkus.arc.Arc;
import io.quarkus.arc.InstanceHandle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.lang.annotation.Annotation;
import java.util.*;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Default;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Default;

import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
Expand Down
4 changes: 2 additions & 2 deletions docs/modules/ROOT/pages/includes/attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:quarkus-version: 2.14.1.Final
:quarkus-artemis-version: 2.0.3
:quarkus-version: 3.0.0.Alpha2
:quarkus-artemis-version: 3.0.0.Alpha4

:quarkus-org-url: https://github.com/quarkusio
:quarkus-base-url: {quarkus-org-url}/quarkus
Expand Down
6 changes: 3 additions & 3 deletions docs/modules/ROOT/pages/includes/quarkus-artemis-core.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ a|icon:lock[title=Fixed at build time] [[quarkus-artemis-core_quarkus.artemis.xa

[.description]
--
Support to expose `javax.jms.XAConnectionFactory`. Is not activated by default.
Support to expose `jakarta.jms.XAConnectionFactory`. Is not activated by default.

ifdef::add-copy-button-to-env-var[]
Environment variable: env_var_with_copy_button:+++QUARKUS_ARTEMIS_XA_ENABLED+++[]
Expand Down Expand Up @@ -262,7 +262,7 @@ a| [[quarkus-artemis-core_quarkus.artemis.health.external.enabled]]`link:#quarku

[.description]
--
Whether configurations (`org.apache.activemq.artemis.api.core.client.ServerLocator`s in case of the `artemis-core` extension, `javax.jms.ConnectionFactory`s in case of the `artemis-jms` extension) should be included in the health check. Defaults to `true` if not set.
Whether configurations (`org.apache.activemq.artemis.api.core.client.ServerLocator`s in case of the `artemis-core` extension, `jakarta.jms.ConnectionFactory`s in case of the `artemis-jms` extension) should be included in the health check. Defaults to `true` if not set.

ifdef::add-copy-button-to-env-var[]
Environment variable: env_var_with_copy_button:+++QUARKUS_ARTEMIS_HEALTH_EXTERNAL_ENABLED+++[]
Expand Down Expand Up @@ -450,7 +450,7 @@ a|icon:lock[title=Fixed at build time] [[quarkus-artemis-core_quarkus.artemis.-c

[.description]
--
Support to expose `javax.jms.XAConnectionFactory`. Is not activated by default.
Support to expose `jakarta.jms.XAConnectionFactory`. Is not activated by default.

ifdef::add-copy-button-to-env-var[]
Environment variable: env_var_with_copy_button:+++QUARKUS_ARTEMIS__CONFIGURATION_NAME__XA_ENABLED+++[]
Expand Down
Loading