You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/02/18 16:22:59 UTC
[camel-quarkus] branch master updated (38fe5c0 -> d0e437f)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 38fe5c0 Merge pull request #732 from apache/jenkinsfiles
new 6225dce chore: Remove redundant quarkus-maven-plugin exection from native profile
new d0e437f Fix olingo4 tests for native mode
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../olingo4/deployment/Olingo4Processor.java | 22 +++++----------------
integration-tests/validator/pom.xml | 23 ----------------------
2 files changed, 5 insertions(+), 40 deletions(-)
[camel-quarkus] 01/02: chore: Remove redundant quarkus-maven-plugin
exection from native profile
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6225dcedd2289978e8487507a8ae2c9c7424399b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Feb 18 14:03:56 2020 +0000
chore: Remove redundant quarkus-maven-plugin exection from native profile
---
integration-tests/validator/pom.xml | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/integration-tests/validator/pom.xml b/integration-tests/validator/pom.xml
index e038697..d6d8283 100644
--- a/integration-tests/validator/pom.xml
+++ b/integration-tests/validator/pom.xml
@@ -113,29 +113,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>io.quarkus</groupId>
- <artifactId>quarkus-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>native-image</id>
-
- <goals>
- <goal>native-image</goal>
- </goals>
- <configuration>
- <reportErrorsAtRuntime>false</reportErrorsAtRuntime>
- <cleanupServer>true</cleanupServer>
- <enableHttpsUrlHandler>true</enableHttpsUrlHandler>
- <enableServer>false</enableServer>
- <dumpProxies>false</dumpProxies>
- <graalvmHome>${graalvmHome}</graalvmHome>
- <enableAllSecurityServices>true</enableAllSecurityServices>
- <disableReports>true</disableReports>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
[camel-quarkus] 02/02: Fix olingo4 tests for native mode
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d0e437f63cc32421dd07779bdc152066cddc1cfb
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Feb 18 14:49:26 2020 +0000
Fix olingo4 tests for native mode
---
.../olingo4/deployment/Olingo4Processor.java | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java b/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
index 967394f..9c6c2a2 100644
--- a/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
+++ b/extensions/olingo4/deployment/src/main/java/org/apache/camel/quarkus/component/olingo4/deployment/Olingo4Processor.java
@@ -20,19 +20,16 @@ import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.AdditionalApplicationArchiveMarkerBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import org.apache.camel.component.olingo4.Olingo4AppEndpointConfiguration;
import org.apache.camel.quarkus.core.deployment.UnbannedReflectiveBuildItem;
import org.apache.olingo.server.core.ODataImpl;
-import org.jboss.jandex.DotName;
-import org.jboss.jandex.IndexView;
class Olingo4Processor {
private static final String FEATURE = "camel-olingo4";
- private static final DotName JSON_DESERIALIZE_DOT_NAME = DotName
- .createSimple("com.fasterxml.jackson.databind.annotation.JsonDeserialize");
@BuildStep
FeatureBuildItem feature() {
@@ -54,19 +51,10 @@ class Olingo4Processor {
void registerForReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, CombinedIndexBuildItem combinedIndex) {
reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, ODataImpl.class));
reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, Olingo4AppEndpointConfiguration.class));
+ }
- /*
- * Register Olingo Deserializer classes for reflection. We do this because the Quarkus Jackson extension only
- * configures reflection where the 'using' annotation value is applied to fields & methods.
- *
- * TODO: Remove this when the Quarkus Jackson extension has this enhancement - https://github.com/quarkusio/quarkus/issues/7139
- */
- IndexView index = combinedIndex.getIndex();
- index.getAnnotations(JSON_DESERIALIZE_DOT_NAME)
- .stream()
- .map(annotation -> annotation.value("using").asClass().name().toString())
- .filter(className -> className.startsWith("org.apache.olingo"))
- .map(className -> new ReflectiveClassBuildItem(true, false, false, className))
- .forEach(reflectiveClass::produce);
+ @BuildStep
+ ExtensionSslNativeSupportBuildItem activateSslNativeSupport() {
+ return new ExtensionSslNativeSupportBuildItem(FEATURE);
}
}