This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.27.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit cc12ed5ee27ff49634e275e54b83c28e61f9da5a Author: James Netherton <[email protected]> AuthorDate: Tue Nov 18 11:44:28 2025 +0000 Remove Derby database testing Fixes #7899 --- integration-tests/jpa/README.adoc | 1 - integration-tests/sql/README.adoc | 6 --- integration-tests/sql/pom.xml | 16 -------- .../quarkus/component/sql/it/SqlResource.java | 1 - .../storedproc/derby/NumberAddStoredProcedure.java | 32 ---------------- .../sql/src/main/resources/sql/derby/initDb.sql | 43 ---------------------- 6 files changed, 99 deletions(-) diff --git a/integration-tests/jpa/README.adoc b/integration-tests/jpa/README.adoc index 361dad7b0e..69426b67dc 100644 --- a/integration-tests/jpa/README.adoc +++ b/integration-tests/jpa/README.adoc @@ -17,7 +17,6 @@ Following databases could be started in the dev-service mode: - MySQL (container) - add `-Dcq.sqlJdbcKind=mysql` - MariaDB (container) - add `-Dcq.sqlJdbcKind=mariadb` - H2 (in-process) used by default -- Apache Derby (in-process) - add `-Dcq.sqlJdbcKind=derby` - DB2 (container) (requires license acceptance) - add `-Dcq.sqlJdbcKind=db2` - MSSQL (container) (requires license acceptance) - add `-Dcq.sqlJdbcKind=mssql` - Oracle (container) - add `-Dcq.sqlJdbcKind=oracle` diff --git a/integration-tests/sql/README.adoc b/integration-tests/sql/README.adoc index d11b9554ed..e1ca4fe12c 100644 --- a/integration-tests/sql/README.adoc +++ b/integration-tests/sql/README.adoc @@ -20,7 +20,6 @@ The following databases can be started in dev service mode: - MySQL (container) - add `-Dcq.sqlJdbcKind=mysql` - MariaDB (container) - add `-Dcq.sqlJdbcKind=mariadb` - H2 (in-process) used by default -- Apache Derby (container) - add `-Dcq.sqlJdbcKind=derby` - DB2 (container) (requires license acceptance) - add `-Dcq.sqlJdbcKind=db2` - MSSQL (container) (requires license acceptance) - add `-Dcq.sqlJdbcKind=mssql` - Oracle (container) - add `-Dcq.sqlJdbcKind=oracle` @@ -48,8 +47,3 @@ $Env:QUARKUS_DATASOURCE_JDBC_URL="#jdbc_url" $Env:QUARKUS_DATASOURCE_USERNAME="#username" $Env:QUARKUS_DATASOURCE_PASSWORD="#password" ---- - -=== External Derby database - -To avoid complexities around having to upload stored procedure JARs to the DB server, Apache Derby is always tested within a container. -Therefore, you should avoid setting `QUARKUS_DATASOURCE` environment variables for Derby. diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml index 96c0957b4a..817e16e7ee 100644 --- a/integration-tests/sql/pom.xml +++ b/integration-tests/sql/pom.xml @@ -182,21 +182,5 @@ </dependency> </dependencies> </profile> - <profile> - <id>derbyDevServiceWorkaround</id> - <activation> - <property> - <name>cq.sqlJdbcKind</name> - <value>derby</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-test-derby</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> </profiles> </project> diff --git a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java index 0c6af9c4f0..1b4c0b38ec 100644 --- a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java +++ b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlResource.java @@ -165,7 +165,6 @@ public class SqlResource { case "db2": case "mssql": case "oracle": - case "derby": case "mariadb": case "mysql": List<LinkedCaseInsensitiveMap> addNumsResults = producerTemplate.requestBody( diff --git a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/storedproc/derby/NumberAddStoredProcedure.java b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/storedproc/derby/NumberAddStoredProcedure.java deleted file mode 100644 index 9c454c9642..0000000000 --- a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/storedproc/derby/NumberAddStoredProcedure.java +++ /dev/null @@ -1,32 +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. - */ -package org.apache.camel.quarkus.component.sql.it.storedproc.derby; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -public class NumberAddStoredProcedure { - public static void addNumbers(int a, int b) throws SQLException { - String sql = "INSERT INTO ADD_NUMS_RESULTS (id, value) VALUES (1, " + (a + b) + ")"; - try (Connection con = DriverManager.getConnection("jdbc:default:connection"); - PreparedStatement ps = con.prepareStatement(sql)) { - ps.execute(); - } - } -} diff --git a/integration-tests/sql/src/main/resources/sql/derby/initDb.sql b/integration-tests/sql/src/main/resources/sql/derby/initDb.sql deleted file mode 100644 index 40f4617e9b..0000000000 --- a/integration-tests/sql/src/main/resources/sql/derby/initDb.sql +++ /dev/null @@ -1,43 +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. --- - -DROP TABLE camel -CREATE TABLE camel (id INT NOT NULL GENERATED ALWAYS AS IDENTITY,species VARCHAR(50) NOT NULL) - --- for consumer -DROP TABLE projectsViaClasspath -CREATE TABLE projectsViaClasspath (id INT NOT NULL, project VARCHAR(25), license VARCHAR(5), processed BOOLEAN, PRIMARY KEY (id)) -DROP TABLE projectsViaSql -CREATE TABLE projectsViaSql (id INT NOT NULL, project VARCHAR(25), license VARCHAR(5), processed BOOLEAN, PRIMARY KEY (id)) -DROP TABLE projectsViaFile -CREATE TABLE projectsViaFile (id INT NOT NULL, project VARCHAR(25), license VARCHAR(5), processed BOOLEAN, PRIMARY KEY (id)) - --- idempotent repo -DROP TABLE CAMEL_MESSAGEPROCESSED -CREATE TABLE CAMEL_MESSAGEPROCESSED ( processorName VARCHAR(255), messageId VARCHAR(100), createdAt TIMESTAMP ) - --- aggregation repo -DROP TABLE aggregation -CREATE TABLE aggregation (id VARCHAR(255) NOT NULL, exchange BLOB NOT NULL, version BIGINT NOT NULL, constraint aggregation_pk PRIMARY KEY (id)) -DROP TABLE aggregation_completed -CREATE TABLE aggregation_completed (id VARCHAR(255) NOT NULL, exchange BLOB NOT NULL, version BIGINT NOT NULL, constraint aggregation_completed_pk PRIMARY KEY (id)) - --- stored procedure -DROP TABLE ADD_NUMS_RESULTS -CREATE TABLE ADD_NUMS_RESULTS (id INT PRIMARY KEY, value INT NOT NULL) - -CREATE PROCEDURE ADD_NUMS(IN a INTEGER, IN b INTEGER) PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.apache.camel.quarkus.component.sql.it.storedproc.derby.NumberAddStoredProcedure.addNumbers'
