Skip to content

Commit 77b2370

Browse files
rymsharymsha
authored
Update dependencies 7.15 #11308 (#11309)
1 parent 349a29d commit 77b2370

File tree

9 files changed

+278
-74
lines changed

9 files changed

+278
-74
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
ext {
1111
leafProjects = subprojects.findAll { p -> p.subprojects.empty }
12-
javaProjects = leafProjects - project( ':runtime' )
12+
javaProjects = leafProjects - project( ':runtime' ) - project( ':repack:repack-elasticsearch' ) - project( ':repack::repack-tika' )
1313
apiProjects = rootProject.subprojects.findAll { project -> project.name.endsWith( '-api' ) }
1414
}
1515

‎gradle/libs.versions.toml‎

Lines changed: 76 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,35 @@
1+
[versions]
2+
jackson = "2.19.2"
3+
mockito = "5.19.0"
4+
slf4j = "1.7.36"
5+
jetty = "9.4.58.v20250814"
6+
tika = "3.2.2"
7+
18
[libraries]
29
junit-junit4 = { module = "junit:junit", version = "4.13.2" }
310
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version = "5.10.1" }
411
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version = "5.10.1" }
512
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version = "5.10.1" }
613
junit-jupiter-vintage = { module = "org.junit.vintage:junit-vintage-engine", version = "5.10.1" }
714

8-
mockito-core = { module = "org.mockito:mockito-core", version = "5.8.0" }
9-
mockito-junitjupiter = { module = "org.mockito:mockito-junit-jupiter", version = "5.8.0" }
15+
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
16+
mockito-junitjupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
1017

11-
equalsverifier = { module = "nl.jqno.equalsverifier:equalsverifier", version = "3.15.5" }
18+
equalsverifier = { module = "nl.jqno.equalsverifier:equalsverifier", version = "3.19.4" }
1219

13-
assertj-core = { module = "org.assertj:assertj-core", version = "3.25.1" }
20+
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.4" }
1421

1522
tinybundles = { module = "org.ops4j.pax.tinybundles:tinybundles", version = "3.0.0" }
1623

1724
mockjavamail = { module = "org.jvnet.mock-javamail:mock-javamail", version = "1.9" }
1825

19-
slf4j-api = { module = "org.slf4j:slf4j-api", version = "1.7.36" }
20-
slf4j-simple = { module = "org.slf4j:slf4j-simple", version = "1.7.36" }
21-
slf4j-jultoslf4j = { module = "org.slf4j:jul-to-slf4j", version = "1.7.36" }
22-
slf4j-jcloverslf4j= { module = "org.slf4j:jcl-over-slf4j", version = "1.7.36" }
23-
slf4j-log4joverslf4j = { module = "org.slf4j:log4j-over-slf4j", version = "1.7.36" }
26+
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
27+
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
28+
slf4j-jultoslf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
29+
slf4j-jcloverslf4j= { module = "org.slf4j:jcl-over-slf4j", version.ref = "slf4j" }
30+
slf4j-log4joverslf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "slf4j" }
2431
jboss-logging = { module = "org.jboss.logging:jboss-logging", version = "3.5.3.Final" }
25-
logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.2.13" }
32+
logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.3.15" }
2633
jansi = { module = "org.fusesource.jansi:jansi", version = "1.18" }
2734

2835
jakarta-activation = { module = "com.sun.activation:jakarta.activation", version = "1.2.2" }
@@ -58,51 +65,74 @@ felix-gogo-runtime = { module = "org.apache.felix:org.apache.felix.gogo.runtime"
5865
felix-gogo-shell = { module = "org.apache.felix:org.apache.felix.gogo.shell", version = "0.12.0" }
5966
felix-shell-remote = { module = "org.apache.felix:org.apache.felix.shell.remote", version = "1.1.2" }
6067

61-
bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.77" }
68+
bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.81" }
6269

6370
elasticsearch = { module = "org.elasticsearch:elasticsearch", version = "2.4.6" }
6471

6572
jna = { module = "net.java.dev.jna:jna", version = "4.1.0" }
6673

6774
guava = { module = "com.google.guava:guava", version = "26.0-jre" }
6875

69-
jsoup = { module = "org.jsoup:jsoup", version = "1.17.2" }
76+
jsoup = { module = "org.jsoup:jsoup", version = "1.21.2" }
7077

71-
owaspsanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version = "20220608.1" }
78+
owaspsanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version = "20240325.1" }
7279

73-
bytebuddy = { module = "net.bytebuddy:byte-buddy", version = "1.14.11" }
80+
bytebuddy = { module = "net.bytebuddy:byte-buddy", version = "1.17.7" }
7481

7582
cronutils = { module = "com.cronutils:cron-utils", version = "9.2.0" }
7683

7784
jhlabs-filters = { module = "com.jhlabs:filters", version = "2.0.235-1" }
7885

7986
attoparser = { module = "org.attoparser:attoparser", version = "1.3" }
8087

81-
nashorn = { module = "org.openjdk.nashorn:nashorn-core", version = "15.4" }
82-
graaljs = { module = "org.graalvm.js:js", version = "22.3.2" }
88+
nashorn = { module = "org.openjdk.nashorn:nashorn-core", version = "15.7" }
89+
graaljs = { module = "org.graalvm.js:js", version = "22.3.5" }
8390

8491
commons-lang = { module = "commons-lang:commons-lang", version = "2.6" }
85-
commons-io = { module = "commons-io:commons-io", version = "2.15.1" }
86-
commons-compress = { module = "org.apache.commons:commons-compress", version = "1.26.1" }
87-
88-
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version = "2.16.1" }
89-
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version = "2.16.1" }
90-
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version = "2.16.1" }
91-
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version = "2.16.1" }
92-
jackson-jaxrs-base = { module = "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", version = "2.16.1" }
93-
jackson-jaxrs-jsonprovider = { module = "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", version = "2.16.1" }
94-
jackson-dataformat-smile = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile", version = "2.16.1" }
95-
jackson-dataformat-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version = "2.16.1" }
96-
jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version = "2.16.1" }
97-
98-
tika-core = { module = "org.apache.tika:tika-core", version = "2.4.1" }
99-
tika-bundlestandard = { module = "org.apache.tika:tika-bundle-standard", version = "2.4.1" }
100-
101-
metrics-core = { module = "io.dropwizard.metrics:metrics-core", version = "4.2.23" }
102-
metrics-json = { module = "io.dropwizard.metrics:metrics-json", version = "4.2.23" }
103-
metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version = "4.2.23" }
104-
metrics-jetty9 = { module = "io.dropwizard.metrics:metrics-jetty9", version = "4.2.23" }
105-
metrics-annotation = { module = "io.dropwizard.metrics:metrics-annotation", version = "4.2.23" }
92+
commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.18.0" }
93+
commons-io = { module = "commons-io:commons-io", version = "2.20.0" }
94+
commons-compress = { module = "org.apache.commons:commons-compress", version = "1.28.0" }
95+
96+
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" }
97+
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
98+
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
99+
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
100+
jackson-jaxrs-base = { module = "com.fasterxml.jackson.jaxrs:jackson-jaxrs-base", version.ref = "jackson" }
101+
jackson-jaxrs-jsonprovider = { module = "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider", version.ref = "jackson" }
102+
jackson-dataformat-smile = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile", version.ref = "jackson" }
103+
jackson-dataformat-cbor = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor", version.ref = "jackson" }
104+
jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml", version.ref = "jackson" }
105+
106+
tika-core = { module = "org.apache.tika:tika-core", version.ref = "tika" }
107+
tika-bundlestandard = { module = "org.apache.tika:tika-bundle-standard", version.ref = "tika" }
108+
tika-parser-apple = { module = "org.apache.tika:tika-parser-apple-module", version.ref = "tika" }
109+
tika-parser-audiovideo = { module = "org.apache.tika:tika-parser-audiovideo-module", version.ref = "tika" }
110+
tika-parser-cad = { module = "org.apache.tika:tika-parser-cad-module", version.ref = "tika" }
111+
tika-parser-code = { module = "org.apache.tika:tika-parser-code-module", version.ref = "tika" }
112+
tika-parser-crypto = { module = "org.apache.tika:tika-parser-crypto-module", version.ref = "tika" }
113+
tika-parser-digestcommons = { module = "org.apache.tika:tika-parser-digest-commons", version.ref = "tika" }
114+
tika-parser-font = { module = "org.apache.tika:tika-parser-font-module", version.ref = "tika" }
115+
tika-parser-html = { module = "org.apache.tika:tika-parser-html-module", version.ref = "tika" }
116+
tika-parser-image = { module = "org.apache.tika:tika-parser-image-module", version.ref = "tika" }
117+
tika-parser-mail = { module = "org.apache.tika:tika-parser-mail-module", version.ref = "tika" }
118+
tika-parser-mailcommons = { module = "org.apache.tika:tika-parser-mail-commons", version.ref = "tika" }
119+
tika-parser-microsoft = { module = "org.apache.tika:tika-parser-microsoft-module", version.ref = "tika" }
120+
tika-parser-miscoffice = { module = "org.apache.tika:tika-parser-miscoffice-module", version.ref = "tika" }
121+
tika-parser-news = { module = "org.apache.tika:tika-parser-news-module", version.ref = "tika" }
122+
tika-parser-ocr = { module = "org.apache.tika:tika-parser-ocr-module", version.ref = "tika" }
123+
tika-parser-pdf = { module = "org.apache.tika:tika-parser-pdf-module", version.ref = "tika" }
124+
tika-parser-pkg = { module = "org.apache.tika:tika-parser-pkg-module", version.ref = "tika" }
125+
tika-parser-text = { module = "org.apache.tika:tika-parser-text-module", version.ref = "tika" }
126+
tika-parser-webarchive = { module = "org.apache.tika:tika-parser-webarchive-module", version.ref = "tika" }
127+
tika-parser-xml = { module = "org.apache.tika:tika-parser-xml-module", version.ref = "tika" }
128+
tika-parser-xmpcommons = { module = "org.apache.tika:tika-parser-xmp-commons", version.ref = "tika" }
129+
tika-parser-zipcommons = { module = "org.apache.tika:tika-parser-zip-commons", version.ref = "tika" }
130+
131+
metrics-core = { module = "io.dropwizard.metrics:metrics-core", version = "4.2.34" }
132+
metrics-json = { module = "io.dropwizard.metrics:metrics-json", version = "4.2.34" }
133+
metrics-jvm = { module = "io.dropwizard.metrics:metrics-jvm", version = "4.2.34" }
134+
metrics-jetty9 = { module = "io.dropwizard.metrics:metrics-jetty9", version = "4.2.34" }
135+
metrics-annotation = { module = "io.dropwizard.metrics:metrics-annotation", version = "4.2.34" }
106136

107137
hazelcast-hazelcast = { module = "com.hazelcast:hazelcast", version = "3.12.13" }
108138
hazelcast-client = { module = "com.hazelcast:hazelcast-client", version = "3.12.13" }
@@ -112,14 +142,14 @@ jparsec = { module = "org.jparsec:jparsec", version = "3.1" }
112142

113143
resteasy = { module = "org.jboss.resteasy:resteasy-core", version = "5.0.9.Final" }
114144

115-
jetty-server = { module = "org.eclipse.jetty:jetty-server", version = "9.4.53.v20231009" }
116-
jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version = "9.4.53.v20231009" }
117-
jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version = "9.4.53.v20231009" }
118-
jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version = "9.4.53.v20231009" }
119-
jetty-websocket-server = { module = "org.eclipse.jetty.websocket:websocket-server", version = "9.4.53.v20231009" }
120-
jetty-websocket-servlet = { module = "org.eclipse.jetty.websocket:websocket-servlet", version = "9.4.53.v20231009" }
121-
jetty-websocket-serverimpl = { module = "org.eclipse.jetty.websocket:javax-websocket-server-impl", version = "9.4.53.v20231009" }
122-
jetty-hazelcast = { module = "org.eclipse.jetty:jetty-hazelcast", version = "9.4.53.v20231009" }
123-
jetty-client = { module = "org.eclipse.jetty:jetty-client", version = "9.4.53.v20231009" }
145+
jetty-server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty" }
146+
jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jetty" }
147+
jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets", version.ref = "jetty" }
148+
jetty-jmx = { module = "org.eclipse.jetty:jetty-jmx", version.ref = "jetty" }
149+
jetty-websocket-server = { module = "org.eclipse.jetty.websocket:websocket-server", version.ref = "jetty" }
150+
jetty-websocket-servlet = { module = "org.eclipse.jetty.websocket:websocket-servlet", version.ref = "jetty" }
151+
jetty-websocket-serverimpl = { module = "org.eclipse.jetty.websocket:javax-websocket-server-impl", version.ref = "jetty" }
152+
jetty-hazelcast = { module = "org.eclipse.jetty:jetty-hazelcast", version.ref = "jetty" }
153+
jetty-client = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty" }
124154

125155
[plugins]

‎modules/core/core-cluster/src/test/java/com/enonic/xp/cluster/impl/ClusterConfigImplTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public void discovery()
2020
final ClusterConfigImpl config = new ClusterConfigImpl();
2121

2222
final Map<String, String> settings = new HashMap<>();
23-
settings.put( "discovery.unicast.hosts", "localhost, 192.168.0.1, beast.enonic.net" );
23+
settings.put( "discovery.unicast.hosts", "localhost, 192.168.0.1" );
2424
config.activate( settings );
2525

2626
final NodeDiscovery discovery = config.discovery();
2727
assertNotNull( discovery );
2828

2929
final List hosts = discovery.get();
30-
assertEquals( 3, hosts.size() );
30+
assertEquals( 2, hosts.size() );
3131
}
3232

3333
@Test

‎modules/core/core-extractor/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
dependencies {
22
implementation project( ':core:core-api' )
3-
implementation libs.tika.core
3+
implementation (libs.tika.core) {
4+
exclude group: 'org.slf4j'
5+
}
46
}
57

68
jar {

‎modules/core/core-internal/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ jar {
1818
bnd( 'Bundle-Name': 'Enonic XP Core - Internal',
1919
'Export-Package': 'com.enonic.xp.core.internal.*',
2020
'Import-Package': 'javax.annotation.meta;resolution:=optional,org.jspecify.annotations;resolution:=optional,*',
21-
'Private-Package': 'org.jsoup.*;org.owasp.html.*')
21+
'Private-Package': 'org.jsoup.*;org.owasp.html.*;org.owasp.shim.*')
2222
}

‎modules/repack/repack-elasticsearch/build.gradle‎

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apply plugin: 'java-library'
2+
apply plugin: 'biz.aQute.bnd.builder'
3+
14
dependencies {
25
implementation ( libs.elasticsearch ) {
36
exclude group: 'com.google.guava'
@@ -12,24 +15,36 @@ dependencies {
1215
}
1316

1417
jar {
15-
bnd( 'Bundle-Name': 'Elasticsearch Library',
16-
'Export-Package':
17-
'org.elasticsearch.*;-split-package:=merge-first' + ',' +
18-
'org.apache.lucene.*;-split-package:=merge-first' + ',' +
19-
'org.joda.time.*;-split-package:=merge-first' + ',' +
20-
'com.spatial4j.*'+ ',' +
21-
'org.tartarus.*' + ',' +
22-
'org.jboss.netty.*' + ',' +
23-
'com.ning.compress.*' + ',' +
24-
'com.carrotsearch.hppc.*' + ',' +
25-
'com.tdunning.math.stats.*',
26-
'Import-Package': '*;resolution:=optional',
27-
'Private-Package': 'config.*' + ',' +
28-
'META-INF.services.*;-split-package:=merge-first' + ',' +
29-
'com.fasterxml.jackson.dataformat.smile.*' + ',' +
30-
'com.fasterxml.jackson.dataformat.cbor.*' + ',' +
31-
'com.fasterxml.jackson.dataformat.yaml.*' + ',' +
32-
'org.yaml.snakeyaml.*' + ',' +
33-
'com.twitter.jsr166e.*'
34-
)
35-
}
18+
manifest {
19+
attributes( ['Implementation-Version': project.version] )
20+
}
21+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
22+
23+
bundle {
24+
bnd(
25+
'Bundle-SymbolicName': project.group + '.' + project.name.replace( '-', '.' ),
26+
'-nouses': 'true',
27+
'-dsannotations': '*',
28+
'Implementation-Version': project.version,
29+
'Bundle-Name': 'Elasticsearch Library',
30+
'Export-Package':
31+
'org.elasticsearch.*;-split-package:=merge-first' + ',' +
32+
'org.apache.lucene.*;-split-package:=merge-first' + ',' +
33+
'org.joda.time.*;-split-package:=merge-first' + ',' +
34+
'com.spatial4j.*'+ ',' +
35+
'org.tartarus.*' + ',' +
36+
'org.jboss.netty.*' + ',' +
37+
'com.ning.compress.*' + ',' +
38+
'com.carrotsearch.hppc.*' + ',' +
39+
'com.tdunning.math.stats.*',
40+
'Import-Package': '*;resolution:=optional',
41+
'Private-Package': 'config.*' + ',' +
42+
'META-INF.services.*;-split-package:=merge-first' + ',' +
43+
'com.fasterxml.jackson.dataformat.smile.*' + ',' +
44+
'com.fasterxml.jackson.dataformat.cbor.*' + ',' +
45+
'com.fasterxml.jackson.dataformat.yaml.*' + ',' +
46+
'org.yaml.snakeyaml.*' + ',' +
47+
'com.twitter.jsr166e.*'
48+
)
49+
}
50+
}

‎modules/repack/repack-tika/build.gradle‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
apply plugin: 'java-library'
2+
3+
configurations {
4+
origin {
5+
transitive = false
6+
}
7+
extra {
8+
transitive = false
9+
}
10+
}
11+
12+
dependencies {
13+
origin (libs.tika.bundlestandard)
14+
extra "org.apache.pdfbox:pdfbox-io:3.0.5"
15+
extra "commons-logging:commons-logging:1.3.5"
16+
extra "org.apache.logging.log4j:log4j-api:2.25.0"
17+
extra "org.apache.logging.log4j:log4j-to-jul:2.25.0"
18+
}
19+
20+
tasks.named('jar') {
21+
from(zipTree(configurations.origin.files.find()))
22+
from(configurations.extra.files)
23+
24+
doFirst {
25+
def jarFile = new java.util.jar.JarFile(configurations.origin.files.find())
26+
def manifestAttributes = jarFile.manifest.mainAttributes
27+
28+
def forceOptional = ["com.github.javaparser","org.apache.pdfbox","net.sf.saxon.str", "org.apache.xerces", "org.apache.commons.logging", "org.apache.logging.log4j", "picocli", "sun.print"]
29+
30+
def modifiedImportPackage = manifestAttributes.getValue( "Import-Package" ).split(/,(?=(?:[^"]*"[^"]*")*[^"]*$)/)
31+
.collect {
32+
it = ( it.startsWithAny( forceOptional as CharSequence[] ) && !it.contains( ";resolution:=" ) ) ? it +
33+
";resolution:=optional" : it
34+
it = it.startsWithAny( "org.slf4j" ) ? it.replace( "version=\"[2.0,3)", "version=\"[1.7,3)" ) : it
35+
return it
36+
}.join( ',' )
37+
38+
modifiedImportPackage += ',org.osgi.framework.wiring'
39+
40+
def modifiedClasspath = manifestAttributes.getValue('Bundle-ClassPath') + ',' + configurations.extra.files.collect { it.name }.join(',')
41+
42+
manifestAttributes.each { key, value ->
43+
manifest.attributes((key.toString()): value.toString())
44+
}
45+
46+
manifest.attributes('Import-Package': modifiedImportPackage)
47+
manifest.attributes('Bundle-ClassPath': modifiedClasspath)
48+
49+
}
50+
51+
archiveBaseName.set('tika-bundle-standard-repack')
52+
}

0 commit comments

Comments
 (0)