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
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ The library is licensed under the [Apache License, Version 2.0](http://www.apach

## Release notes

### [4.0.1](https://github.com/jenetics/jpx/releases/tag/v4.0.1)

#### Bugs

* [#190](https://github.com/jenetics/jpx/issues/190): GPX.read cannot handle Files with BOM.

### [4.0.0](https://github.com/jenetics/jpx/releases/tag/v4.0.0)

#### Improvements
Expand Down
13 changes: 13 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
## Release notes

### [4.0.1](https://github.com/jenetics/jpx/releases/tag/v4.0.1)

#### Bugs

* [#190](https://github.com/jenetics/jpx/issues/190): GPX.read cannot handle Files with BOM.

### [4.0.0](https://github.com/jenetics/jpx/releases/tag/v4.0.0)

#### Improvements

* [#177](https://github.com/jenetics/jpx/issues/177): Convert 'geom' classes to records.
* [#192](https://github.com/jenetics/jpx/issues/192): Update library to Java 25.

### [3.2.1](https://github.com/jenetics/jpx/releases/tag/v3.2.1)

#### Improvements
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ plugins {
rootProject.version = JPX.VERSION

tasks.named<Wrapper>("wrapper") {
version = "9.3.1"
version = "9.7.1"
distributionType = Wrapper.DistributionType.ALL
}

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Env.kt
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ object Env {
* Information about the library and author.
*/
object JPX {
const val VERSION = "4.0.0"
const val VERSION = "4.0.1"
const val ID = "jpx"
const val NAME = "jpx"
const val GROUP = "io.jenetics"
Expand Down
52 changes: 26 additions & 26 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
[versions]
assertj = "3.27.7"
codemodel = "4.0.6"
codemodel = "4.0.9"
commons-csv = "1.14.1"
commons-math4-legacy = "4.0-beta1"
commons-numbers-combinatorics = "1.2"
commons-numbers-core = "1.2"
commons-numbers-gamma = "1.2"
commons-numbers-rootfinder = "1.2"
commons-rng-sampling = "1.6"
commons-rng-simple = "1.6"
commons-statistics-descriptive = "1.2"
commons-statistics-distribution = "1.2"
equalsverifier = "4.4"
commons-numbers-combinatorics = "1.3"
commons-numbers-core = "1.3"
commons-numbers-gamma = "1.3"
commons-numbers-rootfinder = "1.3"
commons-rng-sampling = "1.7"
commons-rng-simple = "1.7"
commons-statistics-descriptive = "1.3"
commons-statistics-distribution = "1.3"
equalsverifier = "4.5.2"
facilejdbc = "2.1.1"
guava = "33.5.0-jre"
h2 = "2.4.240"
jackson = "2.21"
jackson-databind-nullable = "0.2.9"
jackson-datatype-jsr310 = "2.21.0"
jacoco-agent = "0.8.14"
guava = "33.7.1-jre"
h2 = "2.5.250"
jackson = "2.22"
jackson-databind-nullable = "0.2.11"
jackson-datatype-jsr310 = "2.22.2"
jacoco-agent = "0.8.15"
jakarta-annotation-api = "3.0.0"
jakarta-validation-api = "3.1.1"
javacsv = "2.0"
jexl = "3.6.2"
jexl = "3.7.0"
jmh = "0.7.3"
jpx = "3.2.1"
lombok = "9.2.0"
mvel = "2.5.2.Final"
jpx = "4.0.0"
lombok = "9.5.0"
mvel = "2.5.4.Final"
nashorn = "15.7"
openapi-generator = "7.20.0"
openapi-generator = "7.25.0"
opencsv = "5.12.0"
prngine = "2.0.0"
reactor-core = "3.8.3"
reactor-core = "3.8.7"
rxjava = "2.2.21"
supercsv = "2.4.0"
swagger-models = "2.2.43"
swagger-parser = "2.1.38"
swagger-models = "2.2.55"
swagger-parser = "2.1.48"
testng = "7.12.0"
version-catalog-update = "1.1.0"
version-catalog-update = "1.1.1"

[plugins]
jmh = { id = "me.champeau.jmh", version.ref = "jmh" }
Expand All @@ -63,7 +63,7 @@ facilejdbc = { module = "io.jenetics:facilejdbc", version.ref = "facilejdbc" }
guava = { module = "com.google.guava:guava", version.ref = "guava" }
h2 = { module = "com.h2database:h2", version.ref = "h2" }
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson" }
jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.21.0"
jackson-databind = "com.fasterxml.jackson.core:jackson-databind:2.22.2"
jackson-databind-nullable = { module = "org.openapitools:jackson-databind-nullable", version.ref = "jackson-databind-nullable" }
jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson-datatype-jsr310" }
jacoco-agent = { module = "org.jacoco:org.jacoco.agent", version.ref = "jacoco-agent" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-all.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 3 additions & 6 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 12 additions & 24 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions jpx/src/main/java/io/jenetics/jpx/GPX.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Serial;
import java.io.Serializable;
import java.io.StringReader;
import java.io.UncheckedIOException;
import java.net.URI;
import java.nio.file.Files;
Expand Down Expand Up @@ -1209,10 +1209,7 @@ public GPX read(final Source source)
public GPX read(final InputStream input)
throws IOException
{
final var wrapper = new NonCloseableInputStream(input);
try (var reader = new InputStreamReader(wrapper, UTF_8)) {
return read(new StreamSource(reader));
}
return read(new StreamSource(new NonCloseableInputStream(input)));
}

/**
Expand Down Expand Up @@ -1273,7 +1270,7 @@ public GPX read(final String path) throws IOException {
*/
public GPX fromString(final String xml) {
try {
return read(new ByteArrayInputStream(xml.getBytes()));
return read(new StreamSource(new StringReader(xml)));
} catch (InvalidObjectException e) {
if (e.getCause() instanceof IllegalArgumentException iae) {
throw iae;
Expand Down
Loading
Loading