Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to fix groovy issue #548

Merged
merged 39 commits into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7b4b495
ci: version to 4.0.0 Micronaut 4.0.0-SNAPSHOT githubCoreBranch=4.0.x
wetted Sep 9, 2022
0183531
migrate to version catalog and micronaut-build plugin 6.0.0
wetted Oct 13, 2022
8a163a5
micronaut-build plugin to 6.0.1
wetted Oct 14, 2022
85cd534
revert change that isn't java version
wetted Oct 21, 2022
a91be92
Migrate to build plugins 6.1.1, update version catalog and dependenci…
wetted Dec 19, 2022
6141f3c
Remove unnecessary catalog import of `micronaut-test`
wetted Dec 19, 2022
1a4d310
Fix github workflow, update plugin version
wetted Dec 20, 2022
8b23bef
minor changes to github workflow
wetted Dec 21, 2022
7bed902
Merge remote-tracking branch 'origin/master' into prepare-for-mn4
wetted Jan 4, 2023
ebe30a3
Merge branch 'master' into prepare-for-mn4
n0tl3ss Jan 27, 2023
78dc422
Merge remote-tracking branch 'origin/prepare-for-mn4' into prepare-fo…
wetted Feb 2, 2023
3f60029
build plugin to 6.2.2
wetted Feb 13, 2023
9b60e88
Merge remote-tracking branch 'origin/prepare-for-mn4' into prepare-fo…
wetted Feb 13, 2023
25ab1e4
build: Micronaut Build 6.3.5
sdelamo Mar 28, 2023
1134b0a
build: Micronaut Framework 4.0.0-M1
sdelamo Mar 28, 2023
6c99aaa
build: Micronaut Test 4.0.0-M1
sdelamo Mar 28, 2023
2f7b811
build: Groovy 4.0.10
sdelamo Mar 28, 2023
7178eb1
build: Discovery 4.0.0-M1
sdelamo Mar 28, 2023
2475ef2
build: Reactor 3.0.0-M1
sdelamo Mar 28, 2023
1a88793
serde 2.0.0-M1
sdelamo Mar 28, 2023
b5ff713
use validation module
sdelamo Mar 28, 2023
32b4d0f
use gradle plugin 4.0.0-SNAPSHOT
sdelamo Mar 28, 2023
0134746
remove resolutionStrategy
sdelamo Mar 28, 2023
a069f57
build: add prefectProjectModules resolution strategy
sdelamo Mar 28, 2023
7a87654
Merge branch '4.0.x' into prepare-for-mn4
sdelamo Mar 28, 2023
91d6d52
Merge remote-tracking branch 'origin/prepare-for-mn4' into prepare-fo…
wetted Mar 28, 2023
a9ccf6a
Fix javax.validation compile errors
wetted Mar 28, 2023
844503f
change to micronaut-logging
wetted Mar 28, 2023
4fe8800
Merge branch 'master' into prepare-for-mn4
sdelamo Apr 3, 2023
ce349c8
fix missing client
n0tl3ss Apr 4, 2023
12300a3
try to fix groovy issue
n0tl3ss Apr 5, 2023
a473e2a
empty to trigger build
n0tl3ss Apr 5, 2023
ef438bd
try to fix groovy issue
n0tl3ss Apr 5, 2023
db3c9bb
try to fix groovy issue
n0tl3ss Apr 5, 2023
9f8f987
try to fix groovy issue
n0tl3ss Apr 5, 2023
11f6034
try to fix groovy issue
n0tl3ss Apr 5, 2023
8c08f41
try to fix groovy issue
n0tl3ss Apr 6, 2023
d04644e
Update gradle/wrapper/gradle-wrapper.properties
n0tl3ss Apr 6, 2023
4ec390c
Update gradle/libs.versions.toml
n0tl3ss Apr 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/graalvm-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ runs:
run: |
set -e
for EXAMPLE in $(ls ./examples); do
./gradlew ${EXAMPLE}:test --continue --no-daemon --no-build-cache
./gradlew :examples:${EXAMPLE}:test --continue --no-daemon --no-build-cache
done
env:
TESTCONTAINERS_RYUK_DISABLED: 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/gradle-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
steps:
- name: Build with Gradle
shell: bash
run: ./gradlew check --no-daemon --continue
run: ./gradlew check --no-daemon --continue --no-build-cache
env:
TESTCONTAINERS_RYUK_DISABLED: 'true'
PREDICTIVE_TEST_SELECTION: "${{ github.event_name == 'pull_request' && 'true' || 'false' }}"
4 changes: 2 additions & 2 deletions .github/workflows/central-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '8'
distribution: 'temurin'
java-version: '17'
- name: Publish to Sonatype OSSRH
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['8', '11', '17']
java: ['17']
k8s: ['1.21']
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '8'
distribution: 'temurin'
java-version: '17'
- name: Publish to Sonatype Snapshots
if: success()
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: '8'
distribution: 'temurin'
java-version: '17'
- name: Set the current release version
id: release_version
run: echo ::set-output name=release_version::${GITHUB_REF:11}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-version: 11
distribution: 'temurin'
java-version: 17
- name: Optional setup step
env:
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
Expand Down
12 changes: 11 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
plugins {
id "io.micronaut.build.internal.docs"
id "io.micronaut.build.internal.dependency-updates"
id "io.micronaut.build.internal.quality-reporting"
}

repositories {
mavenCentral()
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
}

configurations.all {
resolutionStrategy {
preferProjectModules()
}
}
13 changes: 12 additions & 1 deletion buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
plugins {
id 'groovy-gradle-plugin'
}
}

repositories {
gradlePluginPortal()
mavenCentral()
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
}

dependencies {
implementation libs.micronaut.gradle.plugin
implementation libs.shadow.plugin
}
7 changes: 7 additions & 0 deletions buildSrc/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
dependencyResolutionManagement {
versionCatalogs {
libs {
from(files("../gradle/libs.versions.toml"))
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
repositories {
mavenCentral()
maven { url "https://s01.oss.sonatype.org/content/repositories/snapshots/" }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins {
id "io.micronaut.build.internal.kubernetes-tests"
id 'io.micronaut.application'
id 'com.github.johnrengelman.shadow'
}

dependencies {
mn.snakeyaml
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
plugins {
id "io.micronaut.build.internal.module"
id "io.micronaut.build.internal.kubernetes-base"
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
plugins {
id "io.micronaut.build.internal.kubernetes-base"
}

6 changes: 4 additions & 2 deletions config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,13 @@
<!-- Checks for Javadoc comments. -->
<!-- See https://checkstyle.org/config_javadoc.html -->
<module name="JavadocMethod">
<property name="excludeScope" value="private"/>
<property name="accessModifiers" value="public, protected"/>
</module>
<module name="JavadocType"/>
<module name="JavadocStyle"/>
<module name="MissingJavadocType"/>
<module name="MissingJavadocType">
<property name="severity" value="warning"/>
</module>

<!-- Checks for Naming Conventions. -->
<!-- See https://checkstyle.org/config_naming.html -->
Expand Down
40 changes: 20 additions & 20 deletions examples/micronaut-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
plugins {
id 'io.micronaut.build.internal.kubernetes-examples'
id("groovy")
id("com.github.johnrengelman.shadow") version "7.1.2"
id("io.micronaut.application") version "3.7.0"
}

repositories {
mavenCentral()
}

micronaut {
version '4.0.0-SNAPSHOT'
runtime("netty")
testRuntime("spock2")
processing {
Expand All @@ -18,26 +14,24 @@ micronaut {
}

dependencies {
implementation("io.micronaut:micronaut-validation")
implementation("io.micronaut:micronaut-runtime")
implementation("javax.annotation:javax.annotation-api")
implementation("io.micronaut:micronaut-http-client")
implementation("io.micronaut:micronaut-management")
implementation project(':kubernetes-discovery-client')
runtimeOnly("ch.qos.logback:logback-classic")

testImplementation project(":test-utils")
annotationProcessor(mnValidation.micronaut.validation.processor)
annotationProcessor(mnSerde.micronaut.serde.processor)
implementation(mnValidation.micronaut.validation)
implementation(mnSerde.micronaut.serde.jackson)
implementation(mn.micronaut.runtime)
implementation(mn.micronaut.http.client)
implementation(mn.micronaut.management)
implementation projects.kubernetesDiscoveryClient

runtimeOnly(mnLogging.logback.classic)

testImplementation projects.testUtils
}

application {
mainClass.set("micronaut.client.Application")
}

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

tasks {
dockerBuild {
images = ['micronaut-kubernetes-example-client']
Expand All @@ -48,3 +42,9 @@ tasks {
}
}

configurations.all {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not necessary with Micronaut Framework 4.0, since Micronaut Framework 4.0 does not longer expose micronaut-jackson-databind automatically.

resolutionStrategy.dependencySubstitution {
substitute(module("io.micronaut:micronaut-jackson-databind"))
.using(module("io.micronaut.serde:micronaut-serde-jackson:2.0.0-M1"))
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
import io.micronaut.management.endpoint.env.EnvironmentEndpointFilter;
import io.micronaut.management.endpoint.env.EnvironmentFilterSpecification;
import jakarta.inject.Singleton;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

@Singleton
public class LegacyEnvEndpointFilter implements EnvironmentEndpointFilter {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.micronaut.http.MediaType
import io.micronaut.http.annotation.Get
import io.micronaut.http.annotation.Post
import io.micronaut.http.client.annotation.Client
import io.micronaut.kubernetes.test.KubernetesSpecification
import micronaut.client.utils.KubernetesSpecification
import io.micronaut.kubernetes.test.TestUtils
import io.micronaut.test.extensions.spock.annotation.MicronautTest
import spock.lang.Requires
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import io.micronaut.context.annotation.Property
import io.micronaut.context.env.Environment
import io.micronaut.http.annotation.Get
import io.micronaut.http.client.annotation.Client
import io.micronaut.kubernetes.test.KubernetesSpecification
import micronaut.client.utils.KubernetesSpecification
import io.micronaut.kubernetes.test.TestUtils
import io.micronaut.test.extensions.spock.annotation.MicronautTest
import spock.lang.Requires
Expand Down
Loading