Repository: roller Updated Branches: refs/heads/master 947ddf39a -> 40547d2fd
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/1794b224 Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/1794b224 Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/1794b224 Branch: refs/heads/master Commit: 1794b224334d8c3868771390502839aed1f5fed9 Parents: 2d19f5a Author: Dave Johnson <[email protected]> Authored: Sat Sep 1 08:23:47 2018 -0400 Committer: Dave Johnson <[email protected]> Committed: Sat Sep 1 08:23:47 2018 -0400 ---------------------------------------------------------------------- app/pom.xml | 4 ++-- .../org/apache/roller/planet/business/RomeFeedFetcherTest.java | 2 +- .../roller/planet/business/SingleThreadedFeedUpdaterTest.java | 2 +- assembly-release/pom.xml | 2 +- assembly-release/sign-release.sh | 2 +- it-selenium/pom.xml | 2 +- it-selenium/src/test/resources/roller-jettyrun.properties | 2 +- pom.xml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/app/pom.xml ---------------------------------------------------------------------- diff --git a/app/pom.xml b/app/pom.xml index 4739e4c..ed8d4ad 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -24,7 +24,7 @@ limitations under the License. <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0</version> + <version>5.2.1</version> <relativePath>../pom.xml</relativePath> </parent> @@ -56,7 +56,7 @@ limitations under the License. <slf4j.version>1.7.25</slf4j.version> <spring.version>4.1.4.RELEASE</spring.version> <spring.security.version>3.2.5.RELEASE</spring.security.version> - <struts.version>2.5.12</struts.version> + <struts.version>2.5.17</struts.version> <velocity.version>1.7</velocity.version> <webjars.version>1.5</webjars.version> <ws-commons-util.version>1.0.2</ws-commons-util.version> http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/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 4cf3b24..b59f65e 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 @@ -35,7 +35,7 @@ public class RomeFeedFetcherTest extends TestCase { public static Log log = LogFactory.getLog(RomeFeedFetcherTest.class); - String feed_url = "http://rollerweblogger.org/roller/feed/entries/atom";; + String feed_url = "https://rollerweblogger.org/roller/feed/entries/atom";; protected void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/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 46298c5..7375058 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 @@ -35,7 +35,7 @@ public class SingleThreadedFeedUpdaterTest extends TestCase { private Subscription testSub = null; - private String feed_url = "http://rollerweblogger.org/roller/feed/entries/atom";; + private String feed_url = "https://rollerweblogger.org/roller/feed/entries/atom";; protected void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/assembly-release/pom.xml ---------------------------------------------------------------------- diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml index 77dac0d..a041cb9 100644 --- a/assembly-release/pom.xml +++ b/assembly-release/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0</version> + <version>5.2.1</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/assembly-release/sign-release.sh ---------------------------------------------------------------------- diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh index 77fdd59..979ab40 100755 --- a/assembly-release/sign-release.sh +++ b/assembly-release/sign-release.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash export rcstring="" -export vstring="5.2.0" +export vstring="5.2.1" # for rc releases we rename the release files if [ rcstring != "" ]; then http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/it-selenium/pom.xml ---------------------------------------------------------------------- diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml index 2854584..b699393 100644 --- a/it-selenium/pom.xml +++ b/it-selenium/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0</version> + <version>5.2.1</version> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/it-selenium/src/test/resources/roller-jettyrun.properties ---------------------------------------------------------------------- diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties index 643e0c5..706dbae 100644 --- a/it-selenium/src/test/resources/roller-jettyrun.properties +++ b/it-selenium/src/test/resources/roller-jettyrun.properties @@ -23,7 +23,7 @@ hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFac passwds.encryption.enabled=false # use src copy of themes for read-only access -themes.dir=target/roller-selenium-tests-5.2.0/themes +themes.dir=target/roller-selenium-tests-5.2.1/themes # put work in work dir search.index.dir =target/work/search-index http://git-wip-us.apache.org/repos/asf/roller/blob/1794b224/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 408d530..17695af 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ limitations under the License. <modelVersion>4.0.0</modelVersion> <groupId>org.apache.roller</groupId> <artifactId>roller-project</artifactId> - <version>5.2.0</version> + <version>5.2.1</version> <packaging>pom</packaging> <prerequisites> @@ -47,7 +47,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <derby.version>10.11.1.1</derby.version> - <roller.version>5.2.0</roller.version> + <roller.version>5.2.1</roller.version> </properties> <modules>
