Upgrade Struts to 2.5.17, fix broken URLs in planet tests & prepare for Roller 5.2.1 release.
Project: http://git-wip-us.apache.org/repos/asf/roller/repo Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/c332d755 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/c332d755 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/c332d755 Branch: refs/heads/master Commit: c332d7553e1d3344f4fd875638aab55b114f85a6 Parents: 1794b22 Author: Dave Johnson <[email protected]> Authored: Sat Sep 1 08:27:05 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Sep 1 08:27:05 2018 -0400 ---------------------------------------------------------------------- .../org/apache/roller/planet/business/RomeFeedFetcherTest.java | 4 ++-- .../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/c332d755/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java index b59f65e..0f5e9e5 100644 --- a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java @@ -56,7 +56,7 @@ public class RomeFeedFetcherTest extends TestCase { Subscription sub = feedFetcher.fetchSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); @@ -76,7 +76,7 @@ public class RomeFeedFetcherTest extends TestCase { Subscription sub = feedFetcher.fetchSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0); http://git-wip-us.apache.org/repos/asf/roller/blob/c332d755/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java ---------------------------------------------------------------------- diff --git a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java index 7375058..4c03c4b 100644 --- a/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java +++ b/app/src/test/java/org/apache/roller/planet/business/SingleThreadedFeedUpdaterTest.java @@ -71,7 +71,7 @@ public class SingleThreadedFeedUpdaterTest extends TestCase { sub = mgr.getSubscription(feed_url); assertNotNull(sub); assertEquals(feed_url, sub.getFeedURL()); - assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL()); + assertEquals("https://rollerweblogger.org/roller/";, sub.getSiteURL()); assertEquals("Blogging Roller", sub.getTitle()); assertNotNull(sub.getLastUpdated()); assertTrue(sub.getEntries().size() > 0);
