Skip to content

Commit 34793e8

Browse files
solrbotsolrbot
committed
Update hk2 to v4
1 parent db36284 commit 34793e8

38 files changed

Lines changed: 109 additions & 115 deletions

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ grpc = "1.65.1"
115115
# @keep Gulp version used in ref-guide
116116
gulp-cli = "3.1.0"
117117
hamcrest = "3.0"
118-
hk2 = "3.1.1"
118+
hk2 = "4.0.0"
119119
hsqldb = "2.7.4"
120120
ibm-icu = "77.1"
121121
immutables-valueannotations = "2.12.1"

‎solr/api/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,testRuntimeClasspath
146146
org.eclipse.jetty:jetty-server:12.0.34=jarValidation,testRuntimeClasspath
147147
org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testRuntimeClasspath
148148
org.eclipse.jetty:jetty-util:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
149-
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,testRuntimeClasspath
150-
org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,testRuntimeClasspath
151-
org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,testRuntimeClasspath
152-
org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,testRuntimeClasspath
149+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,testRuntimeClasspath
150+
org.glassfish.hk2:hk2-api:4.0.0=jarValidation,testRuntimeClasspath
151+
org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,testRuntimeClasspath
152+
org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,testRuntimeClasspath
153153
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,testRuntimeClasspath
154154
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,testRuntimeClasspath
155155
org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,testRuntimeClasspath

‎solr/benchmark/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,testRunt
136136
org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
137137
org.eclipse.jetty:jetty-session:12.0.34=jarValidation,runtimeClasspath,testRuntimeClasspath
138138
org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
139-
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
140-
org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
141-
org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
142-
org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,testRuntimeClasspath
139+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
140+
org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
141+
org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
142+
org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
143143
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,testRuntimeClasspath
144144
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath
145145
org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,testRuntimeClasspath

‎solr/core/gradle.lockfile‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,10 @@ org.eclipse.jetty:jetty-security:12.0.34=jarValidation,runtimeClasspath,runtimeL
153153
org.eclipse.jetty:jetty-server:12.0.34=jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
154154
org.eclipse.jetty:jetty-session:12.0.34=jarValidation,testCompileClasspath,testRuntimeClasspath
155155
org.eclipse.jetty:jetty-util:12.0.34=apiHelper,compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
156-
org.glassfish.hk2.external:aopalliance-repackaged:3.1.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
157-
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=runtimeLibs
158-
org.glassfish.hk2:hk2-api:3.1.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
159-
org.glassfish.hk2:hk2-api:4.0.0-M3=runtimeLibs
160-
org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
161-
org.glassfish.hk2:hk2-utils:3.1.1=compileClasspath,jarValidation,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
162-
org.glassfish.hk2:hk2-utils:4.0.0-M3=runtimeLibs
156+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
157+
org.glassfish.hk2:hk2-api:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
158+
org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
159+
org.glassfish.hk2:hk2-utils:4.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
163160
org.glassfish.hk2:osgi-resource-locator:3.0.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath
164161
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath
165162
org.glassfish.jersey.core:jersey-client:4.0.2=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath

‎solr/cross-dc-manager/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,10 @@ org.eclipse.jetty:jetty-server:12.0.34=compileClasspath,jarValidation,runtimeCla
205205
org.eclipse.jetty:jetty-session:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
206206
org.eclipse.jetty:jetty-util:12.0.34=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testCompileClasspath,testRuntimeClasspath
207207
org.eclipse.jetty:jetty-xml:12.0.34=solrPlatformLibs
208-
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
209-
org.glassfish.hk2:hk2-api:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
210-
org.glassfish.hk2:hk2-locator:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
211-
org.glassfish.hk2:hk2-utils:4.0.0-M3=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
208+
org.glassfish.hk2.external:aopalliance-repackaged:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
209+
org.glassfish.hk2:hk2-api:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
210+
org.glassfish.hk2:hk2-locator:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
211+
org.glassfish.hk2:hk2-utils:4.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
212212
org.glassfish.hk2:osgi-resource-locator:3.0.0=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
213213
org.glassfish.jersey.containers:jersey-container-jetty-http:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath
214214
org.glassfish.jersey.core:jersey-client:4.0.2=jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testRuntimeClasspath

‎solr/licenses/aopalliance-repackaged-3.1.1.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/aopalliance-repackaged-4.0.0-M3.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/aopalliance-repackaged-4.0.0.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dd41cb8276601df780f0621702b2d70f3f5ca64a

‎solr/licenses/hk2-api-3.1.1.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎solr/licenses/hk2-api-4.0.0-M3.jar.sha1‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)