Skip to content

Commit f478ce9

Browse files
gsmetgsmet
authored
Merge pull request quarkusio#50715 from gastaldi/delete_derby
Remove Apache Derby
2 parents edb9c9f + 206858a commit f478ce9

File tree

53 files changed

+10
-1589
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+10
-1589
lines changed

‎.github/dependabot.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ updates:
4848
- dependency-name: org.postgresql:postgresql
4949
- dependency-name: org.mariadb.jdbc:mariadb-java-client
5050
- dependency-name: com.mysql:mysql-connector-j
51-
- dependency-name: org.apache.derby:*
5251
- dependency-name: com.ibm.db2:jcc
5352
# Kafka
5453
- dependency-name: org.apache.kafka:*

‎.github/native-tests.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{
1010
"category": "Data1",
1111
"timeout": 95,
12-
"test-modules": "jpa-h2, jpa-h2-embedded, jpa-mariadb, jpa-mssql, jpa-derby, jpa-without-entity, hibernate-orm-tenancy/datasource, hibernate-orm-tenancy/connection-resolver, hibernate-orm-tenancy/connection-resolver-legacy-qualifiers",
12+
"test-modules": "jpa-h2, jpa-h2-embedded, jpa-mariadb, jpa-mssql, jpa-without-entity, hibernate-orm-tenancy/datasource, hibernate-orm-tenancy/connection-resolver, hibernate-orm-tenancy/connection-resolver-legacy-qualifiers",
1313
"os-name": "ubuntu-latest"
1414
},
1515
{

‎bom/application/pom.xml‎

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<mssql-jdbc.version>13.2.1.jre11</mssql-jdbc.version>
127127
<adal4j.version>1.6.7</adal4j.version>
128128
<oracle-jdbc.version>23.6.0.24.10</oracle-jdbc.version>
129-
<derby-jdbc.version>10.16.1.1</derby-jdbc.version>
130129
<db2-jdbc.version>12.1.0.0</db2-jdbc.version>
131130
<shrinkwrap.version>1.2.6</shrinkwrap.version>
132131
<hamcrest.version>2.2</hamcrest.version><!-- The version needs to be compatible with both REST Assured and Awaitility -->
@@ -935,11 +934,6 @@
935934
<artifactId>quarkus-devservices-mariadb</artifactId>
936935
<version>${project.version}</version>
937936
</dependency>
938-
<dependency>
939-
<groupId>io.quarkus</groupId>
940-
<artifactId>quarkus-devservices-derby</artifactId>
941-
<version>${project.version}</version>
942-
</dependency>
943937
<dependency>
944938
<groupId>io.quarkus</groupId>
945939
<artifactId>quarkus-devservices-db2</artifactId>
@@ -1310,16 +1304,6 @@
13101304
<artifactId>quarkus-flyway-mssql-deployment</artifactId>
13111305
<version>${project.version}</version>
13121306
</dependency>
1313-
<dependency>
1314-
<groupId>io.quarkus</groupId>
1315-
<artifactId>quarkus-flyway-derby</artifactId>
1316-
<version>${project.version}</version>
1317-
</dependency>
1318-
<dependency>
1319-
<groupId>io.quarkus</groupId>
1320-
<artifactId>quarkus-flyway-derby-deployment</artifactId>
1321-
<version>${project.version}</version>
1322-
</dependency>
13231307
<dependency>
13241308
<groupId>io.quarkus</groupId>
13251309
<artifactId>quarkus-flyway-db2</artifactId>
@@ -1380,16 +1364,6 @@
13801364
<artifactId>quarkus-hibernate-orm-deployment</artifactId>
13811365
<version>${project.version}</version>
13821366
</dependency>
1383-
<dependency>
1384-
<groupId>io.quarkus</groupId>
1385-
<artifactId>quarkus-hibernate-orm-derby</artifactId>
1386-
<version>${project.version}</version>
1387-
</dependency>
1388-
<dependency>
1389-
<groupId>io.quarkus</groupId>
1390-
<artifactId>quarkus-hibernate-orm-derby-deployment</artifactId>
1391-
<version>${project.version}</version>
1392-
</dependency>
13931367
<dependency>
13941368
<groupId>io.quarkus</groupId>
13951369
<artifactId>quarkus-hibernate-envers</artifactId>
@@ -1730,16 +1704,6 @@
17301704
<artifactId>quarkus-jdbc-oracle-deployment</artifactId>
17311705
<version>${project.version}</version>
17321706
</dependency>
1733-
<dependency>
1734-
<groupId>io.quarkus</groupId>
1735-
<artifactId>quarkus-jdbc-derby</artifactId>
1736-
<version>${project.version}</version>
1737-
</dependency>
1738-
<dependency>
1739-
<groupId>io.quarkus</groupId>
1740-
<artifactId>quarkus-jdbc-derby-deployment</artifactId>
1741-
<version>${project.version}</version>
1742-
</dependency>
17431707
<dependency>
17441708
<groupId>io.quarkus</groupId>
17451709
<artifactId>quarkus-jms-spi-deployment</artifactId>
@@ -3624,11 +3588,6 @@
36243588
<artifactId>quarkus-test-ldap</artifactId>
36253589
<version>${project.version}</version>
36263590
</dependency>
3627-
<dependency>
3628-
<groupId>io.quarkus</groupId>
3629-
<artifactId>quarkus-test-derby</artifactId>
3630-
<version>${project.version}</version>
3631-
</dependency>
36323591
<dependency>
36333592
<groupId>io.quarkus</groupId>
36343593
<artifactId>quarkus-test-kubernetes-client</artifactId>
@@ -5683,27 +5642,6 @@
56835642
</exclusion>
56845643
</exclusions>
56855644
</dependency>
5686-
<dependency>
5687-
<!-- New artifact in Derby 10.15: https://db.apache.org/derby/releases/release-10.15.1.3.cgi#Note%20for%20DERBY-6945 -->
5688-
<groupId>org.apache.derby</groupId>
5689-
<artifactId>derbyshared</artifactId>
5690-
<version>${derby-jdbc.version}</version>
5691-
</dependency>
5692-
<dependency>
5693-
<groupId>org.apache.derby</groupId>
5694-
<artifactId>derbyclient</artifactId>
5695-
<version>${derby-jdbc.version}</version>
5696-
</dependency>
5697-
<dependency>
5698-
<groupId>org.apache.derby</groupId>
5699-
<artifactId>derbynet</artifactId>
5700-
<version>${derby-jdbc.version}</version>
5701-
</dependency>
5702-
<dependency>
5703-
<groupId>org.apache.derby</groupId>
5704-
<artifactId>derbytools</artifactId>
5705-
<version>${derby-jdbc.version}</version>
5706-
</dependency>
57075645
<dependency>
57085646
<groupId>com.ibm.db2</groupId>
57095647
<artifactId>jcc</artifactId>
@@ -6170,11 +6108,6 @@
61706108
<artifactId>flyway-database-db2</artifactId>
61716109
<version>${flyway.version}</version>
61726110
</dependency>
6173-
<dependency>
6174-
<groupId>org.flywaydb</groupId>
6175-
<artifactId>flyway-database-derby</artifactId>
6176-
<version>${flyway.version}</version>
6177-
</dependency>
61786111
<dependency>
61796112
<groupId>org.flywaydb</groupId>
61806113
<artifactId>flyway-database-mongodb</artifactId>

‎core/deployment/src/main/java/io/quarkus/deployment/Feature.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ public enum Feature {
4343
INFINISPAN_CLIENT,
4444
INFINISPAN_EMBEDDED,
4545
JDBC_DB2,
46-
JDBC_DERBY,
4746
JDBC_H2,
4847
JDBC_POSTGRESQL,
4948
JDBC_MARIADB,

‎devtools/bom-descriptor-json/pom.xml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -700,19 +700,6 @@
700700
</exclusion>
701701
</exclusions>
702702
</dependency>
703-
<dependency>
704-
<groupId>io.quarkus</groupId>
705-
<artifactId>quarkus-flyway-derby</artifactId>
706-
<version>${project.version}</version>
707-
<type>pom</type>
708-
<scope>test</scope>
709-
<exclusions>
710-
<exclusion>
711-
<groupId>*</groupId>
712-
<artifactId>*</artifactId>
713-
</exclusion>
714-
</exclusions>
715-
</dependency>
716703
<dependency>
717704
<groupId>io.quarkus</groupId>
718705
<artifactId>quarkus-flyway-mssql</artifactId>
@@ -921,19 +908,6 @@
921908
</exclusion>
922909
</exclusions>
923910
</dependency>
924-
<dependency>
925-
<groupId>io.quarkus</groupId>
926-
<artifactId>quarkus-hibernate-orm-derby</artifactId>
927-
<version>${project.version}</version>
928-
<type>pom</type>
929-
<scope>test</scope>
930-
<exclusions>
931-
<exclusion>
932-
<groupId>*</groupId>
933-
<artifactId>*</artifactId>
934-
</exclusion>
935-
</exclusions>
936-
</dependency>
937911
<dependency>
938912
<groupId>io.quarkus</groupId>
939913
<artifactId>quarkus-hibernate-orm-panache</artifactId>
@@ -1220,19 +1194,6 @@
12201194
</exclusion>
12211195
</exclusions>
12221196
</dependency>
1223-
<dependency>
1224-
<groupId>io.quarkus</groupId>
1225-
<artifactId>quarkus-jdbc-derby</artifactId>
1226-
<version>${project.version}</version>
1227-
<type>pom</type>
1228-
<scope>test</scope>
1229-
<exclusions>
1230-
<exclusion>
1231-
<groupId>*</groupId>
1232-
<artifactId>*</artifactId>
1233-
</exclusion>
1234-
</exclusions>
1235-
</dependency>
12361197
<dependency>
12371198
<groupId>io.quarkus</groupId>
12381199
<artifactId>quarkus-jdbc-h2</artifactId>

‎devtools/bom-descriptor-json/src/main/resources/catalog-overrides.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
"io.quarkus:quarkus-jdbc-h2",
4747
"io.quarkus:quarkus-jdbc-mssql",
4848
"io.quarkus:quarkus-jdbc-db2",
49-
"io.quarkus:quarkus-jdbc-derby",
5049
"io.quarkus:quarkus-jdbc-oracle"
5150
]
5251
}

‎docs/pom.xml‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -664,19 +664,6 @@
664664
</exclusion>
665665
</exclusions>
666666
</dependency>
667-
<dependency>
668-
<groupId>io.quarkus</groupId>
669-
<artifactId>quarkus-flyway-derby-deployment</artifactId>
670-
<version>${project.version}</version>
671-
<type>pom</type>
672-
<scope>test</scope>
673-
<exclusions>
674-
<exclusion>
675-
<groupId>*</groupId>
676-
<artifactId>*</artifactId>
677-
</exclusion>
678-
</exclusions>
679-
</dependency>
680667
<dependency>
681668
<groupId>io.quarkus</groupId>
682669
<artifactId>quarkus-flyway-mssql-deployment</artifactId>
@@ -885,19 +872,6 @@
885872
</exclusion>
886873
</exclusions>
887874
</dependency>
888-
<dependency>
889-
<groupId>io.quarkus</groupId>
890-
<artifactId>quarkus-hibernate-orm-derby-deployment</artifactId>
891-
<version>${project.version}</version>
892-
<type>pom</type>
893-
<scope>test</scope>
894-
<exclusions>
895-
<exclusion>
896-
<groupId>*</groupId>
897-
<artifactId>*</artifactId>
898-
</exclusion>
899-
</exclusions>
900-
</dependency>
901875
<dependency>
902876
<groupId>io.quarkus</groupId>
903877
<artifactId>quarkus-hibernate-orm-panache-deployment</artifactId>
@@ -1184,19 +1158,6 @@
11841158
</exclusion>
11851159
</exclusions>
11861160
</dependency>
1187-
<dependency>
1188-
<groupId>io.quarkus</groupId>
1189-
<artifactId>quarkus-jdbc-derby-deployment</artifactId>
1190-
<version>${project.version}</version>
1191-
<type>pom</type>
1192-
<scope>test</scope>
1193-
<exclusions>
1194-
<exclusion>
1195-
<groupId>*</groupId>
1196-
<artifactId>*</artifactId>
1197-
</exclusion>
1198-
</exclusions>
1199-
</dependency>
12001161
<dependency>
12011162
<groupId>io.quarkus</groupId>
12021163
<artifactId>quarkus-jdbc-h2-deployment</artifactId>

‎docs/src/main/asciidoc/cli-tooling.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@ JDBC Driver - MariaDB quarkus-jdbc-mariadb
461461
JDBC Driver - Microsoft SQL Server quarkus-jdbc-mssql
462462
JDBC Driver - MySQL quarkus-jdbc-mysql
463463
JDBC Driver - Oracle quarkus-jdbc-oracle
464-
JDBC Driver - Derby quarkus-jdbc-derby
465464
Elytron Security JDBC quarkus-elytron-security-jdbc
466465
Agroal - Database connection pool quarkus-agroal
467466
----

‎docs/src/main/asciidoc/databases-dev-services.adoc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,13 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
77
:categories: data, tooling
88
include::_attributes.adoc[]
99
:topics: dev-services,data,database,datasource,dev-mode,testing
10-
:extensions: io.quarkus:quarkus-agroal,io.quarkus:quarkus-reactive-mysql-client,io.quarkus:quarkus-reactive-oracle-client,io.quarkus:quarkus-reactive-pg-client,io.quarkus:quarkus-jdbc-db2,io.quarkus:quarkus-jdbc-derby,io.quarkus:quarkus-jdbc-h2,io.quarkus:quarkus-jdbc-mariadb,io.quarkus:quarkus-jdbc-mssql,io.quarkus:quarkus-jdbc-mysql,io.quarkus:quarkus-jdbc-oracle,io.quarkus:quarkus-jdbc-postgresql
10+
:extensions: io.quarkus:quarkus-agroal,io.quarkus:quarkus-reactive-mysql-client,io.quarkus:quarkus-reactive-oracle-client,io.quarkus:quarkus-reactive-pg-client,io.quarkus:quarkus-jdbc-db2,io.quarkus:quarkus-jdbc-h2,io.quarkus:quarkus-jdbc-mariadb,io.quarkus:quarkus-jdbc-mssql,io.quarkus:quarkus-jdbc-mysql,io.quarkus:quarkus-jdbc-oracle,io.quarkus:quarkus-jdbc-postgresql
1111

1212
When testing or running in dev mode Quarkus can provide you with a zero-config database out of the box, a feature we refer to as Dev Services.
1313
Depending on your database type you may need Docker installed in order to use this feature.
1414
Dev Services is supported for the following databases:
1515

1616
* DB2 (container) (requires <<#license_acceptance,license acceptance>>)
17-
* Derby (in-process)
1817
* H2 (in-process)
1918
* MariaDB (container)
2019
* Microsoft SQL Server (container) (requires <<#license_acceptance,license acceptance>>)
@@ -43,7 +42,7 @@ quarkus.devservices.enabled=false
4342
quarkus.datasource.devservices.enabled=false
4443
----
4544

46-
Dev Services for databases relies on Docker to start the server (except for H2 and Derby which are run in process).
45+
Dev Services for databases relies on Docker to start the server (except for H2 which is run in process).
4746
If your environment does not support Docker, you will need to start the server manually, or connect to an already running server.
4847

4948
[[license_acceptance]]
@@ -90,7 +89,7 @@ Quarkus will (by default) stop all database Dev Services.
9089
[[reuse-across-executions]]
9190
=== Reusing Dev Service containers across runs
9291

93-
Assuming you rely on Dev Services based on containers (unlike H2 or Derby),
92+
Assuming you rely on Dev Services based on containers (unlike H2),
9493
if you want to keep Dev Service containers running *after a dev mode session or test suite execution*
9594
to reuse them in the next dev mode session or test suite execution,
9695
this is possible as well.

0 commit comments

Comments
 (0)