Skip to content

Commit

Permalink
5.0.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Interlok Dev committed Jul 2, 2024
2 parents de37420 + 4526a39 commit 46f1e55
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
name: Gradle Check
uses: interlok-tooling/reusable-workflows/.github/workflows/gradle-check.yml@main

SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ jobs:
secrets:
NEXUS_REPO_PASSWORD: ${{ secrets.NEXUS_REPO_PASSWORD }}
TEAMS_IDN_WH_URL: ${{ secrets.TEAMS_IDN_WH_URL }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand Down
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import org.apache.tools.ant.taskdefs.condition.Os
plugins {
// Manage optional dependencies in maven pom.
id "nebula.optional-base" version "7.0.0" apply false
id "com.github.spotbugs" version "6.0.6" apply false
id "com.github.spotbugs" version "6.0.14" apply false
id "org.sonarqube" version "4.4.1.3373"
id "org.owasp.dependencycheck" version "9.0.8" apply false
id "io.freefair.lombok" version "8.4" apply false
id "org.owasp.dependencycheck" version "9.0.10" apply false
id "io.freefair.lombok" version "8.6" apply false
}

ext {
Expand All @@ -25,9 +25,9 @@ ext {
componentName='Interlok Elasticsearch'
organizationName = "Adaptris Ltd"
organizationUrl = "http://interlok.adaptris.net"
slf4jVersion = '2.0.11'
log4jVersion = '2.22.1'
junitJupiterVersion = '5.10.1'
slf4jVersion = '2.0.13'
log4jVersion = '2.23.1'
junitJupiterVersion = '5.10.2'
mockitoVersion = '5.2.0'
}

Expand Down Expand Up @@ -151,9 +151,9 @@ subprojects {
api ("com.adaptris:interlok-common:$interlokCoreVersion") { changing= true}
implementation ("org.yaml:snakeyaml:2.2")
implementation ("org.slf4j:slf4j-api:$slf4jVersion")
implementation ("com.jayway.jsonpath:json-path:2.8.0")
implementation ("com.jayway.jsonpath:json-path:2.9.0")
implementation ("commons-collections:commons-collections:3.2.2")
implementation ("joda-time:joda-time:2.12.6")
implementation ("joda-time:joda-time:2.12.7")
implementation ("org.apache.logging.log4j:log4j-core:$log4jVersion")
implementation ("org.apache.logging.log4j:log4j-api:$log4jVersion")
testAnnotationProcessor ("com.adaptris:interlok-core-apt:$interlokCoreVersion") {changing= true}
Expand Down
8 changes: 4 additions & 4 deletions interlok-elastic-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ ext {
componentName='Interlok Storage/Elastic: Common'
componentDesc="Elasticsearch components that are not transport specific"
delombokTargetDir = new File("${project.projectDir}/src/main/generated")
elasticVersion = '7.17.16'
jacksonVersion = '2.16.1'
elasticVersion = '7.17.20'
jacksonVersion = '2.17.1'
}

dependencies {
api ("com.adaptris:interlok-json:$interlokCoreVersion") { changing=true}
api ("com.adaptris:interlok-csv:$interlokCoreVersion") { changing=true}
// INTERLOK-3559 since we removed apache-csv out of interlok-csv it's
// a bigger deal to remove it out of elastic
api("org.apache.commons:commons-csv:1.10.0")
api("org.apache.commons:commons-csv:1.11.0")
api("net.sf.supercsv:super-csv:2.4.0")

implementation ("org.elasticsearch:elasticsearch:$elasticVersion") {
exclude group: "org.yaml", module: "snakeyaml"
exclude group: "org.apache.logging.log4j", module:"log4j-api"
}
implementation ("org.apache.lucene:lucene-core:9.9.1")
implementation ("org.apache.lucene:lucene-core:9.10.0")
implementation ("org.elasticsearch:elasticsearch-x-content:$elasticVersion")
// Dependency to platform/BOM
implementation (platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion"))
Expand Down
6 changes: 3 additions & 3 deletions interlok-elastic-rest/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ ext {
componentName='Interlok Storage/Elastic: REST Client'
componentDesc="Producing to Elasticsearch using their REST api"
delombokTargetDir = new File("${project.projectDir}/src/main/generated")
elasticVersion = '7.17.16'
jacksonVersion = '2.16.1'
elasticVersion = '7.17.20'
jacksonVersion = '2.17.1'
}

dependencies {
Expand All @@ -21,7 +21,7 @@ dependencies {
}
implementation ("org.elasticsearch:elasticsearch-x-content:$elasticVersion")

implementation ("commons-codec:commons-codec:1.16.0")
implementation ("commons-codec:commons-codec:1.17.0")
implementation ("org.apache.httpcomponents:httpclient:4.5.14")
// Dependency to platform/BOM
implementation (platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion"))
Expand Down
6 changes: 3 additions & 3 deletions interlok-elastic-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ ext {
componentName='Interlok Storage/Elastic: SDK Client'
componentDesc="Producing to Elasticsearch using their SDK"
delombokTargetDir = new File("${project.projectDir}/src/main/generated")
elasticVersion = '7.17.16'
jacksonVersion = '2.16.1'
elasticVersion = '7.17.20'
jacksonVersion = '2.17.1'
}

dependencies {
Expand All @@ -17,7 +17,7 @@ dependencies {
implementation ("org.elasticsearch:elasticsearch-x-content:$elasticVersion")
implementation ("org.elasticsearch.client:elasticsearch-rest-high-level-client:$elasticVersion")

implementation ("org.eclipse.parsson:parsson:1.1.5")
implementation ("org.eclipse.parsson:parsson:1.1.6")

// Dependency to platform/BOM
implementation (platform("com.fasterxml.jackson:jackson-bom:$jacksonVersion"))
Expand Down

0 comments on commit 46f1e55

Please sign in to comment.