Skip to content
Open
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 .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
15 changes: 7 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,21 @@ apply plugin: 'java'
ext {
// Cribbed from https://github.com/mindscratch/reactor-offline/blob/master/build.gradle
javadocLinks = [
"http://docs.oracle.com/javase/11/docs/api/"
"http://docs.oracle.com/javase/21/docs/api/"
] as String[]
}

repositories {
mavenCentral()
jcenter()
}

dependencies {
// Compile-time dependencies

// Test dependencies
testCompile("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
testCompile("org.assertj:assertj-core:${assertjVersion}")
testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
testImplementation("org.assertj:assertj-core:${assertjVersion}")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
}

// *********************************************************************************************************************
Expand All @@ -63,8 +62,8 @@ eclipse {

idea {
project {
jdkName = '11'
languageLevel = '11'
jdkName = '21'
languageLevel = '21'
}
}

Expand All @@ -85,7 +84,7 @@ test {
task javadocTests(type: Javadoc, group: "documentation" ) {
description = 'Generates Javadoc API documentation for the test source code.'
source = sourceSets.test.allJava
classpath = configurations.testCompile
classpath = configurations.testImplementation
options.links(project.ext.javadocLinks)
options.addBooleanOption('html5',true)
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
# dependencies. Configuring the properties in this file avoids the need to edit build.gradle except when build logic
# needs to change.
# **********************************************************************************************************************
assertjVersion=3.11.1
assertjVersion=3.25.3
description=Java 11 code examples
group=com.neiljbrown
junitJupiterVersion=5.3.2
junitJupiterVersion=5.10.2
# Set Java source & class versions to use when compiling. Needs to be defined after applying java plugin to take affect
sourceCompatibility=11
targetCompatibility=11
sourceCompatibility=21
targetCompatibility=21
# Default project version unless overridden
version=0.0.1-snapshot
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Feb 01 15:35:05 GMT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<url>https://github.com/neiljbrown/java11-examples</url>

<properties>
<java.version>11</java.version>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junitJupiterVersion>5.3.2</junitJupiterVersion>
<assertJVersion>3.11.1</assertJVersion>
<junitJupiterVersion>5.10.2</junitJupiterVersion>
<assertJVersion>3.25.3</assertJVersion>
</properties>

<dependencies>
Expand Down Expand Up @@ -44,20 +44,20 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>3.2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.1</version>
<version>3.6.3</version>
<configuration>
<additionalOptions>-html5</additionalOptions>
</configuration>
Expand Down