honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6056 drop derby jars (#6057) 

* Remove most of derby, add changelog

* Upgrade information

* Upgrade notes, bump to jdk17 version

* Fix issue#
This commit is contained in:
Tadgh 2024-07-08 15:50:17 -07:00 committed by GitHub
parent ef0aa11e00
commit fee1b75242
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 40 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hapi-deployable-pom/pom.xml
View File

@ -78,18 +78,6 @@
<groupId>com.google.code.findbugs</groupId> <groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId> <artifactId>annotations</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.checkerframework</groupId> <groupId>org.checkerframework</groupId>
<artifactId>checker-compat-qual</artifactId> <artifactId>checker-compat-qual</artifactId>

5
hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
View File

@ -84,11 +84,6 @@
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId> <artifactId>commons-cli</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/6056-drop-derby.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: remove
issue: 6056
title: "The Derby JARs have been removed from this release. The older versions have multiple high-severity vulnerabilities against them, and the newer versions force usage of Java 21, which HAPI-FHIR does not yet support.
If you wish to continue to use derby, you will have to provide the `derby`, `derbyclient`,`derbynet`, `derbyshared`, and `derbytools` jars on your classpath."

11
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/upgrade.md
View File

@ -1,3 +1,14 @@
## Derby JARs removed from HAPI-FHIR
As of Derby 17, in order to support JDK17, the jars must be built from source, as the default package supports JDK21. Due to a [high severity vulnerability](https://github.com/hapifhir/hapi-fhir/issues/5471) in older versions, and a lack of appetite to host
a forked packaged version of Derby, the Derby JARs have been removed from the HAPI-FHIR distribution. For those who wish to continue to use Derby, you may still do so, but the following jars must be manually added
to your classpath:
- [derby](https://mvnrepository.com/artifact/org.apache.derby/derby)
- [derbyclient](https://mvnrepository.com/artifact/org.apache.derby/derbyclient)
- [derbyshared](https://mvnrepository.com/artifact/org.apache.derby/derbyshared)
- [derbynet](https://mvnrepository.com/artifact/org.apache.derby/derbynet)
- [derbytools](https://mvnrepository.com/artifact/org.apache.derby/derbytools)
## Possible migration errors on SQL Server (MSSQL) ## Possible migration errors on SQL Server (MSSQL)
* This affects only clients running SQL Server (MSSQL) who have custom indexes on `HFJ_SPIDX` tables, which * This affects only clients running SQL Server (MSSQL) who have custom indexes on `HFJ_SPIDX` tables, which

4
hapi-fhir-jpaserver-elastic-test-utilities/pom.xml
View File

@ -67,10 +67,6 @@
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId> <artifactId>spring-boot-test</artifactId>

8
hapi-fhir-jpaserver-test-utilities/pom.xml
View File

@ -81,14 +81,6 @@
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
<artifactId>h2</artifactId> <artifactId>h2</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId> <artifactId>spring-boot-test</artifactId>

40
hapi-fhir-jpaserver-test-utilities/src/test/java/ca/uhn/fhir/jpa/migrate/taskdef/BaseTest.java
View File

@ -57,26 +57,26 @@ public abstract class BaseTest {
}); });
// Derby // Derby
retVal.add(new Supplier<TestDatabaseDetails>() { // retVal.add(new Supplier<TestDatabaseDetails>() {
@Override // @Override
public TestDatabaseDetails get() { // public TestDatabaseDetails get() {
String url = "jdbc:derby:memory:" + DATABASE_NAME + UUID.randomUUID() + ";create=true"; // String url = "jdbc:derby:memory:" + DATABASE_NAME + UUID.randomUUID() + ";create=true";
DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.DERBY_EMBEDDED.newConnectionProperties(url, "SA", "SA"); // DriverTypeEnum.ConnectionProperties connectionProperties = DriverTypeEnum.DERBY_EMBEDDED.newConnectionProperties(url, "SA", "SA");
BasicDataSource dataSource = new BasicDataSource(); // BasicDataSource dataSource = new BasicDataSource();
dataSource.setUrl(url); // dataSource.setUrl(url);
dataSource.setUsername("SA"); // dataSource.setUsername("SA");
dataSource.setPassword("SA"); // dataSource.setPassword("SA");
dataSource.setDriverClassName(DriverTypeEnum.DERBY_EMBEDDED.getDriverClassName()); // dataSource.setDriverClassName(DriverTypeEnum.DERBY_EMBEDDED.getDriverClassName());
HapiMigrator migrator = new HapiMigrator(SchemaMigrator.HAPI_FHIR_MIGRATION_TABLENAME, dataSource, DriverTypeEnum.DERBY_EMBEDDED); // HapiMigrator migrator = new HapiMigrator(SchemaMigrator.HAPI_FHIR_MIGRATION_TABLENAME, dataSource, DriverTypeEnum.DERBY_EMBEDDED);
return new TestDatabaseDetails(url, connectionProperties, dataSource, migrator); // return new TestDatabaseDetails(url, connectionProperties, dataSource, migrator);
} // }
//
@Override // @Override
public String toString() { // public String toString() {
return "Derby"; // return "Derby";
} // }
}); // });
//
return retVal.stream(); return retVal.stream();
} }

2
hapi-fhir-sql-migrate/pom.xml
View File

@ -54,11 +54,13 @@
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId> <artifactId>derby</artifactId>
<scope>test</scope> <scope>test</scope>
<version>10.16.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.derby</groupId> <groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId> <artifactId>derbytools</artifactId>
<scope>test</scope> <scope>test</scope>
<version>10.16.1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.postgresql</groupId> <groupId>org.postgresql</groupId>

28
pom.xml
View File

@ -969,8 +969,6 @@
<commons_io_version>2.11.0</commons_io_version> <commons_io_version>2.11.0</commons_io_version>
<commons_lang3_version>3.14.0</commons_lang3_version> <commons_lang3_version>3.14.0</commons_lang3_version>
<com_jamesmurty_utils_version>1.2</com_jamesmurty_utils_version> <com_jamesmurty_utils_version>1.2</com_jamesmurty_utils_version>
<!-- Note: Derby is held to 10.15.x deliberately, as the 10.17+ version requires Java 21 to build -->
<derby_version>10.15.2.0</derby_version>
<error_prone_core_version>2.23.0</error_prone_core_version> <error_prone_core_version>2.23.0</error_prone_core_version>
<mockito_version>5.8.0</mockito_version> <mockito_version>5.8.0</mockito_version>
<nullaway_version>0.7.9</nullaway_version> <nullaway_version>0.7.9</nullaway_version>
@ -1507,31 +1505,6 @@
<artifactId>commons-text</artifactId> <artifactId>commons-text</artifactId>
<version>${commons_text_version}</version> <version>${commons_text_version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby_version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${derby_version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${derby_version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyshared</artifactId>
<version>${derby_version}</version>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbytools</artifactId>
<version>${derby_version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
@ -2690,6 +2663,7 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<inherited>true</inherited> <inherited>true</inherited>
<version>${maven_checkstyle_version}</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>