Merge branch 'releases/r4.0.0' into issues/JPX-1-JDBC_access

Signed-off-by: Franz Wilhelmstötter <franz.wilhelmstoetter@gmail.com>

; Conflicts:
;	.github/workflows/gradle.yml
;	build.gradle.kts
;	buildSrc/build.gradle.kts
;	gradle/wrapper/gradle-wrapper.properties
;	jpx/build.gradle.kts
;	jpx/src/main/java/io/jenetics/jpx/GPX.java
;	jpx/src/main/java/io/jenetics/jpx/package-info.java

Author: jenetics

.github/workflows/gradle.yml

@@ -17,7 +17,7 @@ jobs:
         strategy:
             matrix:
                 os: [ ubuntu-latest, macos-latest ]
-                java-version: [ 21  ]
+                java-version: [ 21, 24  ]
         steps:
             - uses: actions/checkout@v2
 
@@ -27,4 +27,4 @@ jobs:
                   java-version: ${{ matrix.java-version }}
                   distribution: 'zulu'
             - name: Build with Gradle
-              run: ./gradlew build --stacktrace --info
+              run: ./gradlew build --stacktrace --info

build.gradle.kts

@@ -1,5 +1,6 @@
 import io.jenetics.gradle.dsl.isModule
 import io.jenetics.gradle.dsl.moduleName
+import org.apache.tools.ant.filters.ReplaceTokens
 
 /*
  * Java GPX Library (@__identifier__@).
@@ -9,7 +10,7 @@ import io.jenetics.gradle.dsl.moduleName
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *	  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,7 +19,7 @@ import io.jenetics.gradle.dsl.moduleName
  * limitations under the License.
  *
  * Author:
- *    Franz Wilhelmstötter (franz.wilhelmstoetter@gmail.com)
+ *	Franz Wilhelmstötter (franz.wilhelmstoetter@gmail.com)
  */
 
 /**
@@ -28,91 +29,67 @@ import io.jenetics.gradle.dsl.moduleName
  */
 plugins {
 	base
-    alias(libs.plugins.version.catalog.update)
+	alias(libs.plugins.version.catalog.update)
 }
 
 rootProject.version = JPX.VERSION
 
 tasks.named<Wrapper>("wrapper") {
-	version = "8.11"
+	version = "9.0.0"
 	distributionType = Wrapper.DistributionType.ALL
 }
 
 /**
  * Project configuration *before* the projects has been evaluated.
  */
 allprojects {
-    group =  JPX.GROUP
-    version = rootProject.version
-
-    repositories {
-        flatDir {
-            dirs("${rootDir}/buildSrc/lib")
-        }
-        mavenLocal()
-        mavenCentral()
-    }
-
-    configurations.all {
-        resolutionStrategy.preferProjectModules()
-    }
+	group =  JPX.GROUP
+	version = JPX.VERSION
+
+	repositories {
+		flatDir {
+			dirs("${rootDir}/buildSrc/lib")
+		}
+		mavenLocal()
+		mavenCentral()
+	}
+
+	configurations.all {
+		resolutionStrategy.preferProjectModules()
+	}
 }
 
 /**
  * Project configuration *after* the projects has been evaluated.
  */
-subprojects {
-    val project = this
-
-    tasks.withType<Test> {
-        useTestNG()
-    }
-
-    plugins.withType<JavaPlugin> {
-        configure<JavaPluginExtension> {
-            modularity.inferModulePath = true
-
-            sourceCompatibility = JavaVersion.VERSION_21
-            targetCompatibility = JavaVersion.VERSION_21
+gradle.projectsEvaluated {
+	subprojects {
+		val project = this
 
-            toolchain {
-                languageVersion = JavaLanguageVersion.of(21)
-            }
-        }
+		tasks.withType<JavaCompile> {
+			options.compilerArgs.add("-Xlint:" + xlint())
+		}
 
-        setupJava(project)
-        setupTestReporting(project)
-    }
+		plugins.withType<JavaPlugin> {
+			configure<JavaPluginExtension> {
+				sourceCompatibility = JavaVersion.VERSION_21
+				targetCompatibility = JavaVersion.VERSION_21
+			}
 
-    tasks.withType<JavaCompile> {
-        modularity.inferModulePath = true
+			configure<JavaPluginExtension> {
+				modularity.inferModulePath.set(true)
+			}
 
-        options.compilerArgs.add("-Xlint:${xlint()}")
-    }
+			setupJava(project)
+			setupTestReporting(project)
+			setupJavadoc(project)
+		}
 
-}
+		if (plugins.hasPlugin("maven-publish")) {
+			setupPublishing(project)
+		}
+	}
 
-gradle.projectsEvaluated {
-    subprojects {
-        if (plugins.hasPlugin("maven-publish")) {
-            setupPublishing(project)
-        }
-
-        // Enforcing the library version defined in the version catalogs.
-        val catalogs = extensions.getByType<VersionCatalogsExtension>()
-        val libraries = catalogs.catalogNames
-            .map { catalogs.named(it) }
-            .flatMap { catalog -> catalog.libraryAliases.map { alias -> Pair(catalog, alias) } }
-            .map { it.first.findLibrary(it.second).get().get() }
-            .filter { it.version != null }
-            .map { it.toString() }
-            .toTypedArray()
-
-        configurations.all {
-            resolutionStrategy.preferProjectModules()
-            resolutionStrategy.force(*libraries)
-        }
-    }
 }
 
 /**
@@ -253,6 +230,9 @@ fun xlint(): String {
 
 val identifier = "${JPX.ID}-${JPX.VERSION}"
 
+/**
+ * Setup of the Maven publishing.
+ */
 /**
  * Setup of the Maven publishing.
  */
@@ -264,26 +244,29 @@ fun setupPublishing(project: Project) {
 
 	project.tasks.named<Jar>("sourcesJar") {
 		filter(
-			org.apache.tools.ant.filters.ReplaceTokens::class, "tokens" to mapOf(
-			"__identifier__" to identifier,
-			"__year__" to Env.COPYRIGHT_YEAR
-		)
+			ReplaceTokens::class, "tokens" to mapOf(
+				"__identifier__" to identifier,
+				"__year__" to Env.COPYRIGHT_YEAR
+			)
 		)
 	}
 
 	project.tasks.named<Jar>("javadocJar") {
 		filter(
-			org.apache.tools.ant.filters.ReplaceTokens::class, "tokens" to mapOf(
-			"__identifier__" to identifier,
-			"__year__" to Env.COPYRIGHT_YEAR
-		)
+			ReplaceTokens::class, "tokens" to mapOf(
+				"__identifier__" to identifier,
+				"__year__" to Env.COPYRIGHT_YEAR
+			)
 		)
 	}
 
 	project.configure<PublishingExtension> {
 		publications {
 			create<MavenPublication>("mavenJava") {
-				artifactId = JPX.ID
+				suppressPomMetadataWarningsFor("testFixturesApiElements")
+				suppressPomMetadataWarningsFor("testFixturesRuntimeElements")
+
+				artifactId = project.name
 				from(project.components["java"])
 				versionMapping {
 					usage("java-api") {
@@ -323,24 +306,23 @@ fun setupPublishing(project: Project) {
 		}
 		repositories {
 			maven {
-				url = if (version.toString().endsWith("SNAPSHOT")) {
-					uri(Maven.SNAPSHOT_URL)
-				} else {
-					uri(Maven.RELEASE_URL)
-				}
+				url = if (version.toString().endsWith("SNAPSHOT"))
+					uri(layout.buildDirectory.dir("repos/snapshots"))
+				else
+					uri(layout.buildDirectory.dir("repos/releases"))
+			}
+		}
 
-				credentials {
-					username = if (extra.properties["nexus_username"] != null) {
-						extra.properties["nexus_username"] as String
-					} else {
-						"nexus_username"
-					}
-					password = if (extra.properties["nexus_password"] != null) {
-						extra.properties["nexus_password"] as String
-					} else {
-						"nexus_password"
-					}
-				}
+		// Exclude test fixtures from publication, as we use them only internally
+		plugins.withId("org.gradle.java-test-fixtures") {
+			val component = components["java"] as AdhocComponentWithVariants
+			component.withVariantsFromConfiguration(configurations["testFixturesApiElements"]) { skip() }
+			component.withVariantsFromConfiguration(configurations["testFixturesRuntimeElements"]) { skip() }
+
+			// Workaround to not publish test fixtures sources added by com.vanniktech.maven.publish plugin
+			// TODO: Remove as soon as https://github.com/vanniktech/gradle-maven-publish-plugin/issues/779 closed
+			afterEvaluate {
+				component.withVariantsFromConfiguration(configurations["testFixturesSourcesElements"]) { skip() }
 			}
 		}
 	}

buildSrc/build.gradle.kts

@@ -24,11 +24,11 @@
  * @version 3.2
  */
 plugins {
-    `java-gradle-plugin`
-    `kotlin-dsl`
+	`java-gradle-plugin`
+	`kotlin-dsl`
 }
 
 repositories {
-    mavenLocal()
-    gradlePluginPortal()
+	mavenLocal()
+	gradlePluginPortal()
 }

buildSrc/resources/javadoc/java.se/element-list

@@ -3,6 +3,7 @@ java.io
 java.lang
 java.lang.annotation
 java.lang.constant
+java.lang.foreign
 java.lang.invoke
 java.lang.module
 java.lang.ref
@@ -221,12 +222,9 @@ module:jdk.hotspot.agent
 module:jdk.httpserver
 com.sun.net.httpserver
 com.sun.net.httpserver.spi
-module:jdk.incubator.foreign
-jdk.incubator.foreign
 module:jdk.incubator.vector
 jdk.incubator.vector
 module:jdk.jartool
-com.sun.jarsigner
 jdk.security.jarsigner
 module:jdk.javadoc
 jdk.javadoc.doclet

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

jpx/build.gradle.kts

@@ -35,7 +35,7 @@ description = "JPX - Java GPX (GPS) Library"
 moduleName = "io.jenetics.jpx"
 
 dependencies {
-    testImplementation(libs.assertj.core)
+	testImplementation(libs.assertj.core)
 	testImplementation(libs.equalsverifier)
 	testImplementation(libs.prngine)
 	testImplementation(libs.testng)

jpx/src/main/java/io/jenetics/jpx/GPX.java

@@ -122,8 +122,8 @@
  * final GPX gpx = GPX.Reader.of(GPX.Reader.Mode.LENIENT).read("track.xml");
  * }
  *
- * This allows reading otherwise invalid GPX files, like
- * <pre>{@code
+ * This allows to read otherwise invalid GPX files, like
+ * {@snippet lang="java":
  * <?xml version="1.0" encoding="UTF-8"?>
  * <gpx version="1.1" creator="GPSBabel - http://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/1">
  *   <metadata>
@@ -1625,8 +1625,8 @@ byte[] toByteArray(final GPX gpx) {
 		 * {@link WayPoint#getLongitude()}, ...
 		 * <p>
 		 * The example below shows the <em>lat</em> and <em>lon</em> values with
-		 * maximal five fractional digits.
-		 * <pre>{@code
+		 * maximal 5 fractional digits.
+		 * {@snippet lang="java":
 		 * <trkpt lat="45.78068" lon="12.55368">
 		 *     <ele>1.2</ele>
 		 *     <time>2009-08-30T07:08:21Z</time>

jpx/src/main/java/io/jenetics/jpx/package-info.java

@@ -21,7 +21,7 @@
 /**
  * This is the base package of the <a href="https://github.com/jenetics/jpx">
  * JPX</a> library. It contains the <em>domain</em> objects which are needed
- * for full modeling of the <a href="https://www.topografix.com/GPX/1/1/">
+ * for fully modeling of the <a href="https://www.topografix.com/GPX/1/1/">
  * GPX standard 1.1</a> and <a href="http://www.topografix.com/gpx_manual.as">
  * 1.0</a>.
  *