Skip to content

Commit 5cd28e2

Browse files
committed
No tests, cleanup like the grails-spring-security-oauth2-google provider
1 parent 63710d2 commit 5cd28e2

File tree

6 files changed

+36
-84
lines changed

6 files changed

+36
-84
lines changed

.github/workflows/gradle.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,15 @@ name: "Java CI"
22
on:
33
push:
44
branches:
5-
- '[4-9]+.[0-9]+.x'
5+
- '[1-9]+.[0-9]+.x'
66
pull_request:
77
branches:
8-
- '[4-9]+.[0-9]+.x'
8+
- '[1-9]+.[0-9]+.x'
99
workflow_dispatch:
1010
jobs:
11-
test_project:
12-
name: "Test Project"
13-
runs-on: ubuntu-24.04
14-
strategy:
15-
fail-fast: true
16-
matrix:
17-
java: [17, 21]
18-
steps:
19-
- name: "📥 Checkout repository"
20-
uses: actions/checkout@v4
21-
- name: "☕️ Setup JDK"
22-
uses: actions/setup-java@v4
23-
with:
24-
java-version: ${{ matrix.java }}
25-
distribution: liberica
26-
- name: "🐘 Setup Gradle"
27-
uses: gradle/actions/setup-gradle@v4
28-
with:
29-
develocity-access-key: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
30-
- name: "🏃 Run tests"
31-
run: ./gradlew check
32-
- name: "🏃 Run integration tests"
33-
working-directory: ./examples/testapp1
34-
run: ./gradlew integrationTest
3511
publish_snapshot:
3612
if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
3713
name: "Build Project and Publish Snapshot release"
38-
needs: test_project
3914
runs-on: ubuntu-24.04
4015
permissions:
4116
contents: write # updates gh-pages branch

.github/workflows/release-notes.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ on:
44
types: [closed, reopened]
55
push:
66
branches:
7-
- master
8-
- '[4-9]+.[0-9]+.x'
7+
- '[1-9]+.[0-9]+.x'
98
pull_request:
109
types: [opened, reopened, synchronize]
1110
pull_request_target:

.github/workflows/release.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ env:
66
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77
JAVA_VERSION: '17.0.15' # this must be a specific version for reproducible builds
88
RELEASE_TAG_PREFIX: 'v'
9-
DOCUMENTATION: 'false'
109
jobs:
1110
publish:
1211
permissions:
@@ -118,16 +117,3 @@ jobs:
118117
./gradlew
119118
findSonatypeStagingRepository
120119
releaseSonatypeStagingRepository
121-
- name: "📖 Generate Documentation"
122-
if: ${{ env.DOCUMENTATION != 'false' }}
123-
run: ./gradlew docs
124-
- name: "📤 Publish Documentation to Github Pages"
125-
if: ${{ env.DOCUMENTATION != 'false' }}
126-
uses: apache/grails-github-actions/deploy-github-pages@asf
127-
env:
128-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
129-
GRADLE_PUBLISH_RELEASE: 'true'
130-
SOURCE_FOLDER: build/docs
131-
VERSION: ${{ needs.publish.outputs.release_version }}
132-
- name: "⚙️ Run post-release"
133-
uses: apache/grails-github-actions/post-release@asf

README.md

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
Spring Security OAuth2 OIDC Plugin
2-
====================================
3-
[ ![Download](https://api.bintray.com/packages/grails/plugins/spring-security-oauth2-oidc/images/download.svg) ](https://bintray.com/grails/plugins/spring-security-oauth2-google/_latestVersion)
1+
# Spring Security OAuth2 OIDC Plugin
2+
3+
[![Java CI](https://github.com/grails-plugins/grails-spring-security-oauth2-oidc/actions/workflows/gradle.yml/badge.svg)](https://github.com/grails-plugins/grails-spring-security-oauth2-oidc/actions/workflows/gradle.yml) [![Release](https://github.com/grails-plugins/grails-spring-security-oauth2-oidc/actions/workflows/release.yml/badge.svg?event=release)](https://github.com/grails-plugins/grails-spring-security-oauth2-oidc/actions/workflows/release.yml)
44

55
Add aa OIDC OAuth2 provider to the [Spring Security OAuth2 Plugin](https://github.com/apache/grails/grails-spring-security-oauth2).
66

7-
Installation
8-
------------
7+
## Installation
8+
99
Add the following dependencies in `build.gradle`
1010
```
1111
dependencies {
@@ -16,8 +16,8 @@ dependencies {
1616
}
1717
```
1818

19-
Usage
20-
-----
19+
## Usage
20+
2121
Add this to your application.yml
2222
```yaml
2323
grails:
@@ -43,6 +43,13 @@ Logged with OIDC?
4343
<oauth2:ifLoggedInWith provider="oidc">yes</oauth2:ifLoggedInWith>
4444
<oauth2:ifNotLoggedInWith provider="oidc">no</oauth2:ifNotLoggedInWith>
4545
```
46-
License
47-
-------
46+
47+
## Versions
48+
49+
| Branch | Grails Version |
50+
|--------|----------------|
51+
| 1.0.x | 7.x |
52+
53+
54+
## License
4855
Apache 2

build.gradle

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.time.format.DateTimeFormatter
55
buildscript {
66
repositories {
77
mavenCentral()
8-
maven { url "https://repo.grails.org/grails/restricted" }
8+
maven { url = 'https://repo.grails.org/grails/restricted' }
99
maven {
1010
url = 'https://repository.apache.org/content/groups/snapshots'
1111
content {
@@ -15,38 +15,29 @@ buildscript {
1515
}
1616
dependencies {
1717
classpath platform("org.apache.grails:grails-bom:$grailsVersion")
18-
classpath "org.apache.grails:grails-gradle-plugins"
18+
classpath 'org.apache.grails:grails-gradle-plugins'
1919
}
2020
}
2121
apply plugin: 'groovy'
2222
apply plugin: 'java-library'
2323
apply plugin: 'org.apache.grails.gradle.grails-plugin'
2424
apply plugin: 'org.apache.grails.gradle.grails-publish'
2525

26-
group "org.grails.plugins"
26+
group = 'org.grails.plugins'
2727

2828
ext {
2929
buildInstant = java.util.Optional.ofNullable(System.getenv("SOURCE_DATE_EPOCH"))
3030
.filter(s -> !s.isEmpty())
3131
.map(Long::parseLong)
3232
.map(Instant::ofEpochSecond)
33-
.orElseGet(Instant::now)
33+
.orElseGet(Instant::now) as Instant
3434
formattedBuildDate = DateTimeFormatter.ISO_INSTANT.format(buildInstant)
35-
buildDate = (buildInstant as Instant).atZone(ZoneOffset.UTC) // for reproducible builds
36-
37-
publishArtifactId = 'grails-spring-security-oauth2-oidc'
38-
pomTitle = 'Grails Spring Security OAuth2 OIDC Provider Plugin'
39-
pomDescription = 'This plugin provides the oauth2 OIDC provider for grails-spring-security-oauth2 plugin.'
40-
pomDevelopers = [
41-
sbglasius: 'Søren Berg Glasius',
42-
]
43-
35+
buildDate = buildInstant.atZone(ZoneOffset.UTC) // for reproducible builds
4436
}
4537

46-
4738
repositories {
4839
mavenCentral()
49-
maven { url "https://repo.grails.org/grails/restricted" }
40+
maven { url = 'https://repo.grails.org/grails/restricted' }
5041
maven {
5142
url = 'https://repository.apache.org/content/groups/snapshots'
5243
content {
@@ -57,13 +48,11 @@ repositories {
5748

5849
dependencies {
5950
implementation platform("org.apache.grails:grails-bom:$grailsVersion")
60-
compileOnly "org.springframework.boot:spring-boot-starter-logging"
61-
compileOnly "org.springframework.boot:spring-boot-starter-validation"
62-
compileOnly "org.springframework.boot:spring-boot-autoconfigure"
63-
compileOnly "org.springframework.boot:spring-boot-starter"
64-
compileOnly "org.apache.grails:grails-core"
65-
profile "org.apache.grails.profiles:plugin"
66-
runtimeOnly "org.fusesource.jansi:jansi"
51+
compileOnly 'org.springframework.boot:spring-boot-starter-logging'
52+
compileOnly 'org.springframework.boot:spring-boot-starter-validation'
53+
compileOnly 'org.springframework.boot:spring-boot-autoconfigure'
54+
compileOnly 'org.springframework.boot:spring-boot-starter'
55+
compileOnly 'org.apache.grails:grails-core'
6756

6857
implementation 'org.apache.grails:grails-spring-security:7.0.0-M5'
6958
implementation 'org.apache.grails:grails-spring-security-oauth2:7.0.0-M5'
@@ -76,15 +65,11 @@ grailsPublish {
7665
license {
7766
name = 'Apache-2.0'
7867
}
79-
title = pomTitle
80-
desc = pomDescription
81-
developers = pomDevelopers
68+
title = 'Grails Spring Security OAuth2 OIDC Provider Plugin'
69+
desc = 'This plugin provides the oauth2 OIDC provider for grails-spring-security-oauth2 plugin.'
70+
developers = [
71+
sbglasius: 'Søren Berg Glasius',
72+
]
8273
}
8374

84-
8575
compileJava.options.release = javaVersion.toInteger()
86-
87-
tasks.withType(Test) {
88-
useJUnitPlatform()
89-
}
90-

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ develocity {
1717
server = 'https://ge.grails.org'
1818
buildScan {
1919
tag('grails-plugins')
20-
tag('grails-mail')
20+
tag(rootProject.name)
2121
publishing.onlyIf { it.authenticated }
2222
uploadInBackground = isLocal
2323
}

0 commit comments

Comments
 (0)