Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Java 17 cleanup #36

Merged
merged 4 commits into from
Mar 6, 2024
Merged

Java 17 cleanup #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6760b1b
wicket 10 requires java 17, so we can bump to it as well
xthiba Mar 5, 2024
a81dbeb
remove obsolete test case
xthiba Mar 5, 2024
c324078
remove obsolete fallback files
xthiba Mar 5, 2024
f7ccd49
remove unused imports
xthiba Mar 6, 2024
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
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>

<wicket.version>10.0.0-M2</wicket.version>
<jackson.version>2.16.1</jackson.version>
Expand Down
41 changes: 0 additions & 41 deletions ...-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-in.js
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions ...-jquery-ui/src/main/resources/org/wicketstuff/wiquery/ui/datepicker/i18n/datepicker-iw.js
View file
Open in desktop

This file was deleted.

24 changes: 1 addition & 23 deletions ...va/org/wicketstuff/wiquery/ui/datepicker/DatePickerLanguageResourceReferenceTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator;
import org.apache.wicket.util.lang.Packages;

import org.junit.jupiter.api.condition.EnabledForJreRange;
import org.junit.jupiter.api.condition.EnabledOnJre;
import org.junit.jupiter.api.condition.JRE;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -87,8 +84,7 @@ public void testGetJsFileName()
}

@Test
@EnabledForJreRange(min = JRE.JAVA_17)
public void testRenamedLocales_JDK17OrLater()
public void testRenamedLocales()
{
assertEquals(DatePickerLanguages.INDONESIAN,
DatePickerLanguages.getDatePickerLanguages(new Locale("in")));
Expand All @@ -111,22 +107,4 @@ public void testRenamedLocales_JDK17OrLater()
// kz does not exist
assertNotEquals(new Locale("kk"), new Locale("kz"));
}

@Test
@EnabledForJreRange(max =JRE.JAVA_16)
xthiba marked this conversation as resolved.
Show resolved Hide resolved
public void testRenamedLocales_preJava17() {
assertEquals(DatePickerLanguages.INDONESIAN,
DatePickerLanguages.getDatePickerLanguages(new Locale("in")));
assertEquals(DatePickerLanguages.INDONESIAN,
DatePickerLanguages.getDatePickerLanguages(new Locale("id")));
assertEquals(DatePickerLanguages.getJsFileName(DatePickerLanguages.INDONESIAN),
"i18n/datepicker-in.js");

assertEquals(DatePickerLanguages.HEBREW,
DatePickerLanguages.getDatePickerLanguages(new Locale("he")));
assertEquals(DatePickerLanguages.HEBREW,
DatePickerLanguages.getDatePickerLanguages(new Locale("iw")));
assertEquals(DatePickerLanguages.getJsFileName(DatePickerLanguages.HEBREW),
"i18n/datepicker-iw.js");
}
}