Skip to content

Commit

Permalink
Dependency updates (#6)
Browse files Browse the repository at this point in the history
* update springboot, add test logger plugin

* bump versions, add test logger
  • Loading branch information
farrell-m authored Sep 24, 2024
1 parent 6c19fc9 commit 0466ea4
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 13 deletions.
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "gradle" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ A general purpose Java plugin for LAA CCMS projects.
- apply [Jacoco](https://docs.gradle.org/current/userguide/jacoco_plugin.html) plugin, and configure sensible defaults.
- apply [Versions](https://github.com/ben-manes/gradle-versions-plugin) plugin, and configure the recommended versioning strategy.
- apply [Checkstyle](https://docs.gradle.org/current/userguide/checkstyle_plugin.html) plugin, and configure sensible defaults.
- apply [Test Logger](https://github.com/radarsh/gradle-test-logger-plugin) plugin for better readability of test outputs.
- apply [Maven Publish](https://docs.gradle.org/current/userguide/publishing_maven.html) plugin, and configure LAA CCMS repositories and credential resolution for local development and pipelines. For publishing, the repository name can be overridden by setting the `repositoryName` property in your `gradle.properties`. This is helpful when your repository name is different from your project name.
- apply [Gradle Release](https://github.com/researchgate/gradle-release) plugin, and define a release tag format.

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/groovy/gradle-plugin-conventions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ java {
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.2'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
}

Expand Down
9 changes: 6 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@ version=0.0.5-SNAPSHOT

# org.springframework.boot:spring-boot-gradle-plugin
# org.springframework.boot:spring-boot-dependencies
springBootVersion = 3.2.5
springBootVersion = 3.3.4

# io.spring.gradle:dependency-management-plugin
springBootDependencyManagementPluginVersion = 1.1.5
springBootDependencyManagementPluginVersion = 1.1.6

# com.github.ben-manes:gradle-versions-plugin
gradleVersionsPluginVersion = 0.51.0

# checkstyle
checkstyleVersion = 10.12.4
checkstyleVersion = 10.18.1

# com.adarshr:gradle-test-logger-plugin
testLoggerPluginVersion = 4.0.0

javaVersion = 21
1 change: 1 addition & 0 deletions laa-ccms-java-gradle-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ group = 'uk.gov.laa.ccms.java'

dependencies {
implementation "com.github.ben-manes:gradle-versions-plugin:${gradleVersionsPluginVersion}"
implementation "com.adarshr:gradle-test-logger-plugin:${testLoggerPluginVersion}"
}

gradlePlugin {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package uk.gov.laa.ccms.gradle

import com.adarshr.gradle.testlogger.TestLoggerPlugin
import com.github.benmanes.gradle.versions.VersionsPlugin
import org.gradle.api.Plugin
import org.gradle.api.Project
Expand All @@ -14,7 +15,7 @@ import org.gradle.testing.jacoco.plugins.JacocoPlugin
class LaaCcmsJavaGradlePlugin implements Plugin<Project> {

private static final String JAVA_VERSION = "21"
private static final String CHECKSTYLE_VERSION = "10.12.4"
private static final String CHECKSTYLE_VERSION = "10.18.1"

@Override
void apply(Project target) {
Expand All @@ -23,6 +24,7 @@ class LaaCcmsJavaGradlePlugin implements Plugin<Project> {
target.pluginManager.apply JacocoPlugin
target.pluginManager.apply VersionsPlugin
target.pluginManager.apply CheckstylePlugin
target.pluginManager.apply TestLoggerPlugin
target.pluginManager.apply MavenPublishPlugin

target.java {
Expand All @@ -31,12 +33,6 @@ class LaaCcmsJavaGradlePlugin implements Plugin<Project> {

/** Test Tasks **/

// Additional logging
target.tasks.withType(Test).configureEach {
testLogging.showStandardStreams = true
testLogging.showStackTraces = true
}

// Integration tests
if (target.tasks.findByName('integrationTest') == null) {
target.sourceSets {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies {
transitive = false
}

implementation 'io.swagger.core.v3:swagger-models:2.2.22'
implementation 'io.swagger.core.v3:swagger-models:2.2.23'

implementation 'org.springframework.boot:spring-boot-starter-web'

Expand All @@ -25,7 +25,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-validation'

testImplementation 'org.assertj:assertj-core:3.4.1'
testImplementation 'org.assertj:assertj-core:3.26.3'
}

checkstyle {
Expand Down

0 comments on commit 0466ea4

Please sign in to comment.