This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 2.7.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ece3f3f582f649c2d5f82c49dd6c26e0ca458206 Author: James Netherton <[email protected]> AuthorDate: Tue Apr 26 09:50:47 2022 +0100 Remove c3p0 from Quartz extension Fixes #3749 --- extensions/quartz/runtime/pom.xml | 9 ++-- .../quartz/graal/QuartzSubstitutions.java | 62 ++++++++++++++++++++++ pom.xml | 1 - poms/bom/pom.xml | 5 -- poms/bom/src/main/generated/flattened-full-pom.xml | 5 -- .../src/main/generated/flattened-reduced-pom.xml | 5 -- .../generated/flattened-reduced-verbose-pom.xml | 5 -- 7 files changed, 67 insertions(+), 25 deletions(-) diff --git a/extensions/quartz/runtime/pom.xml b/extensions/quartz/runtime/pom.xml index e72a88b6b4..8cfcee8f62 100644 --- a/extensions/quartz/runtime/pom.xml +++ b/extensions/quartz/runtime/pom.xml @@ -53,14 +53,15 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-quartz</artifactId> </dependency> - <dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-agroal</artifactId> </dependency> + <dependency> + <groupId>org.graalvm.nativeimage</groupId> + <artifactId>svm</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> diff --git a/extensions/quartz/runtime/src/main/java/org/apache/camel/quarkus/component/quartz/graal/QuartzSubstitutions.java b/extensions/quartz/runtime/src/main/java/org/apache/camel/quarkus/component/quartz/graal/QuartzSubstitutions.java new file mode 100644 index 0000000000..5cf282f74e --- /dev/null +++ b/extensions/quartz/runtime/src/main/java/org/apache/camel/quarkus/component/quartz/graal/QuartzSubstitutions.java @@ -0,0 +1,62 @@ +/* + * 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. + */ +package org.apache.camel.quarkus.component.quartz.graal; + +import java.io.ByteArrayOutputStream; +import java.sql.Blob; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.util.function.BooleanSupplier; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import org.quartz.impl.jdbcjobstore.CUBRIDDelegate; + +public final class QuartzSubstitutions { +} + +// Cuts out unwanted references to C3P0ProxyConnection if c3p0 not on the classpath +@TargetClass(value = CUBRIDDelegate.class, onlyWith = C3p0IsAbsent.class) +final class SubstituteCUBRIDDelegate { + @Substitute + protected void setBytes(PreparedStatement ps, int index, ByteArrayOutputStream baos) + throws SQLException { + + byte[] byteArray; + if (baos == null) { + byteArray = new byte[0]; + } else { + byteArray = baos.toByteArray(); + } + + Blob blob = ps.getConnection().createBlob(); + blob.setBytes(1, byteArray); + ps.setBlob(index, blob); + } +} + +final class C3p0IsAbsent implements BooleanSupplier { + @Override + public boolean getAsBoolean() { + try { + Thread.currentThread().getContextClassLoader().loadClass("com.mchange.v2.c3p0.C3P0ProxyConnection"); + return false; + } catch (ClassNotFoundException e) { + return true; + } + } +} diff --git a/pom.xml b/pom.xml index f96b4b1f3d..4c66387631 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,6 @@ <aws-java-sdk.version>1.11.714</aws-java-sdk.version> <azure-sdk-bom.version>1.0.5</azure-sdk-bom.version><!-- Keep in sync with camel-azure component versions --> <bouncycastle.version>1.70</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on --> - <c3p0.version>${c3p0-version}</c3p0.version> <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version> <commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core --> <commons-collections.version>3.2.2</commons-collections.version><!-- used by hbase, should be pretty stable as commons-collections are not developed actively anymore --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 6e2420801a..1426b4522f 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -9733,11 +9733,6 @@ <artifactId>core</artifactId> <version>${zxing.version}</version> </dependency> - <dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - <version>${c3p0.version}</version> - </dependency> <dependency> <groupId>com.orbitz.consul</groupId> <artifactId>consul-client</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 17b27512a1..0cde23ceb3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -9675,11 +9675,6 @@ <artifactId>core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.3.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>com.mchange</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>c3p0</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>0.9.5.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>com.orbitz.consul</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>consul-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1ee823456a..a4060469f8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9675,11 +9675,6 @@ <artifactId>core</artifactId> <version>3.3.3</version> </dependency> - <dependency> - <groupId>com.mchange</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.5.5</version> - </dependency> <dependency> <groupId>com.orbitz.consul</groupId> <artifactId>consul-client</artifactId> 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 1fd4626071..de1ae24114 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9675,11 +9675,6 @@ <artifactId>core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.3.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>com.mchange</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>c3p0</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>0.9.5.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>com.orbitz.consul</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>consul-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
