You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/01/09 08:17:13 UTC
(camel-quarkus) branch quarkus-main updated (5f088c4e47 -> 11ea040e29)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 5f088c4e47 Workaround BigQuery & Apache Arrow Netty imcompatibilities #5641
new 0d7c8c1cf9 Revert "Set io.netty.tryReflectionSetAccessible=false for jfr & google-bigquery native modules #5603"
new 11ea040e29 Exclude redundant kubernetes-client dependencies
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:
integration-tests/camel-k-runtime/pom.xml | 5 -----
.../src/main/resources/application.properties | 19 -------------------
.../jfr/src/main/resources/application.properties | 3 ---
integration-tests/kubernetes/pom.xml | 5 -----
integration-tests/master-openshift/pom.xml | 6 ------
poms/bom/pom.xml | 12 ++++++++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++++++++++++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++++++++++++
.../main/generated/flattened-reduced-verbose-pom.xml | 12 ++++++++++++
9 files changed, 48 insertions(+), 38 deletions(-)
delete mode 100644 integration-tests/google-bigquery/src/main/resources/application.properties
(camel-quarkus) 02/02: Exclude redundant kubernetes-client dependencies
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 11ea040e29cc7e6362e49ec56e0ebbc478fbedab
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jan 9 08:16:16 2024 +0000
Exclude redundant kubernetes-client dependencies
Fixes #5515
---
integration-tests/camel-k-runtime/pom.xml | 5 -----
integration-tests/kubernetes/pom.xml | 5 -----
integration-tests/master-openshift/pom.xml | 6 ------
poms/bom/pom.xml | 12 ++++++++++++
poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++++++++++++
poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++++++++++++
.../bom/src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++++++++++++
7 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/integration-tests/camel-k-runtime/pom.xml b/integration-tests/camel-k-runtime/pom.xml
index fadacdd0fc..c64174cb5e 100644
--- a/integration-tests/camel-k-runtime/pom.xml
+++ b/integration-tests/camel-k-runtime/pom.xml
@@ -30,11 +30,6 @@
<name>Camel Quarkus :: Integration Tests :: Camel K Runtime</name>
<description>Integration tests for Camel Quarkus K Runtime extension</description>
- <properties>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
- <ci.native.tests.skip>true</ci.native.tests.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/kubernetes/pom.xml b/integration-tests/kubernetes/pom.xml
index 0b9cdc892f..73b2bf3383 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -30,11 +30,6 @@
<name>Camel Quarkus :: Integration Tests :: Kubernetes</name>
<description>Integration tests for Camel Quarkus Kubernetes extension</description>
- <properties>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
- <ci.native.tests.skip>true</ci.native.tests.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/master-openshift/pom.xml b/integration-tests/master-openshift/pom.xml
index 3bb0e84ac1..c2062da9f2 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -30,12 +30,6 @@
<name>Camel Quarkus :: Integration Tests :: Master With OpenShift</name>
<description>Integration tests for Camel Quarkus Master extension with OpenShift</description>
- <properties>
- <quarkus.runner>${project.build.directory}/quarkus-app/quarkus-run.jar</quarkus.runner>
- <!-- TODO: https://github.com/apache/camel-quarkus/issues/5515 -->
- <ci.native.tests.skip>true</ci.native.tests.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 0f6ba05436..824c129ff1 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1679,6 +1679,18 @@
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-httpclient-okhttp</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-model-hive</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-model-miscellaneous</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-model-operator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index b0de068714..35a47a5931 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1617,6 +1617,18 @@
<groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kubernetes-httpclient-okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>openshift-model-hive</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>openshift-model-miscellaneous</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>openshift-model-operator</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 567df342f0..b338d60474 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1617,6 +1617,18 @@
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-httpclient-okhttp</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-model-hive</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-model-miscellaneous</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId>
+ <artifactId>openshift-model-operator</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index bd9c381732..2b88b8db62 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -1617,6 +1617,18 @@
<groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>kubernetes-httpclient-okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>openshift-model-hive</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>openshift-model-miscellaneous</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
+ <exclusion>
+ <groupId>io.fabric8</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <artifactId>openshift-model-operator</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ </exclusion>
</exclusions>
</dependency>
<dependency>
(camel-quarkus) 01/02: Revert "Set io.netty.tryReflectionSetAccessible=false for jfr & google-bigquery native modules #5603"
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0d7c8c1cf9f2a0444b40e6eb31841d136a9ae7c0
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Jan 9 07:42:58 2024 +0000
Revert "Set io.netty.tryReflectionSetAccessible=false for jfr & google-bigquery native modules #5603"
This reverts commit fe111eebcb11d94695119c4f69870eff00cb9922.
Fixes #5603
---
.../src/main/resources/application.properties | 19 -------------------
.../jfr/src/main/resources/application.properties | 3 ---
2 files changed, 22 deletions(-)
diff --git a/integration-tests/google-bigquery/src/main/resources/application.properties b/integration-tests/google-bigquery/src/main/resources/application.properties
deleted file mode 100644
index ef07b35318..0000000000
--- a/integration-tests/google-bigquery/src/main/resources/application.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-## ---------------------------------------------------------------------------
-## 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.
-## ---------------------------------------------------------------------------
-
-# TODO: https://github.com/apache/camel-quarkus/issues/5603
-quarkus.native.additional-build-args=-Dio.netty.tryReflectionSetAccessible=false
diff --git a/integration-tests/jfr/src/main/resources/application.properties b/integration-tests/jfr/src/main/resources/application.properties
index 813280f78d..7805738045 100644
--- a/integration-tests/jfr/src/main/resources/application.properties
+++ b/integration-tests/jfr/src/main/resources/application.properties
@@ -17,6 +17,3 @@
# Must enable VM inspection for JFR in native mode
quarkus.native.monitoring=jfr
-
-# TODO: https://github.com/apache/camel-quarkus/issues/5603
-quarkus.native.additional-build-args=-Dio.netty.tryReflectionSetAccessible=false