Skip to content

Commit fc82f24

Browse files
olovyolovy
committed
Upgrade to Groovy 4.0.4
1 parent 6b7c89d commit fc82f24

File tree

14 files changed

+42
-39
lines changed

14 files changed

+42
-39
lines changed

‎gradle.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
org.gradle.daemon=true
2-
groovyVersion=3.0.9
2+
groovyVersion=4.0.4
3+
# TODO: upgrade to 2.2 when released
4+
spockVersion=2.2-M3-groovy-4.0
35
jettyVersion = 9.4.44.v20210927
46
prometheusVersion = 0.15.0
57
log4jVersion = 2.17.0
68
resilience4jVersion = 1.7.1
79
httpComponentsCoreVersion = 4.4.14
810
httpComponentsClientVersion = 4.5.13
911
systemProp.https.protocols=TLSv1.1,TLSv1.2
10-
spockVersion=2.1-groovy-3.0
1112
guavaVersion=31.1-jre
1213
jacocoVersion=0.8.8

‎importers/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ dependencies {
6767

6868
// Common tools
6969
providedCompile 'javax.servlet:servlet-api:2.5'
70-
implementation "org.codehaus.groovy:groovy-all:${groovyVersion}"
70+
implementation "org.apache.groovy:groovy-all:${groovyVersion}"
7171
implementation 'org.codehaus.jackson:jackson-mapper-asl:1.9.12'
7272

7373
// Integration
@@ -83,9 +83,9 @@ dependencies {
8383
// profiling and test
8484
testImplementation "org.spockframework:spock-core:${spockVersion}"
8585
testImplementation 'cglib:cglib-nodep:3.1'
86-
implementation "org.codehaus.groovy:groovy-json:${groovyVersion}"
87-
implementation "org.codehaus.groovy:groovy-sql:${groovyVersion}"
88-
implementation "org.codehaus.groovy:groovy:${groovyVersion}"
86+
implementation "org.apache.groovy:groovy-json:${groovyVersion}"
87+
implementation "org.apache.groovy:groovy-sql:${groovyVersion}"
88+
implementation "org.apache.groovy:groovy:${groovyVersion}"
8989
implementation 'org.slf4j:slf4j-api:1.7.32'
9090
implementation 'org.slf4j:slf4j-simple:1.7.32'
9191
}

‎librisxl-tools/examples/ExerciseOaipmh.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import groovy.xml.XmlSlurper
12
import groovy.xml.StreamingMarkupBuilder
2-
import groovy.util.slurpersupport.GPathResult
3+
import groovy.xml.slurpersupport.GPathResult
34

45
class ExerciseOaipmh {
56

‎marc_export/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies {
3636
}
3737
implementation group: 'xml-apis', name: 'xml-apis', version: '1.4.01'
3838
implementation 'org.apache.commons:commons-lang3:3.3.2'
39-
implementation "org.codehaus.groovy:groovy:${groovyVersion}"
39+
implementation "org.apache.groovy:groovy:${groovyVersion}"
4040
}
4141

4242
gretty {

‎rest/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ dependencies {
7171
implementation(project(':whelk-core'))
7272

7373
// Common tools
74-
implementation "org.codehaus.groovy:groovy-all:${groovyVersion}"
75-
implementation "org.codehaus.groovy:groovy-dateutil:${groovyVersion}"
74+
implementation "org.apache.groovy:groovy-all:${groovyVersion}"
75+
implementation "org.apache.groovy:groovy-dateutil:${groovyVersion}"
7676
implementation 'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
7777
implementation 'commons-io:commons-io:2.11.0'
7878
implementation "com.google.guava:guava:${guavaVersion}"
@@ -101,10 +101,10 @@ dependencies {
101101
// Standalone
102102
executableWarDeps "org.eclipse.jetty:jetty-server:${jettyVersion}"
103103
executableWarDeps "org.eclipse.jetty:jetty-webapp:${jettyVersion}"
104-
executableWarDeps "org.codehaus.groovy:groovy-all:${groovyVersion}"
104+
executableWarDeps "org.apache.groovy:groovy-all:${groovyVersion}"
105105
executableWarDeps 'commons-cli:commons-cli:1.2'
106-
implementation "org.codehaus.groovy:groovy-xml:${groovyVersion}"
107-
implementation "org.codehaus.groovy:groovy:${groovyVersion}"
106+
implementation "org.apache.groovy:groovy-xml:${groovyVersion}"
107+
implementation "org.apache.groovy:groovy:${groovyVersion}"
108108
implementation 'org.codehaus.jackson:jackson-core-asl:1.9.13'
109109
implementation 'xml-apis:xml-apis:1.4.01'
110110
}

‎rest/src/main/groovy/whelk/rest/api/RemoteSearchAPI.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package whelk.rest.api
22

33
import groovy.util.logging.Log4j2 as Log
4-
import groovy.util.slurpersupport.GPathResult
4+
import groovy.xml.XmlSlurper
5+
import groovy.xml.slurpersupport.GPathResult
56
import groovy.xml.StreamingMarkupBuilder
67
import se.kb.libris.util.marc.Field
78
import se.kb.libris.util.marc.MarcRecord

‎whelk-core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ dependencies {
8787
implementation "io.github.resilience4j:resilience4j-circuitbreaker:${resilience4jVersion}"
8888
implementation "io.github.resilience4j:resilience4j-prometheus:${resilience4jVersion}"
8989
implementation "io.github.resilience4j:resilience4j-retry:${resilience4jVersion}"
90-
implementation "org.codehaus.groovy:groovy-all:${groovyVersion}"
90+
implementation "org.apache.groovy:groovy-all:${groovyVersion}"
9191
implementation 'com.damnhandy:handy-uri-templates:2.0.4'
9292
implementation 'com.zaxxer:HikariCP:4.0.3'
9393
implementation 'commons-codec:commons-codec:1.7'
9494
api 'commons-io:commons-io:2.11.0'
9595
implementation "org.apache.httpcomponents:httpclient:${httpComponentsClientVersion}"
9696
implementation "org.apache.httpcomponents:httpcore:${httpComponentsCoreVersion}"
9797
implementation 'org.apache.jena:apache-jena-libs:3.0.1'
98-
api "org.codehaus.groovy:groovy-json:${groovyVersion}"
99-
api "org.codehaus.groovy:groovy-xml:${groovyVersion}"
100-
api "org.codehaus.groovy:groovy:${groovyVersion}"
98+
api "org.apache.groovy:groovy-json:${groovyVersion}"
99+
api "org.apache.groovy:groovy-xml:${groovyVersion}"
100+
api "org.apache.groovy:groovy:${groovyVersion}"
101101
api 'org.codehaus.jackson:jackson-mapper-asl:1.9.13'
102102
implementation 'xerces:xercesImpl:2.11.0' //KP
103103

‎whelk-core/src/main/groovy/se/kb/libris/Normalizers.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import whelk.component.DocumentNormalizer
88
import whelk.exception.InvalidQueryException
99
import whelk.filter.BlankNodeLinker
1010
import whelk.filter.LanguageLinker
11-
import whelk.util.DocumentUtil
1211
import whelk.util.DocumentUtil.Remove
1312

1413
import static whelk.JsonLd.GRAPH_KEY

‎whelk-core/src/main/groovy/whelk/JsonLd.groovy

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ class JsonLd {
520520
}
521521

522522
static List<List<String>> findPaths(Map obj, String key, Set<String> values) {
523-
List paths = []
523+
List<List<String>> paths = []
524524
new DFS().search(obj, { List path, v ->
525525
if (v in values && key == path[-1]) {
526526
paths << new ArrayList(path)
@@ -670,7 +670,7 @@ class JsonLd {
670670
return jsonLd
671671
}
672672

673-
List graphItems = jsonLd.get(GRAPH_KEY)
673+
List graphItems = (List) jsonLd.get(GRAPH_KEY)
674674

675675
additionalObjects.each { object ->
676676
if (object instanceof Map) {
@@ -791,8 +791,8 @@ class JsonLd {
791791
* [<language>, <property value>] pairs.
792792
*/
793793
private List applyLensAsListByLang(Map thing, Set<String> languagesToKeep, List<String> removableBaseUris, String lensToUse) {
794-
Map lensGroups = displayData.get('lensGroups')
795-
Map lensGroup = lensGroups.get(lensToUse)
794+
Map lensGroups = (Map) displayData.get('lensGroups')
795+
Map lensGroup = (Map) lensGroups.get(lensToUse)
796796
Map lens = getLensFor((Map)thing, lensGroup)
797797
List parts = []
798798

@@ -867,12 +867,12 @@ class JsonLd {
867867
be displayed on the frontend. Mainly for use as search keys.
868868
*/
869869
Map applyLensAsMapByLang(Map thing, Set<String> languagesToKeep, List<String> removableBaseUris, List<String> lensesToTry) {
870-
Map lensGroups = displayData.get('lensGroups')
870+
Map lensGroups = (Map) displayData.get('lensGroups')
871871
Map lens = null
872-
String initialLens
872+
String initialLens = null
873873

874874
for (String lensToTry : lensesToTry) {
875-
Map lensGroup = lensGroups.get(lensToTry)
875+
Map lensGroup = (Map) lensGroups.get(lensToTry)
876876
lens = getLensFor((Map)thing, lensGroup)
877877
if (lens) {
878878
initialLens = lensToTry
@@ -931,8 +931,8 @@ class JsonLd {
931931
}
932932

933933
List makeSearchKeyParts(Map object) {
934-
Map lensGroups = displayData.get('lensGroups')
935-
Map lensGroup = lensGroups.get('chips')
934+
Map lensGroups = (Map) displayData.get('lensGroups')
935+
Map lensGroup = (Map) lensGroups.get('chips')
936936
Map lens = getLensFor(object, lensGroup)
937937
List parts = []
938938
def type = object.get(TYPE_KEY)
@@ -972,8 +972,8 @@ class JsonLd {
972972
return new LinkedHashSet(((List) data[GRAPH_KEY]).collect{ getInverseProperties((Map) it, lensType) }.flatten())
973973
}
974974

975-
Map lensGroups = displayData.get('lensGroups')
976-
Map lensGroup = lensGroups.get(lensType)
975+
Map lensGroups = (Map) displayData.get('lensGroups')
976+
Map lensGroup = (Map) lensGroups.get(lensType)
977977
Map lens = getLensFor(data, lensGroup)
978978
return new LinkedHashSet((List) lens?.get('inverseProperties') ?: [])
979979
}
@@ -996,7 +996,7 @@ class JsonLd {
996996
}
997997

998998
private Map getLens(Map thing, List<String> lensTypes) {
999-
Map lensGroups = displayData.get('lensGroups')
999+
Map lensGroups = (Map) displayData.get('lensGroups')
10001000
lensTypes.findResult { lensType ->
10011001
lensGroups.get(lensType)?.with { getLensFor(thing, (Map) it) }
10021002
}
@@ -1052,7 +1052,7 @@ class JsonLd {
10521052

10531053
private Map findLensForType(String typeKey, Map lensGroup) {
10541054
def lenses = lensGroup['lenses']
1055-
Map lens = ((Map)lenses).get(typeKey)
1055+
Map lens = (Map) ((Map)lenses).get(typeKey)
10561056
if (lens)
10571057
return lens
10581058
def typedfn = vocabIndex.get(typeKey)

‎whelk-core/src/main/groovy/whelk/converter/marc/MarcFrameConverter.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ class MarcFixedFieldHandler {
13491349
static boolean isColKey(key) { ((String) key)?.startsWith('[') }
13501350

13511351
static List<Tuple2<Integer, Integer>> parseColumnNumbers(key) {
1352-
List colNums = []
1352+
List<Tuple2<Integer, Integer>> colNums = []
13531353
(key =~ /\[(\d+)(?::(\d+))?\]\s*/).each { List<String> m ->
13541354
Integer start = m[1].toInteger()
13551355
Integer end = m[2]?.toInteger() ?: start + 1

‎whelk-core/src/main/groovy/whelk/search/ESQuery.groovy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -808,17 +808,16 @@ class ESQuery {
808808
} else {
809809
currentField = "${parentName}.${fieldName}"
810810
}
811-
Map fields = fieldSettings.get('fields')
811+
Map fields = (Map) fieldSettings.get('fields')
812812
if (fields && fields.get('keyword')) {
813813
result.add(currentField)
814814
}
815-
Map properties = fieldSettings.get('properties')
815+
Map properties = (Map) fieldSettings.get('properties')
816816
if (properties) {
817817
result += getKeywordFieldsFromProperties(properties, currentField)
818818
}
819819
return result
820820
}
821-
822821
/**
823822
* Hide any `.keyword` field in ES response.
824823
*

‎whelk-core/src/main/groovy/whelk/util/MarcExport.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import whelk.Document
1010
import whelk.JsonLd
1111
import whelk.Whelk
1212
import whelk.converter.marc.JsonLD2MarcXMLConverter
13+
import groovy.xml.XmlSlurper
1314

1415
@Log4j2
1516
class MarcExport {

‎whelktool/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ dependencies {
4949
testImplementation "org.spockframework:spock-core:${spockVersion}"
5050
testImplementation 'junit:junit:4.13.2'
5151
implementation "com.google.guava:guava:${guavaVersion}"
52-
implementation "org.codehaus.groovy:groovy-cli-commons:${groovyVersion}"
53-
implementation "org.codehaus.groovy:groovy-jsr223:${groovyVersion}"
54-
implementation "org.codehaus.groovy:groovy:${groovyVersion}"
52+
implementation "org.apache.groovy:groovy-cli-commons:${groovyVersion}"
53+
implementation "org.apache.groovy:groovy-jsr223:${groovyVersion}"
54+
implementation "org.apache.groovy:groovy:${groovyVersion}"
5555
implementation 'org.codehaus.jackson:jackson-mapper-asl:1.9.12'
5656
implementation group: 'xml-apis', name: 'xml-apis', version: '1.4.01'
5757
}

‎whelktool/src/main/groovy/datatool/WhelkTool.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package whelk.datatool
22

33
import com.google.common.util.concurrent.MoreExecutors
4+
import groovy.cli.commons.CliBuilder
45
import org.codehaus.groovy.jsr223.GroovyScriptEngineImpl
56
import whelk.Document
67
import whelk.IdGenerator

0 commit comments

Comments
 (0)