quarkusio · cescoffier · Aug 22, 2019 · Jun 21, 2019 · Jun 25, 2019 · Jun 25, 2019
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -24,7 +24,7 @@ pr:
 
 jobs:
 - job: Build_Native_Linux
- timeoutInMinutes: 180
+ timeoutInMinutes: 210
  pool:
  vmImage: 'Ubuntu 16.04'
 

diff --git a/bom/deployment/pom.xml b/bom/deployment/pom.xml
@@ -96,6 +96,26 @@
  <artifactId>quarkus-agroal-deployment</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-core-deployment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-jms-deployment</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>io.quarkus</groupId>
  <artifactId>quarkus-hibernate-validator-deployment</artifactId>

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -150,6 +150,7 @@
  <neo4j-java-driver.version>2.0.0-alpha03</neo4j-java-driver.version>
  <mongo-client.version>3.10.2</mongo-client.version>
  <mongo-reactivestreams-client.version>1.11.0</mongo-reactivestreams-client.version>
+ <artemis.version>2.9.0</artemis.version>
  <!-- Used for integration tests, to make sure webjars work-->
  <bootstrap.version>3.1.0</bootstrap.version>
  <keycloak.version>6.0.1</keycloak.version>
@@ -277,6 +278,16 @@
  <artifactId>quarkus-agroal</artifactId>
  <version>${project.version}</version>
  </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
  <dependency>
  <groupId>io.quarkus</groupId>
  <artifactId>quarkus-elasticsearch-rest-client</artifactId>
@@ -1069,6 +1080,16 @@
  <artifactId>log4j</artifactId>
  <version>${log4j.version}</version>
  </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-core-client</artifactId>
+ <version>${artemis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-jms-client</artifactId>
+ <version>${artemis.version}</version>
+ </dependency>
  <dependency>
  <groupId>org.apache.httpcomponents</groupId>
  <artifactId>httpclient</artifactId>
@@ -2077,7 +2098,7 @@
  <artifactId>jetty-webapp</artifactId>
  <version>${jetty.version}</version>
  </dependency>
- 
+
 
 
  <dependency>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -31,6 +31,7 @@
  <rest-assured.version>3.3.0</rest-assured.version>
  <axle-client.version>0.0.7</axle-client.version>
  <vertx.version>3.7.1</vertx.version>
+ <artemis.version>2.9.0</artemis.version>
 
  <!-- Dev tools -->
  <freemarker.version>2.3.28</freemarker.version>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/FeatureBuildItem.java
@@ -10,6 +10,8 @@
 public final class FeatureBuildItem extends MultiBuildItem {
 
  public static final String AGROAL = "agroal";
+ public static final String ARTEMIS_CORE = "artemis-core";
+ public static final String ARTEMIS_JMS = "artemis-jms";
  public static final String CDI = "cdi";
  public static final String DYNAMODB = "dynamodb";
  public static final String ELASTICSEARCH_REST_CLIENT = "elasticsearch-rest-client";

diff --git a/devtools/common/src/main/filtered/extensions.json b/devtools/common/src/main/filtered/extensions.json
@@ -68,6 +68,24 @@
  "groupId": "io.quarkus",
  "artifactId": "quarkus-amazon-lambda"
  },
+ {
+ "name": "Artemis Core",
+ "labels": [
+ "artemis-core",
+ "artemis"
+ ],
+ "groupId": "io.quarkus",
+ "artifactId": "quarkus-artemis-core"
+ },
+ {
+ "name": "Artemis JMS",
+ "labels": [
+ "artemis-jms",
+ "artemis"
+ ],
+ "groupId": "io.quarkus",
+ "artifactId": "quarkus-artemis-jms"
+ },
  {
  "name": "Flyway",
  "labels": [

diff --git a/extensions/artemis-core/deployment/pom.xml b/extensions/artemis-core/deployment/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-core-parent</artifactId>
+ <version>999-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>quarkus-artemis-core-deployment</artifactId>
+ <name>Quarkus - Artemis - Core - Deployment</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-core-deployment</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-arc-deployment</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-netty-deployment</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-core</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-processor</artifactId>
+ <version>${project.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/...ore/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java b/...ore/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisCoreProcessor.java
@@ -0,0 +1,100 @@
+package io.quarkus.artemis.core.deployment;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.activemq.artemis.api.core.client.loadbalance.ConnectionLoadBalancingPolicy;
+import org.apache.activemq.artemis.api.core.client.loadbalance.FirstElementConnectionLoadBalancingPolicy;
+import org.apache.activemq.artemis.api.core.client.loadbalance.RandomConnectionLoadBalancingPolicy;
+import org.apache.activemq.artemis.api.core.client.loadbalance.RandomStickyConnectionLoadBalancingPolicy;
+import org.apache.activemq.artemis.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy;
+import org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory;
+import org.apache.commons.logging.impl.Jdk14Logger;
+import org.apache.commons.logging.impl.LogFactoryImpl;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.logging.Logger;
+
+import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
+import io.quarkus.arc.deployment.BeanContainerBuildItem;
+import io.quarkus.artemis.core.runtime.ArtemisCoreProducer;
+import io.quarkus.artemis.core.runtime.ArtemisCoreRecorder;
+import io.quarkus.artemis.core.runtime.ArtemisRuntimeConfig;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.annotations.ExecutionTime;
+import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+
+public class ArtemisCoreProcessor {
+
+ private static final Logger LOGGER = Logger.getLogger(ArtemisCoreProcessor.class);
+
+ static final Class[] BUILTIN_CONNECTOR_FACTORIES = {
+ NettyConnectorFactory.class
+ };
+
+ static final Class[] BUILTIN_LOADBALANCING_POLICIES = {
+ FirstElementConnectionLoadBalancingPolicy.class,
+ RandomConnectionLoadBalancingPolicy.class,
+ RandomStickyConnectionLoadBalancingPolicy.class,
+ RoundRobinConnectionLoadBalancingPolicy.class
+ };
+
+ @BuildStep
+ void build(CombinedIndexBuildItem indexBuildItem,
+ BuildProducer<ReflectiveClassBuildItem> reflectiveClass) {
+
+ reflectiveClass.produce(new ReflectiveClassBuildItem(false, false,
+ LogFactoryImpl.class.getName(), Jdk14Logger.class.getName()));
+
+ Collection<ClassInfo> connectorFactories = indexBuildItem.getIndex()
+ .getAllKnownImplementors(DotName.createSimple(ConnectorFactory.class.getName()));
+
+ for (ClassInfo ci : connectorFactories) {
+ LOGGER.debug("Adding reflective class " + ci);
+ reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, ci.toString()));
+ }
+
+ for (Class c : BUILTIN_CONNECTOR_FACTORIES) {
+ reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, c));
+ }
+
+ Collection<ClassInfo> loadBalancers = indexBuildItem.getIndex()
+ .getAllKnownImplementors(DotName.createSimple(ConnectionLoadBalancingPolicy.class.getName()));
+
+ for (ClassInfo ci : loadBalancers) {
+ LOGGER.debug("Adding reflective class " + ci);
+ reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, ci.toString()));
+ }
+
+ for (Class c : BUILTIN_LOADBALANCING_POLICIES) {
+ reflectiveClass.produce(new ReflectiveClassBuildItem(false, false, c));
+ }
+ }
+
+ @BuildStep
+ void load(BuildProducer<AdditionalBeanBuildItem> additionalBean, BuildProducer<FeatureBuildItem> feature,
+ Optional<ArtemisJmsBuildItem> artemisJms) {
+
+ if (artemisJms.isPresent()) {
+ return;
+ }
+ feature.produce(new FeatureBuildItem(FeatureBuildItem.ARTEMIS_CORE));
+ additionalBean.produce(AdditionalBeanBuildItem.unremovableOf(ArtemisCoreProducer.class));
+ }
+
+ @Record(ExecutionTime.RUNTIME_INIT)
+ @BuildStep
+ void configure(ArtemisCoreRecorder recorder, ArtemisRuntimeConfig runtimeConfig,
+ BeanContainerBuildItem beanContainer, Optional<ArtemisJmsBuildItem> artemisJms) {
+
+ if (artemisJms.isPresent()) {
+ return;
+ }
+ recorder.setConfig(runtimeConfig, beanContainer.getValue());
+ }
+}
diff --git a/...core/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisJmsBuildItem.java b/...core/deployment/src/main/java/io/quarkus/artemis/core/deployment/ArtemisJmsBuildItem.java
@@ -0,0 +1,9 @@
+package io.quarkus.artemis.core.deployment;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+/**
+ * Marker build item indicating that JMS is enabled
+ */
+public final class ArtemisJmsBuildItem extends SimpleBuildItem {
+}
diff --git a/extensions/artemis-core/pom.xml b/extensions/artemis-core/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>quarkus-build-parent</artifactId>
+ <groupId>io.quarkus</groupId>
+ <version>999-SNAPSHOT</version>
+ <relativePath>../../build-parent/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>quarkus-artemis-core-parent</artifactId>
+ <name>Quarkus - Artemis - Core</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>deployment</module>
+ <module>runtime</module>
+ </modules>
+</project>
diff --git a/extensions/artemis-core/runtime/pom.xml b/extensions/artemis-core/runtime/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-artemis-core-parent</artifactId>
+ <version>999-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>quarkus-artemis-core</artifactId>
+ <name>Quarkus - Artemis - Core - Runtime</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-arc</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-netty</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-core-client</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.oracle.substratevm</groupId>
+ <artifactId>svm</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <!-- Mark this as a runtime dependency, so to make sure it's included on the final classpath during native-image -->
+ <plugins>
+ <plugin>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-extension-processor</artifactId>
+ <version>${project.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>