You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2019/06/09 19:47:11 UTC
[roller] branch master updated (88f02b9 -> a963bb1)
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 88f02b9 More remember-me fixes.
add 331b3eb Simplification of recent remember-me fix.
add b668319 More remember-me fixes.
add db21732 Minor working and formatting changes.
add 41ba970 Skip feed fetcher tests on Java 1.7 which does not support TLS 1.2.
add 1e25666 Fix regression that was preventing mvn jetty:run from working properly.
add f0433b7 Prepare for rc-2.
new a963bb1 Merge branch 'roller-5.2.x'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
app/pom.xml | 6 ++++
.../roller/weblogger/ui/core/RollerContext.java | 2 --
.../RollerRememberMeAuthenticationProvider.java | 2 +-
.../ui/core/security/RollerRememberMeServices.java | 4 +--
.../planet/business/RomeFeedFetcherTest.java | 27 +++++++++++---
.../business/SingleThreadedFeedUpdaterTest.java | 7 +++-
app/src/test/resources/jetty.xml | 42 +++++++++++++++-------
app/src/test/resources/jndi.properties | 4 ---
8 files changed, 66 insertions(+), 28 deletions(-)
delete mode 100644 app/src/test/resources/jndi.properties
[roller] 01/01: Merge branch 'roller-5.2.x'
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit a963bb123df4591e12bfc0511791d9c79a71c0f7
Merge: 88f02b9 f0433b7
Author: snoopdave@gmail.com <sn...@gmail.com>
AuthorDate: Sun Jun 9 15:47:05 2019 -0400
Merge branch 'roller-5.2.x'
# Conflicts:
# app/src/main/java/org/apache/roller/weblogger/ui/core/security/RollerRememberMeServices.java
# app/src/test/resources/jetty.xml
# assembly-release/sign-release.sh
app/pom.xml | 6 ++++
.../roller/weblogger/ui/core/RollerContext.java | 2 --
.../RollerRememberMeAuthenticationProvider.java | 2 +-
.../ui/core/security/RollerRememberMeServices.java | 4 +--
.../planet/business/RomeFeedFetcherTest.java | 27 +++++++++++---
.../business/SingleThreadedFeedUpdaterTest.java | 7 +++-
app/src/test/resources/jetty.xml | 42 +++++++++++++++-------
app/src/test/resources/jndi.properties | 4 ---
8 files changed, 66 insertions(+), 28 deletions(-)
diff --cc app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
index b70c3f1,d01c4dc..e5bac79
--- a/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
+++ b/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
@@@ -24,9 -22,8 +22,9 @@@ import org.apache.commons.logging.LogFa
import org.apache.roller.planet.business.fetcher.FeedFetcher;
import org.apache.roller.planet.business.fetcher.FetcherException;
import org.apache.roller.planet.pojos.Subscription;
+ import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.business.WebloggerFactory;
+import org.junit.Ignore;
/**