joerg/elx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to gradle 7.4.2, update to netty 4.1.77

Browse source
This commit is contained in:
Jörg Prante 2022-06-01 12:28:46 +02:00
parent 66c7294856
commit 469ca41001
11 changed files with 47 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -4,7 +4,7 @@ plugins {
}
wrapper {
gradleVersion = "${project.property('gradle.wrapper.version')}"
gradleVersion = libs.versions.gradle.get()
distributionType = Wrapper.DistributionType.ALL
}
@ -27,9 +27,9 @@ subprojects {
apply plugin: 'java-library'
dependencies {
testImplementation "org.apache.logging.log4j:log4j-core:${project.property('log4j.version')}"
testImplementation "org.apache.logging.log4j:log4j-jul:${project.property('log4j.version')}"
testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${project.property('log4j.version')}"
testImplementation libs.log4j.core
testImplementation libs.log4j.jul
testImplementation libs.log4j.slf4j
}
apply from: rootProject.file('gradle/ide/idea.gradle')

8
elx-api/build.gradle
View file

@ -1,7 +1,7 @@
dependencies {
api "org.xbib:metrics-common:${project.property('xbib-metrics.version')}"
api "org.elasticsearch:elasticsearch:${project.property('elasticsearch.version')}"
api libs.metrics
api libs.elasticsearch
// override old artifacts in ES x-content. We must use jackson smile/cbor/yaml and log4j2 api here.
api "com.fasterxml.jackson.core:jackson-core:${project.property('jackson.version')}"
api "org.apache.logging.log4j:log4j-api:${project.property('log4j.version')}"
api libs.jackson
api libs.log4j.api
}

6
elx-common/build.gradle
View file

@ -1,6 +1,6 @@
dependencies {
api project(':elx-api')
implementation "org.xbib:time:${rootProject.property('xbib-time.version')}"
testImplementation "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
testImplementation "org.xbib:netty-http-client:${project.property('xbib-netty-http.version')}"
implementation libs.time
testImplementation libs.netty.http
testImplementation libs.es.plugin.transport.netty4
}

4
elx-http/build.gradle
View file

@ -1,5 +1,5 @@
dependencies{
api project(':elx-common')
api "org.xbib:netty-http-client:${project.property('xbib-netty-http.version')}"
api "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
api libs.netty.http
api libs.es.plugin.transport.netty4
}

2
elx-node/build.gradle
View file

@ -1,4 +1,4 @@
dependencies {
api project(':elx-common')
api "org.elasticsearch.plugin:transport-netty4-client:${project.property('elasticsearch.version')}"
api libs.es.plugin.transport.netty4
}

2
elx-transport/build.gradle
View file

@ -1,4 +1,4 @@
dependencies {
api project(':elx-common')
api "org.elasticsearch.plugin:transport-netty4-client:${rootProject.property('elasticsearch.version')}"
api libs.es.plugin.transport.netty4
}

13
gradle.properties
View file

@ -1,16 +1,5 @@
group = org.xbib
name = elx
version = 7.10.2.20
version = 7.10.2.21
org.gradle.warning.mode = ALL
gradle.wrapper.version = 7.3.2
elasticsearch.version = 7.10.2
# ES 7.10.2 uses Jackson 2.10.4
jackson.version = 2.12.5
# ES 7.10.2 uses Netty 4.1.49
xbib-netty-http.version = 4.1.72.1
# ES 7.10.2 uses log4j2 2.11.1
log4j.version = 2.17.1
xbib-metrics.version = 2.2.0
xbib-time.version = 2.1.0
junit.version = 5.8.1

12
gradle/test/junit5.gradle
View file

@ -1,12 +1,8 @@
def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.7.1'
def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
dependencies {
testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
testImplementation libs.junit.jupiter.api
testImplementation libs.junit.jupiter.params
testImplementation libs.hamcrest
testRuntimeOnly libs.junit.jupiter.engine
}
test {

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

26
settings.gradle
View file

@ -1,3 +1,29 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '7.4.2')
version('junit', '5.8.2')
version('elasticsearch', '7.10.2')
version('log4j', '2.17.1') // ES 7.10.2 uses log4j2 2.11.1
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
library('hamcrest', 'org.hamcrest:hamcrest-library:2.2')
library('junit4', 'junit:junit:4.13.2')
library('log4j-api', 'org.apache.logging.log4j', 'log4j-api').versionRef('log4j')
library('log4j-core', 'org.apache.logging.log4j', 'log4j-core').versionRef('log4j')
library('log4j-slf4j', 'org.apache.logging.log4j', 'log4j-slf4j-impl').versionRef('log4j')
library('log4j-jul', 'org.apache.logging.log4j', 'log4j-jul').versionRef('log4j')
library('elasticsearch', 'org.elasticsearch', 'elasticsearch').versionRef('elasticsearch')
library('es-plugin-transport-netty4', 'org.elasticsearch.plugin', 'transport-netty4-client').versionRef('elasticsearch')
library('jackson', 'com.fasterxml.jackson.core', 'jackson-core').version('2.12.7') // ES 7.10.2 uses Jackson 2.10.4
library('netty-http', 'org.xbib', 'netty-http-client').version('4.1.77.0') // ES 7.10.2 uses Netty 4.1.49
library('metrics', 'org.xbib', 'metrics-common').version('2.2.0')
library('time', 'org.xbib', 'time').version('2.1.0')
}
}
}
include 'elx-api'
include 'elx-common'
include 'elx-node'