This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9ee5136f9767000a78cffbffaec2a7c0cf33b9d8
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Aug 3 08:28:35 2020 +0100
Upgrade to Quarkus 1.8.0 - WIP
---
.../component/jpa/deployment/JpaProcessor.java | 24 +++++-----------------
pom.xml | 2 +-
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git
a/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
b/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
index 10be6fb..d2dc9bf 100644
---
a/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
+++
b/extensions/jpa/deployment/src/main/java/org/apache/camel/quarkus/component/jpa/deployment/JpaProcessor.java
@@ -16,16 +16,11 @@
*/
package org.apache.camel.quarkus.component.jpa.deployment;
-import java.util.List;
-
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
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.FeatureBuildItem;
-import io.quarkus.hibernate.orm.deployment.PersistenceUnitDescriptorBuildItem;
-import io.quarkus.hibernate.orm.runtime.DefaultEntityManagerFactoryProducer;
import org.apache.camel.component.jpa.JpaComponent;
import org.apache.camel.quarkus.component.jpa.CamelJpaRecorder;
import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem;
@@ -43,21 +38,12 @@ class JpaProcessor {
@BuildStep
void configureJpaComponentBean(
BuildProducer<CamelRuntimeBeanBuildItem> camelRuntimeBean,
- BuildProducer<AdditionalBeanBuildItem> additionalBeans,
- List<PersistenceUnitDescriptorBuildItem> descriptors,
CamelJpaRecorder recorder) {
- // If there's only 1 persistent unit, then auto configure the JPA
component with the EntityManagerFactory
- if (descriptors.size() == 1) {
- // Set DefaultEntityManagerFactoryProducer as unremovable as
there's no hard requirement for Camel users to @Inject EntityManagerFactory
- AdditionalBeanBuildItem bean =
AdditionalBeanBuildItem.unremovableOf(DefaultEntityManagerFactoryProducer.class);
- additionalBeans.produce(bean);
-
- camelRuntimeBean.produce(
- new CamelRuntimeBeanBuildItem(
- "jpa",
- JpaComponent.class.getName(),
- recorder.createJpaComponent()));
- }
+ camelRuntimeBean.produce(
+ new CamelRuntimeBeanBuildItem(
+ "jpa",
+ JpaComponent.class.getName(),
+ recorder.createJpaComponent()));
}
}
diff --git a/pom.xml b/pom.xml
index 2d8efb4..a6095be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
<kotlin.version>1.3.72</kotlin.version>
<okhttp.version>3.14.6</okhttp.version><!-- keep in sync with okio -->
<okio.version>1.17.2</okio.version><!-- keep in sync with okhttp -->
- <quarkus.version>1.7.1.Final</quarkus.version>
+ <quarkus.version>999-SNAPSHOT</quarkus.version>
<quarkus-qpid-jms.version>0.17.0</quarkus-qpid-jms.version>
<protobuf.version>3.11.1</protobuf.version>
<retrofit.version>2.5.0</retrofit.version>
