Skip to content

Commit 764bcb1

Browse files
committed
build(deps): upgrade vulnerable dependencies
1 parent ea58fad commit 764bcb1

File tree

110 files changed

+276
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+276
-202
lines changed

gradle.properties

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
org.gradle.jvmargs=-Xmx512m "-XX:MaxMetaspaceSize=2g"
1+
org.gradle.jvmargs=-Xmx1024m "-XX:MaxMetaspaceSize=2g"
22
systemProp.org.gradle.internal.http.socketTimeout=120000
33
kotlin.daemon.jvmargs=-Xmx2G
4-
5-
kotlinVersion=1.8.20
6-
kotlinCoroutinesVersion=1.6.4
7-
ktorVersion=2.2.4
8-
kotlinLoggingVersion=3.0.5
9-
kotlinxHtmlVersion=0.8.0
10-
kotlinxSerializationVersion=1.5.0
11-
modelixIncrementalVersion=0.1.4
12-
kotlinCollectionsImmutableVersion=0.3.5

gradle/libs.versions.toml

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,36 @@
1+
## Generated by $ ./gradlew refreshVersionsCatalog
2+
3+
[bundles]
4+
5+
ignite = ["ignite-core", "ignite-spring", "ignite-indexing"]
6+
apache-cxf = ["apache-cxf-client", "apache-cxf-sse"]
7+
8+
[plugins]
9+
10+
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
11+
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
12+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
13+
gitVersion = { id = "com.palantir.git-version", version = "3.0.0" }
14+
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "11.3.2" }
15+
spotless = { id = "com.diffplug.spotless", version = "6.18.0" }
16+
tasktree = { id = "com.dorongold.task-tree", version = "2.1.1" }
17+
modelix-mps-buildtools = { id = "org.modelix.mps.build-tools", version = "1.0.11" }
18+
119
[versions]
2-
kotlin = "1.8.20"
20+
21+
kotlin = "1.8.21"
322
kotlinCoroutines="1.6.4"
4-
ktor="2.2.4"
23+
ktor="2.3.0"
524
kotlinHtml="0.8.0"
625
kotlinSerialization="1.5.0"
7-
ignite="2.13.0"
26+
ignite="2.14.0"
27+
apacheCxf="3.5.5"
828

929
[libraries]
30+
1031
kotlin-stdlib-common = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-common", version.ref = "kotlin" }
1132
kotlin-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinSerialization" }
12-
kotlin-serialization-yaml = { group = "com.charleskorn.kaml", name = "kaml", version = "0.40.0" }
33+
kotlin-serialization-yaml = { group = "com.charleskorn.kaml", name = "kaml", version = "0.53.0" }
1334
kotlin-logging = { group = "io.github.microutils", name = "kotlin-logging", version = "3.0.5" }
1435
kotlin-collections-immutable = { group = "org.jetbrains.kotlinx", name = "kotlinx-collections-immutable", version = "0.3.5" }
1536
kotlin-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version = "0.4.0" }
@@ -43,26 +64,22 @@ ktor-serialization-json = { group = "io.ktor", name = "ktor-serialization-kotlin
4364
keycloak-authz-client = { group = "org.keycloak", name = "keycloak-authz-client", version = "18.0.1" }
4465
guava = { group = "com.google.guava", name = "guava", version = "31.1-jre" }
4566
modelix-incremental = { group = "org.modelix", name = "incremental", version = "0.1.4" }
46-
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.12.0" }
47-
vavr = { group = "io.vavr", name = "vavr", version = "0.10.3" }
48-
apache-commons-lang = { group = "org.apache.commons", name = "commons-lang3", version = "3.11" }
49-
apache-commons-io = { group = "commons-io", name = "commons-io", version = "2.7" }
67+
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.13.1" }
68+
vavr = { group = "io.vavr", name = "vavr", version = "0.10.4" }
69+
apache-commons-lang = { group = "org.apache.commons", name = "commons-lang3", version = "3.12.0" }
70+
apache-commons-io = { group = "commons-io", name = "commons-io", version = "2.11.0" }
5071
apache-commons-collections = { group = "org.apache.commons", name = "commons-collections4", version = "4.4" }
5172
trove4j = { group = "net.sf.trove4j", name = "trove4j", version = "3.0.3" }
5273

5374
ignite-core = { group = "org.apache.ignite", name = "ignite-core", version.ref = "ignite" }
5475
ignite-spring = { group = "org.apache.ignite", name = "ignite-spring", version.ref = "ignite" }
5576
ignite-indexing = { group = "org.apache.ignite", name = "ignite-indexing", version.ref = "ignite" }
5677

57-
[bundles]
58-
ignite = ["ignite-core", "ignite-spring", "ignite-indexing"]
78+
logback-classic = { group = "ch.qos.logback", name = "logback-classic", version = "1.4.7" }
79+
postgresql = { group = "org.postgresql", name = "postgresql", version = "42.6.0" }
80+
jcommander = { group = "com.beust", name = "jcommander", version = "1.82" }
81+
cucumber-java = { group = "io.cucumber", name = "cucumber-java", version = "7.11.2" }
82+
junit = { group = "junit", name = "junit", version = "4.13.2" }
5983

60-
[plugins]
61-
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
62-
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
63-
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
64-
gitVersion = { id = "com.palantir.git-version", version = "0.13.0" }
65-
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "10.3.0" }
66-
spotless = { id = "com.diffplug.spotless", version = "5.0.0" }
67-
tasktree = { id = "com.dorongold.task-tree", version = "2.1.0" }
68-
modelix-mps-buildtools = { id = "org.modelix.mps.build-tools", version = "1.0.11" }
84+
apache-cxf-sse = { group = "org.apache.cxf", name = "cxf-rt-rs-sse", version.ref = "apacheCxf" }
85+
apache-cxf-client = { group = "org.apache.cxf", name = "cxf-rt-rs-client", version.ref = "apacheCxf" }

model-api/src/commonMain/kotlin/org/modelix/model/api/IBranch.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api

model-api/src/commonMain/kotlin/org/modelix/model/api/IBranchListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api

model-api/src/commonMain/kotlin/org/modelix/model/api/IChildLink.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api
1717

1818
interface IChildLink : ILink {
1919
val isMultiple: Boolean
20+
2021
@Deprecated("use .targetConcept")
2122
val childConcept: IConcept
2223
}

model-api/src/commonMain/kotlin/org/modelix/model/api/IConcept.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api

model-api/src/commonMain/kotlin/org/modelix/model/api/IConceptReference.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import org.modelix.model.area.IArea
1717

1818
interface IConceptReference {
1919
companion object {
20-
private var deserializers: Map<Any, ((String)->IConceptReference?)> = LinkedHashMap()
20+
private var deserializers: Map<Any, ((String) -> IConceptReference?)> = LinkedHashMap()
21+
2122
@Deprecated("use ConceptReference()")
2223
fun deserialize(serialized: String?): ConceptReference? {
2324
if (serialized == null) return null
@@ -28,18 +29,23 @@ interface IConceptReference {
2829
else -> throw RuntimeException("Multiple deserializers applicable to $serialized")
2930
}
3031
}
32+
3133
@Deprecated("use ILanguageRepository.register")
3234
fun registerDeserializer(key: Any, deserializer: ((String) -> IConceptReference?)) {
3335
deserializers = deserializers + (key to deserializer)
3436
}
37+
3538
@Deprecated("use ILanguageRepository.unregister")
3639
fun unregisterSerializer(key: Any) {
3740
deserializers = deserializers - key
3841
}
3942
}
43+
4044
fun getUID(): String
45+
4146
@Deprecated("use ILanguageRepository.resolveConcept")
4247
fun resolve(area: IArea?): IConcept?
48+
4349
@Deprecated("use getUID()")
4450
fun serialize(): String
4551
}

model-api/src/commonMain/kotlin/org/modelix/model/api/IIdGenerator.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api

model-api/src/commonMain/kotlin/org/modelix/model/api/INode.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api

model-api/src/commonMain/kotlin/org/modelix/model/api/INodeReference.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1111
* KIND, either express or implied. See the License for the
1212
* specific language governing permissions and limitations
13-
* under the License.
13+
* under the License.
1414
*/
1515

1616
package org.modelix.model.api

0 commit comments

Comments
 (0)