Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup dependecies & upgrade log4j #106

Merged
merged 3 commits into from
Jul 15, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Cleanup dependecies & upgrade log4j
stvoutsin committed Jul 11, 2024
commit cd564b7a4d9718a08539fa88d1b8c37e77ac0065
16 changes: 4 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -40,31 +40,23 @@ configurations {
}

dependencies {
implementation 'log4j:log4j:1.2.+'
implementation 'org.apache.logging.log4j:log4j-core:2.17.2'
implementation 'org.apache.logging.log4j:log4j-api:2.17.2'
implementation 'org.opencadc:cadc-adql:1.1.13'
implementation 'org.opencadc:cadc-cdp:1.3.7'
implementation 'org.opencadc:cadc-dali:1.2.17'
implementation 'org.opencadc:cadc-dali-pg:0.3.1'
implementation 'org.opencadc:cadc-gms:1.0.12'
implementation 'org.opencadc:cadc-jsqlparser-compat:0.6.5'
implementation 'org.opencadc:cadc-log:1.2.1'
implementation 'org.opencadc:cadc-registry:1.7.6'
implementation 'org.opencadc:cadc-rest:1.3.20'
implementation 'org.opencadc:cadc-tap:1.1.16'
implementation 'org.opencadc:cadc-tap-schema:1.1.32'
implementation 'org.opencadc:cadc-tap-server:1.1.23'
implementation 'org.opencadc:cadc-tap-server-pg:1.0.5'
implementation 'org.opencadc:cadc-tap-server-oracle:1.2.11'
implementation 'org.opencadc:cadc-util:1.10.6'
implementation 'org.opencadc:cadc-util:1.11.2'
implementation 'org.opencadc:cadc-uws:1.0.5'
implementation 'org.opencadc:cadc-uws-server:1.2.20'
implementation 'org.opencadc:cadc-tap-server:1.1.23'
implementation 'org.opencadc:cadc-vosi:1.4.4'
implementation 'org.opencadc:cadc-adql:1.1.13'
implementation 'org.opencadc:cadc-vosi:1.4.6'

// Switch out this to use any supported database instead of PostgreSQL.
// ## START CUSTOM DATABASE ##

implementation group: 'com.mysql', name: 'mysql-connector-j', version: '8.4.0'
implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
// ## END CUSTOM DATABASE ##
30 changes: 30 additions & 0 deletions changelog.d/20240711_051828_steliosvoutsinas_DM_45142.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!--
A new scriv changelog fragment.

Uncomment the section that is right (remove the HTML comment wrapper).
-->

<!--
### Backwards-incompatible changes

- A bullet item for the Backwards-incompatible changes category.

-->
<!--
### New features

- A bullet item for the New features category.

-->
<!--
### Bug fixes

- A bullet item for the Bug fixes category.

-->

### Other changes

- Remove unneeded cadc dependencies (issue with dali/stilts conflict)
- Upgrade log4j (Log4j vulnerability)