From facd525826c7fbc8eb71d62664903770428355ec Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 16:01:44 -0400 Subject: [PATCH 1/8] Use non-deprecated Inject Plugin --- .../io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java b/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java index 41fc8161e..7c5f05c4f 100644 --- a/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java +++ b/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java @@ -3,12 +3,12 @@ import io.avaje.htmx.nima.TemplateContentCache; import io.avaje.htmx.nima.TemplateRender; import io.avaje.inject.BeanScopeBuilder; -import io.avaje.inject.spi.Plugin; +import io.avaje.inject.spi.InjectPlugin; /** * Plugin for avaje inject that provides a default TemplateRender instance. */ -public final class DefaultTemplateProvider implements Plugin { +public final class DefaultTemplateProvider implements InjectPlugin { @Override public Class[] provides() { From 4619fa6320a0b300f0b04dc6ef5789d06dc37e8e Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 16:06:32 -0400 Subject: [PATCH 2/8] fix module --- htmx-nima-jstache/src/main/java/module-info.java | 4 ++-- pom.xml | 2 +- tests/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htmx-nima-jstache/src/main/java/module-info.java b/htmx-nima-jstache/src/main/java/module-info.java index 2da4668b1..7fc2bb46e 100644 --- a/htmx-nima-jstache/src/main/java/module-info.java +++ b/htmx-nima-jstache/src/main/java/module-info.java @@ -5,7 +5,7 @@ requires transitive io.avaje.htmx.nima; requires transitive io.helidon.webserver; requires transitive io.jstach.jstachio; - requires io.avaje.inject; + requires transitive io.avaje.inject; - provides io.avaje.inject.spi.Plugin with io.avaje.htmx.nima.jstache.DefaultTemplateProvider; + provides io.avaje.inject.spi.InjectPlugin with io.avaje.htmx.nima.jstache.DefaultTemplateProvider; } diff --git a/pom.xml b/pom.xml index 05a50c367..7a9ea7749 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ jdk21plus - [21,22] + [21,) htmx-nima diff --git a/tests/pom.xml b/tests/pom.xml index a7c1889be..56d534912 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -33,7 +33,7 @@ jdk21plus - [21,22] + [21,) test-nima From 0722168ec729d8b8afb22dbf9f9885ec1220009b Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:37:46 -0400 Subject: [PATCH 3/8] restore EA --- .github/workflows/jdk-ea-stable.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jdk-ea-stable.yml b/.github/workflows/jdk-ea-stable.yml index 6f2383e62..d8825832b 100644 --- a/.github/workflows/jdk-ea-stable.yml +++ b/.github/workflows/jdk-ea-stable.yml @@ -3,10 +3,10 @@ name: JDK EA Stable on: workflow_dispatch: -# push: -# pull_request: -# schedule: -# - cron: '39 1 * * 1,3,5' + push: + pull_request: + schedule: + - cron: '39 1 * * 1,3,5' jobs: build: From dd291c4aec199b082e5eeee24cf81468befebc3e Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:46:41 -0400 Subject: [PATCH 4/8] Update jdk-ea-stable.yml --- .github/workflows/jdk-ea-stable.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/jdk-ea-stable.yml b/.github/workflows/jdk-ea-stable.yml index d8825832b..be7f9a72c 100644 --- a/.github/workflows/jdk-ea-stable.yml +++ b/.github/workflows/jdk-ea-stable.yml @@ -1,4 +1,3 @@ - name: JDK EA Stable on: From 3e480361fbc8ab3c98fa713aa97986ef6cea7c77 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:47:43 -0400 Subject: [PATCH 5/8] Revert "Disable EA stable build (as download broken)" This reverts commit 62e717e285c5fdf22c036e9c5b050735c3ca77e4. --- .github/workflows/jdk-ea-stable.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jdk-ea-stable.yml b/.github/workflows/jdk-ea-stable.yml index be7f9a72c..a6c44f00f 100644 --- a/.github/workflows/jdk-ea-stable.yml +++ b/.github/workflows/jdk-ea-stable.yml @@ -1,11 +1,12 @@ + name: JDK EA Stable on: + push: + pull_request: workflow_dispatch: - push: - pull_request: - schedule: - - cron: '39 1 * * 1,3,5' + schedule: + - cron: '39 1 * * 1,3,5' jobs: build: From 4686ea01d3eec53c309db5d9f2500cb3ae10a2d3 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 22:53:33 -0400 Subject: [PATCH 6/8] Update DefaultResolverProvider.java --- .../java/io/avaje/http/inject/DefaultResolverProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java b/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java index 56b5ad2f2..ca52b217d 100644 --- a/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java +++ b/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java @@ -3,10 +3,10 @@ import io.avaje.http.api.context.RequestContextResolver; import io.avaje.http.api.context.ThreadLocalRequestContextResolver; import io.avaje.inject.BeanScopeBuilder; -import io.avaje.inject.spi.Plugin; +import io.avaje.inject.spi.InjectPlugin; /** Plugin for avaje inject that provides a default RequestContextResolver instance. */ -public final class DefaultResolverProvider implements Plugin { +public final class DefaultResolverProvider implements InjectPlugin { @Override public Class[] provides() { From ac24b167bbdab66c6fc93ee628b51472c8ab8978 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 23:01:08 -0400 Subject: [PATCH 7/8] correctly register the spis --- htmx-nima-jstache/pom.xml | 7 +++++++ .../avaje/htmx/nima/jstache/DefaultTemplateProvider.java | 2 ++ htmx-nima-jstache/src/main/java/module-info.java | 3 ++- .../META-INF/services/io.avaje.inject.spi.Plugin | 1 - http-inject-plugin/pom.xml | 9 ++++++++- .../io/avaje/http/inject/DefaultResolverProvider.java | 2 ++ http-inject-plugin/src/main/java/module-info.java | 5 +++-- .../META-INF/services/io.avaje.inject.spi.Plugin | 1 - 8 files changed, 24 insertions(+), 6 deletions(-) delete mode 100644 htmx-nima-jstache/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin delete mode 100644 http-inject-plugin/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin diff --git a/htmx-nima-jstache/pom.xml b/htmx-nima-jstache/pom.xml index 86faa8892..522c21397 100644 --- a/htmx-nima-jstache/pom.xml +++ b/htmx-nima-jstache/pom.xml @@ -43,5 +43,12 @@ provided true + + io.avaje + avaje-spi-service + 2.5 + provided + true + diff --git a/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java b/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java index 7c5f05c4f..c74e0f617 100644 --- a/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java +++ b/htmx-nima-jstache/src/main/java/io/avaje/htmx/nima/jstache/DefaultTemplateProvider.java @@ -4,10 +4,12 @@ import io.avaje.htmx.nima.TemplateRender; import io.avaje.inject.BeanScopeBuilder; import io.avaje.inject.spi.InjectPlugin; +import io.avaje.spi.ServiceProvider; /** * Plugin for avaje inject that provides a default TemplateRender instance. */ +@ServiceProvider public final class DefaultTemplateProvider implements InjectPlugin { @Override diff --git a/htmx-nima-jstache/src/main/java/module-info.java b/htmx-nima-jstache/src/main/java/module-info.java index 7fc2bb46e..88d587079 100644 --- a/htmx-nima-jstache/src/main/java/module-info.java +++ b/htmx-nima-jstache/src/main/java/module-info.java @@ -6,6 +6,7 @@ requires transitive io.helidon.webserver; requires transitive io.jstach.jstachio; requires transitive io.avaje.inject; + requires static io.avaje.spi; - provides io.avaje.inject.spi.InjectPlugin with io.avaje.htmx.nima.jstache.DefaultTemplateProvider; + provides io.avaje.inject.spi.InjectExtension with io.avaje.htmx.nima.jstache.DefaultTemplateProvider; } diff --git a/htmx-nima-jstache/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin b/htmx-nima-jstache/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin deleted file mode 100644 index 456aa71f2..000000000 --- a/htmx-nima-jstache/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin +++ /dev/null @@ -1 +0,0 @@ -io.avaje.htmx.nima.jstache.DefaultTemplateProvider diff --git a/http-inject-plugin/pom.xml b/http-inject-plugin/pom.xml index d13cf8290..a21ecbe9f 100644 --- a/http-inject-plugin/pom.xml +++ b/http-inject-plugin/pom.xml @@ -26,10 +26,17 @@ io.avaje avaje-http-api - 1.37 + 2.7 true provided + + io.avaje + avaje-spi-service + 2.5 + provided + true + diff --git a/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java b/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java index ca52b217d..b22eb7714 100644 --- a/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java +++ b/http-inject-plugin/src/main/java/io/avaje/http/inject/DefaultResolverProvider.java @@ -4,8 +4,10 @@ import io.avaje.http.api.context.ThreadLocalRequestContextResolver; import io.avaje.inject.BeanScopeBuilder; import io.avaje.inject.spi.InjectPlugin; +import io.avaje.spi.ServiceProvider; /** Plugin for avaje inject that provides a default RequestContextResolver instance. */ +@ServiceProvider public final class DefaultResolverProvider implements InjectPlugin { @Override diff --git a/http-inject-plugin/src/main/java/module-info.java b/http-inject-plugin/src/main/java/module-info.java index c8149f2fe..743f025fe 100644 --- a/http-inject-plugin/src/main/java/module-info.java +++ b/http-inject-plugin/src/main/java/module-info.java @@ -1,8 +1,9 @@ module io.avaje.http.plugin { requires io.avaje.http.api; - requires io.avaje.inject; + requires io.avaje.inject; + requires static io.avaje.spi; - provides io.avaje.inject.spi.Plugin with io.avaje.http.inject.DefaultResolverProvider; + provides io.avaje.inject.spi.InjectExtension with io.avaje.http.inject.DefaultResolverProvider; } diff --git a/http-inject-plugin/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin b/http-inject-plugin/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin deleted file mode 100644 index d996e4e0c..000000000 --- a/http-inject-plugin/src/main/resources/META-INF/services/io.avaje.inject.spi.Plugin +++ /dev/null @@ -1 +0,0 @@ -io.avaje.http.inject.DefaultResolverProvider From f2e802e2c1423a9ca5149432aca7a3ab9259a221 Mon Sep 17 00:00:00 2001 From: Josiah Noel <32279667+SentryMan@users.noreply.github.com> Date: Sun, 25 Aug 2024 23:02:10 -0400 Subject: [PATCH 8/8] Update module-info.java --- http-inject-plugin/src/main/java/module-info.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/http-inject-plugin/src/main/java/module-info.java b/http-inject-plugin/src/main/java/module-info.java index 743f025fe..e13c5e735 100644 --- a/http-inject-plugin/src/main/java/module-info.java +++ b/http-inject-plugin/src/main/java/module-info.java @@ -1,9 +1,8 @@ module io.avaje.http.plugin { - requires io.avaje.http.api; - requires io.avaje.inject; - requires static io.avaje.spi; - - provides io.avaje.inject.spi.InjectExtension with io.avaje.http.inject.DefaultResolverProvider; + requires io.avaje.http.api; + requires io.avaje.inject; + requires static io.avaje.spi; + provides io.avaje.inject.spi.InjectExtension with io.avaje.http.inject.DefaultResolverProvider; }