Skip to content

Commit

Permalink
Update Netty to 4.1.115.Final (fix build issue with missing grolifant…
Browse files Browse the repository at this point in the history
… version)
  • Loading branch information
dradosevic committed Nov 15, 2024
1 parent 210977f commit e017612
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 20 deletions.
9 changes: 5 additions & 4 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ repositories {

dependencies {
implementation "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
implementation "org.aim42:htmlSanityCheck:1.1.6"
implementation "io.micronaut.build.internal:micronaut-gradle-plugins:5.4.10"
implementation "org.graalvm.buildtools.native:org.graalvm.buildtools.native.gradle.plugin:0.9.14"
implementation "org.tomlj:tomlj:1.0.0"
implementation libs.htmlsanitycheck
implementation libs.micronaut.build.plugins
implementation libs.tomlj
implementation libs.japicmp.gradle.plugin
implementation libs.native.gradle.plugin
}
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ kapt.use.worker.api=true

# Dependency Versions
micronautMavenPluginVersion=3.5.3
chromedriverVersion=79.0.3945.36
geckodriverVersion=0.26.0
webdriverBinariesVersion=1.4
kotlinVersion=1.6.10
kotlin.stdlib.default.dependency=false

Expand Down
9 changes: 9 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ htmlunit = "2.64.0"
httpcomponents-client = "4.5.13"
jakarta-inject-api = "2.0.1"
jakarta-inject-tck = "2.0.1"
japicmp-gradle-plugin="0.4.3"
javax-inject = "1"
javax-persistence = "2.2"
jetbrains-annotations = "23.0.0"
Expand All @@ -22,9 +23,12 @@ jsr107 = "1.1.1"
javax-el = "3.0.1-b12"
javax-el-impl = "2.2.1-b05"
logbook-netty = "2.14.0"
micronaut-build-plugins="7.2.0"
native-gradle-plugin = "0.10.2"
selenium = "3.141.59"
smallrye = "5.5.0"
systemlambda = "1.2.1"
tomlj="1.1.1"
vertx = "3.9.13"
wiremock = "2.33.2"

Expand Down Expand Up @@ -384,10 +388,12 @@ hibernate = { module = "org.hibernate:hibernate-core", version.ref = "hibernate"
hibernate-validator = { module = "org.hibernate:hibernate-validator", version.ref = "hibernate-validator" }

htmlunit = { module = "net.sourceforge.htmlunit:htmlunit", version.ref = "htmlunit" }
htmlsanitycheck = { module = "org.aim42:htmlSanityCheck", version.ref = "htmlsanitycheck"}

jakarta-inject-api = { module = "jakarta.inject:jakarta.inject-api", version.ref = "jakarta-inject-api" }
jakarta-inject-tck = { module = "jakarta.inject:jakarta.inject-tck", version.ref = "jakarta-inject-tck" }

japicmp-gradle-plugin = { module = "me.champeau.gradle:japicmp-gradle-plugin", version.ref = "japicmp-gradle-plugin"}
javax-el = { module = "org.glassfish:javax.el", version.ref = "javax-el" }
javax-el-impl = { module = "org.glassfish:javax.el", version.ref = "javax-el" }
javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
Expand Down Expand Up @@ -447,10 +453,13 @@ smallrye = { module = "io.smallrye:smallrye-fault-tolerance", version.ref = "sma

systemlambda = { module = "com.github.stefanbirkner:system-lambda", version.ref = "systemlambda" }

micronaut-build-plugins = { module = "io.micronaut.build.internal:micronaut-gradle-plugins", version.ref="micronaut-build-plugins"}
micronaut-tracing-jaeger = { module = "io.micronaut.tracing:micronaut-tracing-jaeger" }
micronaut-tracing-zipkin = { module = "io.micronaut.tracing:micronaut-tracing-zipkin" }
native-gradle-plugin = { module = "org.graalvm.buildtools.native:org.graalvm.buildtools.native.gradle.plugin", version.ref = "native-gradle-plugin"}

testcontainers-spock = { module = "org.testcontainers:spock", version.ref = "managed-testcontainers" }
tomlj = { module = "org.tomlj:tomlj", version.ref="tomlj"}

vertx = { module = "io.vertx:vertx-core", version.ref = "vertx" }
vertx-webclient = { module = "io.vertx:vertx-web-client", version.ref = "vertx" }
Expand Down
1 change: 0 additions & 1 deletion gradle/webdriverbinaries.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
if (System.getProperty('geb.env')) {
apply plugin:"com.energizedwork.webdriver-binaries"

webdriverBinaries {
chromedriver "${chromedriverVersion}"
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pluginManagement {
}

plugins {
id 'io.micronaut.build.shared.settings' version '5.4.10'
id 'io.micronaut.build.shared.settings' version '7.2.0'
}
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

Expand Down
12 changes: 1 addition & 11 deletions test-suite/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
import org.apache.tools.ant.taskdefs.condition.Os

buildscript {
repositories {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath "gradle.plugin.com.energizedwork.webdriver-binaries:webdriver-binaries-gradle-plugin:$webdriverBinariesVersion"
}
}

plugins {
id "io.micronaut.build.internal.convention-test-library"
id 'io.micronaut.build.internal.functional-test'
id 'java-test-fixtures'
alias(libs.plugins.webdriver)
}

micronautBuild {
Expand Down

0 comments on commit e017612

Please sign in to comment.