Skip to content

Commit

Permalink
Remove json/swagger stuff, make CI use J11
Browse files Browse the repository at this point in the history
  • Loading branch information
at055612 committed Jun 5, 2024
1 parent 2b88c4f commit 4305403
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 379 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ jobs:
# Set this so it gets the annotated commit, not the commit being tagged.
# Which means we can get the release msg
# See https://github.com/actions/runner/issues/712
ref: ${{ github.ref }}
ref: ${{ github.ref }}

- name: Setup Java
id: setup_java
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '8.0.312+7'
distribution: 'temurin'
java-version: '11.0.23+9'
cache: 'gradle'

# Make sure the wrapper jar has not been tampered with
- name: Validate gradle wrapper jar
id: validate_gradle_wrapper
uses: gradle/wrapper-validation-action@v1

# Set variables in github's special env file which are then automatically
# Set variables in github's special env file which are then automatically
# read into env vars in each subsequent step
- name: Set Environment Variables
id: set_env_var
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ The Javadoc for the latest release of the library is available [here](https://gc
This library requires Java 8 as a minimum.
The only dependencies it brings with it are:

* `javax.xml.bind:jaxb-api`
* `org.glassfish.jaxb:jaxb-runtime`
* `jakarta.xml.bind:jakarta.xml.bind-api`
* `com.sun.xml.bind:jaxb-impl`
* `org.slf4j:slf4j-api`

By default the created events are serialised to XML and passed to an SLF4J logger which would typically be linked to a rolling file appender.
Expand Down
8 changes: 1 addition & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,6 @@ ext.versions = [

ext.libs = [
assertj_core : "org.assertj:assertj-core:3.20.2",
classgraph : "io.github.classgraph:classgraph:4.8.146",
jackson_annotations : "com.fasterxml.jackson.core:jackson-annotations:2.13.3",
jackson_databind : "com.fasterxml.jackson.core:jackson-databind:2.13.3",
jakarta_servlet_api : "jakarta.servlet:jakarta.servlet-api:4.0.4",
jakarta_ws_rs_api : "jakarta.ws.rs:jakarta.ws.rs-api:2.1.6",
jaxb_api : "jakarta.xml.bind:jakarta.xml.bind-api:4.0.2",
jaxb_basics : "org.jvnet.jaxb2_commons:jaxb2-basics:0.12.0",
jaxb_rich_contract_plugin : "net.codesup.util:jaxb2-rich-contract-plugin:2.1.0",
Expand All @@ -194,8 +189,7 @@ ext.libs = [
mockito_core : "org.mockito:mockito-core:$versions.mockito",
mockito_junit_jupiter : "org.mockito:mockito-junit-jupiter:$versions.mockito",
saxon_he : "net.sf.saxon:Saxon-HE:9.7.0-21",
slf4j_api : "org.slf4j:slf4j-api:1.7.30",
swagger_annotations : "io.swagger.core.v3:swagger-annotations:$versions.swagger",
slf4j_api : "org.slf4j:slf4j-api:1.7.36",
]

// NOTE
Expand Down
6 changes: 0 additions & 6 deletions event-logging-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,13 @@ def schemaDir = project.file('schema')
archivesBaseName = "event-logging"

dependencies {
implementation libs.jackson_annotations
implementation libs.jackson_databind
compileOnly libs.jakarta_servlet_api
implementation libs.jakarta_ws_rs_api
implementation libs.jaxb_api
implementation libs.swagger_annotations
// The JAXB implementation required for event serialisation to XML
runtimeOnly libs.jaxb_impl

// The production code uses the SLF4J logging API at compile time
implementation libs.slf4j_api

testImplementation libs.classgraph
testImplementation(platform(libs.junit_bom))
testImplementation libs.junit_jupiter_api
testImplementation libs.junit_jupiter_params
Expand Down
26 changes: 0 additions & 26 deletions event-logging-api/openapi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions event-logging-base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,10 @@ dependencies {
implementation project(':event-logging-api')

// The production code uses the SLF4J logging API at compile time
implementation libs.jackson_annotations
implementation libs.jackson_databind
compileOnly libs.jakarta_servlet_api
implementation libs.jakarta_ws_rs_api
implementation libs.jaxb_api
implementation libs.slf4j_api
implementation libs.swagger_annotations
runtimeOnly libs.jaxb_impl

testImplementation libs.classgraph
testImplementation(platform(libs.junit_bom))
testImplementation libs.junit_jupiter_api
testImplementation libs.junit_jupiter_params
Expand Down
Loading

0 comments on commit 4305403

Please sign in to comment.