Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/roller
diff --git a/app/pom.xml b/app/pom.xml
index 98e4094..71fef8b 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -45,7 +45,7 @@
<jsp-api.version>2.2</jsp-api.version>
<jstl.version>1.2</jstl.version>
<log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.8.2</log4j2.version>
+ <log4j2.version>2.10.0</log4j2.version>
<lucene.version>4.10.4</lucene.version>
<oauth-core.version>20100527</oauth-core.version>
<maven-war.version>3.1.0</maven-war.version>
@@ -56,7 +56,7 @@
<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>
@@ -94,12 +94,6 @@
<artifactId>mail</artifactId>
<version>${java-mail.version}</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Eclipselink JPA is the default JPA implementation used by
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
index e67cc85..12de267 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/core/Install.java
@@ -38,7 +38,7 @@
/**
* Walk user through install process.
*/
-// TODO: make this work @AllowedMethods({"execute","create","update","bootstrap"})
+// TODO: make this work @AllowedMethods({"execute","create","upgrade","bootstrap"})
public class Install extends UIAction {
private static Log log = LogFactory.getLog(Install.class);
diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml
index 3c9a4c6..eb6f8ba 100644
--- a/app/src/main/resources/struts.xml
+++ b/app/src/main/resources/struts.xml
@@ -154,7 +154,7 @@
<global-allowed-methods>
execute,
create,
- update,
+ upgrade,
bootstrap
</global-allowed-methods>
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 4015845..ad89f3e 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
@@ -37,7 +37,7 @@
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 {
diff --git a/app/src/test/resources/jetty.xml b/app/src/test/resources/jetty.xml
index 0209086..995ea1d 100644
--- a/app/src/test/resources/jetty.xml
+++ b/app/src/test/resources/jetty.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<Configure id='Server' class="org.eclipse.jetty.webapp.WebAppContext">
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Dummy values used only when testing with Jetty via mvn jetty:run -->
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index d7370f2..8cc413a 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.3.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 3ccc5d5..a36e210 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.3.0"
+export vstring="6.0.0"
# for rc releases we rename the release files
if [ rcstring != "" ]; then
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 6e21406..b155983 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.3.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties
index 9380aae..e3fdd52 100644
--- a/it-selenium/src/test/resources/roller-jettyrun.properties
+++ b/it-selenium/src/test/resources/roller-jettyrun.properties
@@ -23,7 +23,7 @@
passwds.encryption.enabled=false
# use src copy of themes for read-only access
-themes.dir=target/roller-selenium-tests-5.3.0-SNAPSHOT/themes
+themes.dir=target/roller-selenium-tests-6.0.0-SNAPSHOT/themes
# put work in work dir
search.index.dir =target/work/search-index
diff --git a/pom.xml b/pom.xml
index 8afea91..c34d775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>6.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
@@ -47,7 +47,7 @@
<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.3.0-SNAPSHOT</roller.version>
+ <roller.version>6.0.0-SNAPSHOT</roller.version>
</properties>
<modules>
@@ -63,8 +63,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<fork>true</fork>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
@@ -80,7 +80,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.2.6.v20141205</version>
+ <version>9.4.11.v20180605</version>
</plugin>
<plugin>
<groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
