Merge branch 'master' into roller-6.0.x
diff --git a/Dockerfile b/Dockerfile
index 28570de..29410a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@
RUN apt-get update && apt-get install -y git
RUN git clone https://github.com/apache/roller.git
WORKDIR /tmp/roller
-RUN git checkout master; \
+RUN git checkout roller-6.0.x; \
mvn -Duser.home=/builder/home -DskipTests=true -B clean install
diff --git a/LICENSE.txt b/LICENSE.txt
index f7d3e4d..83b89fc 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -339,6 +339,7 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
-------------------------------------------------------------------------------
This product bundles Summernote WYSIWYG editor, which is available under a
"MIT" license. For details, see
@@ -366,4 +367,4 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
--------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/NOTICE.txt b/NOTICE.txt
index 0dd038d..203644e 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -24,4 +24,4 @@
The product includes snippets of code from the JavaMail
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
-https://glassfish.java.net/public/CDDL+GPL_1_1.html
+https://glassfish.java.net/public/CDDL+GPL_1_1.html
\ No newline at end of file
diff --git a/app/pom.xml b/app/pom.xml
index d0d0658..b09e31c 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -38,7 +38,6 @@
<java-activation.version>1.2.0</java-activation.version>
<java-mail.version>1.4.7</java-mail.version>
<jstl.version>1.2</jstl.version>
-
<angular.version>1.7.8</angular.version>
<ant.version>1.10.5</ant.version>
<commons-validator.version>1.6</commons-validator.version>
@@ -58,13 +57,12 @@
<slf4j.version>1.7.26</slf4j.version>
<spring.version>4.1.4.RELEASE</spring.version>
<spring.security.version>3.2.5.RELEASE</spring.security.version>
- <struts.version>2.5.20</struts.version>
+ <struts.version>2.5.22</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>
<xml-security.version>1.3.0</xml-security.version>
<xmlrpc-version>3.1.3</xmlrpc-version>
-
</properties>
<dependencies>
@@ -783,4 +781,11 @@
</build>
+ <repositories>
+ <repository>
+ <id>struts-staging</id>
+ <url>https://repository.apache.org/content/groups/staging/</url>
+ </repository>
+ </repositories>
+
</project>
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 8cc413a..06a5986 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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 9342a35..8f322dd 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="6.0.0-SNAPSHOT"
+export rcstring="-rc-1"
+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 b155983..8c35ff6 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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</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 e3fdd52..4fe3b10 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-6.0.0-SNAPSHOT/themes
+themes.dir=target/roller-selenium-tests-6.0.0/themes
# put work in work dir
search.index.dir =target/work/search-index
diff --git a/pom.xml b/pom.xml
index 8a91432..32fbc84 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>6.0.0-SNAPSHOT</version>
+ <version>6.0.0</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>6.0.0-SNAPSHOT</roller.version>
+ <roller.version>6.0.0</roller.version>
</properties>
<modules>
