Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/workflows/aot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
restore-keys: |
${{ runner.os }}-gradle-
- name: Run AOT Tests
run: ./gradlew help # ./test-suite-aot.sh
run: ./test-suite-aot.sh
env:
TESTCONTAINERS_RYUK_DISABLED: true
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ projectVersion=4.0.0-SNAPSHOT
projectGroup=io.micronaut.security

micronautDocsVersion=2.0.0
micronautGradlePluginVersion=3.7.9
micronautAotVersion=2.0.0-SNAPSHOT
micronautGradlePluginVersion=4.0.0-M1
micronautAotVersion=2.0.0-M1

title=Micronaut Security
projectDesc=Official Security Solution for Micronaut
Expand Down
12 changes: 6 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ managed-nimbus-jose-jwt = "9.31"

micronaut = "4.0.0-M2"
micronaut-docs = "2.0.0"
groovy = "4.0.10"
groovy = "4.0.11"

geb = "7.0"
selenium = "4.9.0"
Expand All @@ -13,14 +13,14 @@ bouncycastle = "1.70"
kotlin = "1.8.21"
bcpkix = "1.70"

micronaut-test = "4.0.0-SNAPSHOT"
micronaut-multitenancy = "5.0.0-M1"
micronaut-test = "4.0.0-M2"
micronaut-multitenancy = "5.0.0-M2"
micronaut-reactor = "3.0.0-M1"
micronaut-serde = "2.0.0-M1"
micronaut-servlet = "4.0.0-SNAPSHOT"
micronaut-serde = "2.0.0-M3"
micronaut-servlet = "4.0.0-M3"
micronaut-session = "4.0.0-M1"
micronaut-views = "4.0.0-M1"
micronaut-validation = "4.0.0-M3"
micronaut-validation = "4.0.0-M5"

[libraries]
micronaut-multitenancy = { module = "io.micronaut.multitenancy:micronaut-multitenancy-bom", version.ref = "micronaut-multitenancy" }
Expand Down
7 changes: 4 additions & 3 deletions security-aot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ plugins {

micronautBuild {
aot {
version.set("1.1.2")
version.set("2.0.0-M1")
}
}

dependencies {
annotationProcessor(platform(mn.micronaut.core.bom))
compileOnly(platform(mn.micronaut.core.bom))
implementation(projects.micronautSecurityOauth2)
implementation(projects.micronautSecurityJwt)

testImplementation(platform(mn.micronaut.core.bom))
testImplementation(mn.micronaut.http.server.netty)
testImplementation(projects.micronautSecurityOauth2)
testImplementation(mnTest.micronaut.test.spock)
}
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ include "test-suite-tomcat-groovy"
include "test-suite-utils"
include "test-suite-utils-security"
include "test-suite-kotlin"
//include "test-suite-aot"
//include "test-suite-aot-authserver"
include "test-suite-aot"
include "test-suite-aot-authserver"
include "test-suite-serde"

enableFeaturePreview 'TYPESAFE_PROJECT_ACCESSORS'
Expand Down
17 changes: 16 additions & 1 deletion test-suite-aot-authserver/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'io.micronaut.application' version "$micronautGradlePluginVersion"
id 'io.micronaut.minimal.application' version "$micronautGradlePluginVersion"
id "com.github.johnrengelman.shadow" version "8.1.1"
}

Expand All @@ -24,10 +24,25 @@ micronaut {
dependencies {
implementation("io.micronaut:micronaut-http-client")
implementation("io.micronaut:micronaut-management")
implementation(mnSerde.micronaut.serde.jackson)
runtimeOnly(mn.snakeyaml)
}

shadowJar {
archiveBaseName.set('authserver')
archiveClassifier.set('')
archiveVersion.set('')
}

configurations.all {
resolutionStrategy {
preferProjectModules()
// TODO: Remove this once aligned
eachDependency {
if (requested.group == "io.micronaut.platform" && requested.name == "micronaut-platform") {
useVersion("4.0.0-M1")
because("There's no M2 platform yet")
}
}
}
}
14 changes: 13 additions & 1 deletion test-suite-aot/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ plugins {
id 'io.micronaut.application' version "$micronautGradlePluginVersion"
id 'io.micronaut.aot' version "$micronautGradlePluginVersion"
id "com.github.johnrengelman.shadow" version "8.1.1"

}

repositories {
Expand Down Expand Up @@ -30,8 +29,21 @@ micronaut {
dependencies {
implementation(projects.micronautSecurityJwt)
implementation(projects.micronautSecurityOauth2)
implementation(mn.micronaut.jackson.databind)
aotPlugins(projects.micronautSecurityAot)
}

version = '0.1'

configurations.all {
resolutionStrategy {
preferProjectModules()
// TODO: Remove this once aligned
eachDependency {
if (requested.group == "io.micronaut.platform" && requested.name == "micronaut-platform") {
useVersion("4.0.0-M1")
because("There's no M2 platform yet")
}
}
}
}