Skip to content

Require Java 25 #2833

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

Open
labkey-jeckels wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Require Java 25 #2833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c147667
Require Java 25
labkey-jeckels Jan 3, 2026
a393307
Update AspectJ for Java 25 support
labkey-tchad Jan 5, 2026
3545d81
Switch to MutableInt
labkey-jeckels Jan 5, 2026
3dd1a90
Merge branch 'develop' into fb_requireJava25
labkey-jeckels Jan 7, 2026
45d55c5
Merge branch 'develop' into fb_requireJava25
labkey-jeckels Jan 9, 2026
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 gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apacheCommonsCsvVersion=1.14.1

aspectjVersion=1.9.24
aspectjVersion=1.9.25.1

assertjVersion=3.27.6

Expand Down
7 changes: 0 additions & 7 deletions src/org/labkey/serverapi/reader/DataLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,6 @@ public void close() throws IOException
{
_closed = true;
}

@Override
protected void finalize() throws Throwable
{
super.finalize();
// assert _closed; TODO: Uncomment to force all callers to close iterator.
}
}
}

11 changes: 6 additions & 5 deletions src/org/labkey/test/tests/component/EditableGridTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.labkey.test.tests.component;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.mutable.MutableInt;
import org.json.JSONObject;
import org.junit.BeforeClass;
import org.junit.Ignore;
Expand Down Expand Up @@ -314,8 +315,8 @@ public void testDragFillSingleRow()
// Get the various row heights before adding a value to the multiLine field.
WebElement gridRow = Locator.tag("tr").findElements(testGrid).get(1);
int rowHeightBefore = gridRow.getSize().height;
var totalHeightBefore = new Object(){int size = 0; };
Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightBefore.size = totalHeightBefore.size + gr.getSize().height);
var totalHeightBefore = new MutableInt(0);
Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightBefore.add(gr.getSize().height));
WebElement topLeft = testGrid.setCellValue(0, FILL_STRING, stringValue);

testGrid.setCellValue(0, FILL_INT, intValue);
Expand Down Expand Up @@ -351,12 +352,12 @@ public void testDragFillSingleRow()
testGrid.getColumnData(FILL_DATE));

// Check that pasting increased the size of all the rows.
var totalHeightAfter = new Object(){int size = 0; };
Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightAfter.size = totalHeightAfter.size + gr.getSize().height);
var totalHeightAfter = new MutableInt(0);
Locator.tag("tr").findElements(testGrid).forEach(gr -> totalHeightAfter.add(gr.getSize().height));

checker().withScreenshot()
.verifyTrue("The total height of all the rows should have increases after the paste.",
totalHeightBefore.size + (3 * rowHeightBefore) >= totalHeightAfter.size);
totalHeightBefore.intValue() + (3 * rowHeightBefore) >= totalHeightAfter.intValue());
}

@Test
Expand Down