Skip to content

Commit b22410d

Browse files
committed
Version 2.3
1 parent b5d0f56 commit b22410d

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# JVM Dependency Conflict Resolution Gradle plugin - Changelog
22

3+
## Version 2.3
4+
* [New Rule] [#66](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/66) itext:itext / com.lowagie:itext (Thanks [Björn Kautler](https://github.com/Vampire) for reporting)
5+
* [New Rule] [#222](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/222) dk.brics.automaton:automaton / dk.brics:automaton (Thanks Ketan Padegaonkar (https://github.com/ketan) for reporting)
6+
* [New Rule] [#203](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/203) org.apache.geronimo.javamail:geronimo-javamail_*_provider
7+
* [Adjusted Rule] [#188](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/188) Bouncy Castle rule supports LTS versions (Thanks [Björn Kautler](https://github.com/Vampire) for reporting)
8+
* [Adjusted Rule] [#174](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/174) jakarta.xml.ws-api and jakarta.xml.ws-api merger is now considered (Thanks [KO](https://github.com/ko-at-work) for reporting)
9+
* [Adjusted Rule] [#201](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/201) Add woodstox:wstx-lgpl to WOODSTOX
10+
* [Adjusted Rule] [#202](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/202) Remove org.apache.tomcat:tomcat-websocket from JAVAX_WEBSOCKET_API
11+
* [Fix] [#196](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/196) No longer call eager methods on configurations container (Thanks [Ian Brandt](https://github.com/ianbrandt) for reporting)
12+
313
## Version 2.2
414
* [New Rule] [#174](https://github.com/gradlex-org/jvm-dependency-conflict-resolution/issues/174) org.elasticsearch:jna / net.java.dev.jna:jna (Thanks [Safeuq Mohamed](https://github.com/safeuq)!)
515

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group = "org.gradlex"
9-
version = "2.2"
9+
version = "2.3"
1010

1111
java {
1212
toolchain.languageVersion = JavaLanguageVersion.of(17)

src/docs/asciidoc/parts/detection.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Note that the `jvm-dependency-conflict-resolution` dependency contains both the
1313
[source,groovy]
1414
----
1515
dependencies {
16-
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.2")
16+
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.3")
1717
}
1818
----
1919

src/docs/asciidoc/parts/resolution.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Add this to the build file of your convention plugin's build (e.g. `build-logic/
77
[source,groovy]
88
----
99
dependencies {
10-
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.2")
10+
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.3")
1111
}
1212
----
1313

src/docs/samples/plugin-dependency/groovy/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ repositories.gradlePluginPortal()
66

77
// tag::plugin-dependency[]
88
dependencies {
9-
implementation 'org.gradlex:jvm-dependency-conflict-resolution:2.2'
9+
implementation 'org.gradlex:jvm-dependency-conflict-resolution:2.3'
1010
}
1111
// end::plugin-dependency[]

src/docs/samples/plugin-dependency/kotlin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ repositories.gradlePluginPortal()
66

77
// tag::plugin-dependency[]
88
dependencies {
9-
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.2")
9+
implementation("org.gradlex:jvm-dependency-conflict-resolution:2.3")
1010
}
1111
// end::plugin-dependency[]

0 commit comments

Comments
 (0)