diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0e1690eb97..083ca5feb9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -30,13 +30,13 @@ jobs: steps: - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'zulu' - name: Checkout Project - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false submodules: false diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da108f1ee9..88c0234450 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.java }} distribution: 'zulu' @@ -59,7 +59,7 @@ jobs: - name: Run Integration Tests run: | cd it-selenium - mvn -V -ntp -Dwebdriver.gecko.driver=$GECKOWEBDRIVER/geckodriver install + mvn -V -ntp install - name: Publish JUnit Report uses: test-summary/action@v2 @@ -76,7 +76,7 @@ jobs: # only on integration and only once in this matrix - name: Upload Dev Build on Integration if: ${{ (matrix.java == '11') && (github.event_name == 'push') }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dev-build path: ./app/target/roller.war diff --git a/app/pom.xml b/app/pom.xml index a7a0357364..f31f90d4e4 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -38,23 +38,26 @@ limitations under the License. 1.2.0 1.2 1.7.8 - 1.10.13 - 9.5 + 1.10.14 + 9.6 1.70 - 1.7 + 1.8.0 1.9.4 - 1.15 + 1.16.0 + 1.11.0 + 3.14.0 4.0.2 - 6.0.0 - 2.20.0 - 9.6.0 + 7.0.0 + 2.22.1 + 9.9.1 20100527 - 3.3.2 - 2.22.2 + 3.4.0 + 3.2.5 1.0b3 1.19.0 - 5.3.27 - 5.8.3 + 2.0.11 + 5.3.31 + 5.8.8 2.5.29 2.3 1.6 @@ -264,7 +267,7 @@ limitations under the License. org.webjars jquery - 3.6.4 + 3.7.1 @@ -363,9 +366,15 @@ limitations under the License. org.apache.commons commons-text - 1.10.0 + ${commons-text.version} + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + org.apache.xmlrpc xmlrpc-common @@ -497,7 +506,7 @@ limitations under the License. com.jgeppert.struts2.bootstrap struts2-bootstrap-plugin - 4.0.1 + 4.0.0 @@ -572,14 +581,14 @@ limitations under the License. org.mockito mockito-core - 3.12.4 + 5.9.0 test org.instancio instancio-junit - 2.16.0 + 4.0.0 test @@ -728,7 +737,7 @@ limitations under the License. maven-antrun-plugin - 3.0.0 + 3.1.0 ant-contrib @@ -786,7 +795,7 @@ limitations under the License. org.codehaus.mojo buildnumber-maven-plugin - 3.1.0 + 3.2.0 validate diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp index 802d1b740b..159bb99971 100644 --- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp +++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp @@ -5,7 +5,7 @@ You can override it with your own file via WEB-INF/tiles-def.xml <%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %> - + diff --git a/app/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java b/app/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java index ced6a41071..0ed9fd2135 100644 --- a/app/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java +++ b/app/src/test/java/org/apache/roller/planet/business/GroupFunctionalTests.java @@ -74,7 +74,7 @@ public void testGroupLookups() throws Exception { // lookup all groups in planet Planet planet = mgr.getWebloggerById(testPlanet.getId()); - Set groups = planet.getGroups(); + Set groups = planet.getGroups(); assertNotNull(groups); assertEquals(2, groups.size()); } diff --git a/app/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java b/app/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java index 4ac630714b..46998de97c 100644 --- a/app/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java +++ b/app/src/test/java/org/apache/roller/planet/business/PlanetFunctionalTests.java @@ -74,7 +74,7 @@ public void testPlanetLookups() throws Exception { assertEquals("planetFuncTest", planet.getHandle()); // all planets (should be 2, the default and the one we created) - List planets = mgr.getWebloggers(); + List planets = mgr.getWebloggers(); assertNotNull(planets); assertEquals(2, planets.size()); } diff --git a/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java b/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java index e0222d935c..1e281be44c 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/BookmarkTest.java @@ -205,7 +205,7 @@ public void _testBookmarkLookups() throws Exception { // test lookup of all bookmarks in single folder WeblogBookmarkFolder testFolder = bmgr.getFolder(f1.getId()); - List allBookmarks = bmgr.getBookmarks(testFolder); + List allBookmarks = bmgr.getBookmarks(testFolder); assertNotNull(allBookmarks); assertEquals(2, allBookmarks.size()); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java b/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java index dd2d81523f..075c1f141d 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java @@ -135,7 +135,7 @@ public void testCommentCRUD() throws Exception { public void testCommentLookups() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - List comments; + List comments; // we need some comments to play with testEntry = TestUtils.getManagedWeblogEntry(testEntry); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java b/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java index 1b086f468d..e8e8ccec9d 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java @@ -205,7 +205,7 @@ public void testLookupAllFoldersByWeblog() throws Exception { // get all folders, including root testWeblog = TestUtils.getManagedWebsite(testWeblog); - List allFolders = bmgr.getAllFolders(testWeblog); + List allFolders = bmgr.getAllFolders(testWeblog); assertNotNull(allFolders); assertEquals(5, allFolders.size()); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/HitCountTest.java b/app/src/test/java/org/apache/roller/weblogger/business/HitCountTest.java index 4faa51185b..d6fedc8b98 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/HitCountTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/HitCountTest.java @@ -286,15 +286,15 @@ public void testHotWeblogs() throws Exception { assertEquals(30, testCount.getDailyHits()); // get hot weblogs - List hotBlogs = mgr.getHotWeblogs(1, 0, 5); + List hotBlogs = mgr.getHotWeblogs(1, 0, 5); assertNotNull(hotBlogs); assertEquals(3, hotBlogs.size()); // also check ordering and values WeblogHitCount hitCount; - Iterator it = hotBlogs.iterator(); + Iterator it = hotBlogs.iterator(); for (int i=3; it.hasNext(); i--) { - hitCount = (WeblogHitCount) it.next(); + hitCount = it.next(); assertEquals(i*10, hitCount.getDailyHits()); } diff --git a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java index 1a55027a10..828735c398 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java @@ -509,14 +509,13 @@ public void testSearchMediaFile() throws Exception { assertFalse(searchResults.isEmpty()); assertEquals(id2, (searchResults.get(0)).getId()); assertNotNull((searchResults.get(0)).getDirectory()); - assertEquals("default", (searchResults.get(0)).getDirectory() - .getName()); + assertEquals("default", searchResults.get(0).getDirectory().getName()); MediaFileFilter filter3 = new MediaFileFilter(); filter3.setName("test_work.jpg"); searchResults = mfMgr.searchMediaFiles(testWeblog, filter3); assertFalse(searchResults.isEmpty()); - assertEquals(id1, ((MediaFile) searchResults.get(0)).getId()); + assertEquals(id1, searchResults.get(0).getId()); // search by tag @@ -540,8 +539,7 @@ public void testSearchMediaFile() throws Exception { searchResults = mfMgr.searchMediaFiles(testWeblog, filter4); assertFalse(searchResults.isEmpty()); assertEquals(1, searchResults.size()); - assertEquals("test_work.jpg", - ((MediaFile) searchResults.get(0)).getName()); + assertEquals("test_work.jpg", searchResults.get(0).getName()); // search by size @@ -551,8 +549,7 @@ public void testSearchMediaFile() throws Exception { searchResults = mfMgr.searchMediaFiles(testWeblog, filter6); assertFalse(searchResults.isEmpty()); assertEquals(1, searchResults.size()); - assertEquals("test_work.jpg", - ((MediaFile) searchResults.get(0)).getName()); + assertEquals("test_work.jpg", searchResults.get(0).getName()); MediaFileFilter filter7 = new MediaFileFilter(); filter7.setSize(3000); @@ -560,8 +557,7 @@ public void testSearchMediaFile() throws Exception { searchResults = mfMgr.searchMediaFiles(testWeblog, filter7); assertFalse(searchResults.isEmpty()); assertEquals(1, searchResults.size()); - assertEquals("test_home.jpg", - ((MediaFile) searchResults.get(0)).getName()); + assertEquals("test_home.jpg", searchResults.get(0).getName()); MediaFileFilter filter8 = new MediaFileFilter(); filter8.setSize(3000); @@ -569,8 +565,7 @@ public void testSearchMediaFile() throws Exception { searchResults = mfMgr.searchMediaFiles(testWeblog, filter8); assertFalse(searchResults.isEmpty()); assertEquals(1, searchResults.size()); - assertEquals("test_pers.jpg", - ((MediaFile) searchResults.get(0)).getName()); + assertEquals("test_pers.jpg", searchResults.get(0).getName()); MediaFileFilter filter9 = new MediaFileFilter(); filter9.setSize(3000); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java b/app/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java index 8b5caf519f..d9672cff21 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/PermissionTest.java @@ -124,7 +124,7 @@ public void testPermissionsCRUD() throws Exception { assertNull(perm); // create permissions - List actions = new ArrayList(); + List actions = new ArrayList<>(); actions.add(WeblogPermission.ADMIN); actions.add(WeblogPermission.POST); mgr.grantWeblogPermission(testWeblog, testUser, actions); @@ -189,7 +189,7 @@ public void testPermissionsLookups() throws Exception { perms = mgr.getWeblogPermissions(TestUtils.getManagedWebsite(testWeblog)); assertEquals(1, perms.size()); - List actions = new ArrayList(); + List actions = new ArrayList<>(); actions.add(WeblogPermission.POST); mgr.grantWeblogPermissionPending(testWeblog, user, actions); TestUtils.endSession(true); @@ -244,11 +244,9 @@ public void testInvitations() throws Exception { WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager(); UserManager umgr = WebloggerFactory.getWeblogger().getUserManager(); - WeblogPermission perm = null; - List perms = null; // invite user to weblog - List actions = new ArrayList(); + List actions = new ArrayList<>(); actions.add(WeblogPermission.EDIT_DRAFT); umgr.grantWeblogPermissionPending(testWeblog, user, actions); TestUtils.endSession(true); @@ -269,12 +267,12 @@ public void testInvitations() throws Exception { // assert that user is member of weblog assertNotNull(umgr.getWeblogPermission(testWeblog, user)); - List weblogs = wmgr.getUserWeblogs(TestUtils.getManagedUser(user), true); + List weblogs = wmgr.getUserWeblogs(TestUtils.getManagedUser(user), true); assertEquals(1, weblogs.size()); - assertEquals(testWeblog.getId(), ((Weblog)weblogs.get(0)).getId()); + assertEquals(testWeblog.getId(), weblogs.get(0).getId()); // assert that website has user - List users = wmgr.getWeblogUsers(testWeblog, true); + List users = wmgr.getWeblogUsers(testWeblog, true); assertEquals(2, users.size()); // test user can be retired from website diff --git a/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java b/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java index 557b097fcb..72c4335790 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/PingsTest.java @@ -159,7 +159,7 @@ public void testPingTargetLookups() throws Exception { assertEquals(testCommonPing.getName(), ping.getName()); // lookup all common pings - List commonPings = mgr.getCommonPingTargets(); + List commonPings = mgr.getCommonPingTargets(); assertNotNull(commonPings); // correct answer is: 4 pings in config + 1 new one = 5 assertEquals(5, commonPings.size()); @@ -331,7 +331,7 @@ public void testAutoPingLookups() throws Exception { // lookup by ping target pingTarget = ptmgr.getPingTarget(pingTarget.getId()); - List autoPings = mgr.getAutoPingsByTarget(pingTarget); + List autoPings = mgr.getAutoPingsByTarget(pingTarget); assertNotNull(autoPings); assertEquals(1, autoPings.size()); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java b/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java index ed7311538c..846849bb7e 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java @@ -21,6 +21,7 @@ import org.apache.roller.planet.pojos.Planet; import org.apache.roller.planet.pojos.PlanetGroup; import org.apache.roller.planet.pojos.Subscription; +import org.apache.roller.planet.pojos.SubscriptionEntry; import org.apache.roller.weblogger.TestUtils; import org.apache.roller.weblogger.planet.tasks.RefreshRollerPlanetTask; import org.apache.roller.weblogger.planet.tasks.SyncWebsitesTask; @@ -155,7 +156,7 @@ public void testRefreshEntries() { planetObject = planet.getWeblogger("default"); group = planet.getGroup(planetObject, "all"); - List agg = planet.getEntries(group, 0, -1); + List agg = planet.getEntries(group, 0, -1); assertEquals(3, agg.size()); } catch (Exception e) { diff --git a/app/src/test/java/org/apache/roller/weblogger/business/UserTest.java b/app/src/test/java/org/apache/roller/weblogger/business/UserTest.java index b06d7c66e3..cabbc32af3 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/UserTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/UserTest.java @@ -136,17 +136,17 @@ public void testUserLookups() throws Exception { // lookup by UserName (part) user = null; - List users1 = mgr.getUsersStartingWith(testUser.getUserName().substring(0, 3), Boolean.TRUE, 0, 1); + List users1 = mgr.getUsersStartingWith(testUser.getUserName().substring(0, 3), Boolean.TRUE, 0, 1); assertEquals(1, users1.size()); - user = (User) users1.get(0); + user = users1.get(0); assertNotNull(user); assertEquals(testUser.getUserName(), user.getUserName()); // lookup by Email (part) user = null; - List users2 = mgr.getUsersStartingWith(testUser.getEmailAddress().substring(0, 3), Boolean.TRUE, 0, 1); + List users2 = mgr.getUsersStartingWith(testUser.getEmailAddress().substring(0, 3), Boolean.TRUE, 0, 1); assertEquals(1, users2.size()); - user = (User) users2.get(0); + user = users2.get(0); assertNotNull(user); assertEquals(testUser.getUserName(), user.getUserName()); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java index cc2837dea9..111c9862c2 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java @@ -168,7 +168,7 @@ public void testLookupAllCategoriesByWeblog() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); testWeblog = TestUtils.getManagedWebsite(testWeblog); - List cats = mgr.getWeblogCategories(testWeblog); + List cats = mgr.getWeblogCategories(testWeblog); assertNotNull(cats); assertEquals(5, cats.size()); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java index 9900efc6e8..b9398d9262 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java @@ -145,8 +145,8 @@ public void testWeblogEntryLookups() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); WeblogEntry entry; - List entries; - Map entryMap; + List entries; + Map entryMap; // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); @@ -557,9 +557,9 @@ public void testGetEntriesByTag() throws Exception { wesc.setWeblog(testWeblog); // tags are always saved lowercase (testTag -> testtag) wesc.setTags(Arrays.asList("testtag")); - List results = mgr.getWeblogEntries(wesc); + List results = mgr.getWeblogEntries(wesc); assertEquals(1, results.size()); - WeblogEntry testEntry = (WeblogEntry) results.iterator().next(); + WeblogEntry testEntry = results.iterator().next(); assertEquals(entry, testEntry); // teardown our test entry @@ -594,9 +594,9 @@ public void testRemoveEntryTagCascading() throws Exception { wesc.setWeblog(testWeblog); // tags are always saved lowercase (testTag -> testtag) wesc.setTags(Arrays.asList("testtag")); - List results = mgr.getWeblogEntries(wesc); + List results = mgr.getWeblogEntries(wesc); assertEquals(1, results.size()); - WeblogEntry testEntry = (WeblogEntry) results.iterator().next(); + WeblogEntry testEntry = results.iterator().next(); assertEquals(entry, testEntry); // teardown our test entry diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java index ba3fceccff..4c4b73bd23 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java @@ -161,7 +161,7 @@ public void testPermissionsLookups() throws Exception { assertNotNull(page); // lookup all pages for weblog - List pages = mgr.getTemplates(testWeblog); + List pages = mgr.getTemplates(testWeblog); assertNotNull(pages); assertEquals(1, pages.size()); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java index 2649f63d81..b18ac1d38c 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java @@ -76,18 +76,18 @@ public void setUp() throws Exception { @Test public void testGetMostCommentedWeblogs() throws Exception { WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager(); - List list = mgr.getMostCommentedWeblogs(null, null, 0, -1); + List list = mgr.getMostCommentedWeblogs(null, null, 0, -1); assertNotNull(list); assertEquals(2, list.size()); - StatCount s1 = (StatCount)list.get(0); + StatCount s1 = list.get(0); assertEquals(website1.getId(), s1.getSubjectId()); assertEquals(3L, s1.getCount()); assertEquals(website1.getHandle(), s1.getSubjectNameShort()); assertEquals(website1.getHandle(), s1.getWeblogHandle()); - StatCount s2 = (StatCount)list.get(1); + StatCount s2 = list.get(1); assertEquals(website2.getId(), s2.getSubjectId()); assertEquals(1L, s2.getCount()); } @@ -96,24 +96,24 @@ public void testGetMostCommentedWeblogs() throws Exception { public void testGetMostCommentedWeblogEntries() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - List list = mgr.getMostCommentedWeblogEntries(null, null, null, 0, -1); + List list = mgr.getMostCommentedWeblogEntries(null, null, null, 0, -1); assertNotNull(list); assertEquals(3, list.size()); - StatCount s1 = (StatCount)list.get(0); + StatCount s1 = list.get(0); assertEquals(2L, s1.getCount()); assertEquals(entry11.getAnchor(), s1.getSubjectNameShort()); assertEquals(entry11.getWebsite().getHandle(), s1.getWeblogHandle()); - StatCount s2 = (StatCount)list.get(1); + StatCount s2 = list.get(1); assertEquals(1L, s2.getCount()); } @Test public void testGetUserNameLetterMap() throws Exception { UserManager mgr = WebloggerFactory.getWeblogger().getUserManager(); - Map map = mgr.getUserNameLetterMap(); + Map map = mgr.getUserNameLetterMap(); assertNotNull(map.get("A")); assertNotNull(map.get("B")); assertNotNull(map.get("C")); @@ -122,7 +122,7 @@ public void testGetUserNameLetterMap() throws Exception { @Test public void testGetWeblogLetterMap() throws Exception { WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager(); - Map map = mgr.getWeblogHandleLetterMap(); + Map map = mgr.getWeblogHandleLetterMap(); assertNotNull(map.get("A")); assertNotNull(map.get("B")); assertNotNull(map.get("C")); diff --git a/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java b/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java index f7ed6887ce..e21ac3d51c 100644 --- a/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/business/WeblogTest.java @@ -199,25 +199,25 @@ public void testWeblogLookups() throws Exception { // get all weblogs for user weblog = null; - List weblogs1 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true); + List weblogs1 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true); assertEquals(2, weblogs1.size()); - weblog = (Weblog) weblogs1.get(0); + weblog = weblogs1.get(0); assertNotNull(weblog); // make sure disabled weblogs are not returned weblog.setVisible(Boolean.FALSE); mgr.saveWeblog(weblog); TestUtils.endSession(true); - List weblogs2 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true); + List weblogs2 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true); assertEquals(1, weblogs2.size()); - weblog = (Weblog) weblogs2.get(0); + weblog = weblogs2.get(0); assertNotNull(weblog); // make sure inactive weblogs are not returned weblog.setActive(Boolean.FALSE); mgr.saveWeblog(weblog); TestUtils.endSession(true); - List weblogs3 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true); + List weblogs3 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true); assertEquals(0, weblogs3.size()); } finally { diff --git a/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java b/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java index e52e22a1c9..84d6463d97 100644 --- a/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java +++ b/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java @@ -95,7 +95,7 @@ private void verifyResourceBundle(String bundle) throws Exception { + bundle + ".properties")); - Set keys = baseProps.keySet(); + Set keys = baseProps.keySet(); boolean missingMessage = false; // check Chinese diff --git a/db-utils/pom.xml b/db-utils/pom.xml index f5bf9e9c7c..785b177952 100644 --- a/db-utils/pom.xml +++ b/db-utils/pom.xml @@ -54,7 +54,7 @@ org.apache.commons commons-lang3 - 3.1 + 3.14.0 compile diff --git a/it-selenium/nbactions.xml b/it-selenium/nbactions.xml index 279d8ca673..e0ead434bd 100644 --- a/it-selenium/nbactions.xml +++ b/it-selenium/nbactions.xml @@ -8,10 +8,6 @@ clean install - - - geckodriver - @@ -23,8 +19,6 @@ maven - - geckodriver diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml index ab7061d0ad..e8742df1e6 100644 --- a/it-selenium/pom.xml +++ b/it-selenium/pom.xml @@ -48,20 +48,14 @@ org.seleniumhq.selenium selenium-java - 3.141.59 - - - org.apache.commons - commons-lang3 - - + 4.17.0 test org.seleniumhq.selenium selenium-firefox-driver - 3.141.59 + 4.17.0 javax.servlet @@ -128,13 +122,13 @@ can be removed once maven itself bumped the version --> maven-war-plugin - 3.3.1 + 3.4.0 maven-failsafe-plugin - 3.0.0-M5 + 3.2.5 diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java index 16354fbc0c..53a76996f3 100644 --- a/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java +++ b/it-selenium/src/test/java/org/apache/roller/selenium/AbstractRollerPage.java @@ -17,6 +17,7 @@ */ package org.apache.roller.selenium; +import java.time.Duration; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; @@ -35,7 +36,7 @@ public abstract class AbstractRollerPage { protected void verifyPageTitle(String waitForElementId, String pageTitle) { - WebDriverWait wait = new WebDriverWait(driver, 10); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(10)); wait.until( ExpectedConditions.visibilityOf( driver.findElement(By.id(waitForElementId)))); verifyPageTitle(pageTitle); diff --git a/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java b/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java index 5c3114ddcf..ea50a9c5bf 100644 --- a/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java +++ b/it-selenium/src/test/java/org/apache/roller/selenium/core/RegisterPage.java @@ -17,6 +17,7 @@ */ package org.apache.roller.selenium.core; +import java.time.Duration; import org.apache.roller.selenium.AbstractRollerPage; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @@ -39,7 +40,7 @@ public RegisterPage(WebDriver driver) { public WelcomePage submitUserRegistration() { clickById("submit"); - WebDriverWait wait = new WebDriverWait(driver, 10); + WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(10)); wait.until( ExpectedConditions.visibilityOf( driver.findElement(By.id("a_clickHere")))); driver.findElement(By.id("a_clickHere")).click(); diff --git a/pom.xml b/pom.xml index c7a21258c3..0acb7f7a66 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ limitations under the License. 10.11.1.1 1.4.7 2.3.1 - 10.0.16 + 10.0.19 UTF-8 UTF-8 6.1.2 @@ -62,7 +62,7 @@ limitations under the License. org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 11 true @@ -93,7 +93,7 @@ limitations under the License. org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.2 file:version-rules.xml @@ -107,7 +107,7 @@ limitations under the License. org.junit.jupiter junit-jupiter-engine - 5.9.3 + 5.10.1 test