This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 1a8a32e95 Move to Java 17 for building.
1a8a32e95 is described below
commit 1a8a32e95965bff3c481a495d5539e6f13012834
Author: James Bognar <[email protected]>
AuthorDate: Mon May 12 10:35:06 2025 -0400
Move to Java 17 for building.
---
.../org/apache/juneau/assertions/FluentCollectionAssertion.java | 2 +-
.../main/java/org/apache/juneau/assertions/FluentDateAssertion.java | 4 ++--
.../main/java/org/apache/juneau/assertions/FluentMapAssertion.java | 2 +-
.../org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java | 2 +-
.../java/org/apache/juneau/assertions/FluentStringAssertion.java | 2 +-
.../juneau-config/src/main/java/org/apache/juneau/config/Entry.java | 6 +++---
.../src/main/resources/META-INF/persistence.xml | 1 -
pom.xml | 4 ++--
8 files changed, 11 insertions(+), 12 deletions(-)
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
index fb776768e..83ffffabb 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentCollectionAssertion.java
@@ -186,7 +186,7 @@ public class FluentCollectionAssertion<E,R> extends
FluentObjectAssertion<Collec
* @return A new assertion.
*/
public FluentIntegerAssertion<R> asSize() {
- return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().size(), returns());
+ return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: value().size(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
index fe7491e16..03191104b 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentDateAssertion.java
@@ -184,7 +184,7 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
* @return A new assertion.
*/
public FluentLongAssertion<R> asEpochMillis() {
- return new FluentLongAssertion<>(this, valueIsNull() ? null :
value().getTime(), returns());
+ return new FluentLongAssertion<R>(this, valueIsNull() ? null :
value().getTime(), returns());
}
/**
@@ -197,7 +197,7 @@ public class FluentDateAssertion<R> extends
FluentComparableAssertion<Date,R> {
* @return A new assertion.
*/
public FluentLongAssertion<R> asEpochSeconds() {
- return new FluentLongAssertion<>(this, valueIsNull() ? null :
value().getTime() / 1000, returns());
+ return new FluentLongAssertion<R>(this, valueIsNull() ? null :
value().getTime() / 1000, returns());
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
index 002d96a2a..a4e73f472 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentMapAssertion.java
@@ -220,7 +220,7 @@ public class FluentMapAssertion<K,V,R> extends
FluentObjectAssertion<Map<K,V>,R>
* @return A new assertion.
*/
public FluentIntegerAssertion<R> asSize() {
- return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().size(), returns());
+ return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: value().size(), returns());
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
index 77a4d43fa..bd0d5d4d8 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentPrimitiveArrayAssertion.java
@@ -220,7 +220,7 @@ public class FluentPrimitiveArrayAssertion<E,T,R> extends
FluentObjectAssertion<
* @return A new assertion.
*/
public FluentIntegerAssertion<R> asLength() {
- return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: Array.getLength(value()), returns());
+ return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: Array.getLength(value()), returns());
}
//-----------------------------------------------------------------------------------------------------------------
diff --git
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
index 77cd2b6aa..8ea74bd74 100644
---
a/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
+++
b/juneau-core/juneau-assertions/src/main/java/org/apache/juneau/assertions/FluentStringAssertion.java
@@ -299,7 +299,7 @@ public class FluentStringAssertion<R> extends
FluentObjectAssertion<String,R> {
* @return This object.
*/
public FluentIntegerAssertion<R> asLength() {
- return new FluentIntegerAssertion<>(this, valueIsNull() ? null
: value().length(), returns());
+ return new FluentIntegerAssertion<R>(this, valueIsNull() ? null
: value().length(), returns());
}
/**
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
index 4faab7b9a..5ce55cae8 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/Entry.java
@@ -313,7 +313,7 @@ public class Entry {
* @return The value, or {@link Optional#empty()} if the value does not
exist or the value is empty.
*/
public Optional<Integer> asInteger() {
- return optional(isEmpty() ? null :
parseIntWithSuffix(toString()));
+ return optional(isEmpty() ? null :
(Integer)parseIntWithSuffix(toString()));
}
@@ -326,7 +326,7 @@ public class Entry {
* @return The value, or {@link Optional#empty()} if the value does not
exist or the value is empty.
*/
public Optional<Boolean> asBoolean() {
- return optional(isEmpty() ? null :
Boolean.parseBoolean(toString()));
+ return optional(isEmpty() ? null :
(Boolean)Boolean.parseBoolean(toString()));
}
/**
@@ -360,7 +360,7 @@ public class Entry {
* @return The value, or {@link Optional#empty()} if the value does not
exist or the value is empty.
*/
public Optional<Long> asLong() {
- return optional(isEmpty() ? null :
parseLongWithSuffix(toString()));
+ return optional(isEmpty() ? null :
(Long)parseLongWithSuffix(toString()));
}
diff --git
a/juneau-examples/juneau-examples-rest/src/main/resources/META-INF/persistence.xml
b/juneau-examples/juneau-examples-rest/src/main/resources/META-INF/persistence.xml
index 52c463739..e4424150e 100644
---
a/juneau-examples/juneau-examples-rest/src/main/resources/META-INF/persistence.xml
+++
b/juneau-examples/juneau-examples-rest/src/main/resources/META-INF/persistence.xml
@@ -14,7 +14,6 @@
-->
<persistence
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
https://java.sun.com/xml/ns/persistence/persistence_2_0.xsd";
version="2.0" xmlns="http://java.sun.com/xml/ns/persistence";>
<persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
<class>org.apache.juneau.examples.rest.petstore.dto.Pet</class>
diff --git a/pom.xml b/pom.xml
index 7d232858d..3c2be2c28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,8 +32,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<jaxb.version>2.3.2</jaxb.version>
<junit.version>4.13.2</junit.version>
