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/12/01 23:33:49 UTC
[roller] branch roller-6.0.x updated (4716af3 -> 3bb06f7)
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a change to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git.
from 4716af3 Struts 2.5.22 is released.
add 13ee95c Merge from 6.0.0 and move master version up to 6.0.1-SNAPSHOT.
add 8cb3da1 Switch to AsciiDoc version of install guide in standard release bundle.
add 60bf7f4 Switch to AsciiDoc version of install guide in binary release bundle.
new 3bb06f7 Merge AsciiDoc changes into 6.
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:
assembly-release/pom.xml | 52 +++++++++++++++++++++-
.../src/main/assembly/{standard.xml => binary.xml} | 16 +------
docs/{ => adoc}/roller-install-guide.adoc | 0
3 files changed, 52 insertions(+), 16 deletions(-)
rename assembly-release/src/main/assembly/{standard.xml => binary.xml} (77%)
rename docs/{ => adoc}/roller-install-guide.adoc (100%)
[roller] 01/01: Merge AsciiDoc changes into 6.
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch roller-6.0.x
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 3bb06f7ba548d221be8a19f0b4ce027ef5d8edb3
Author: David M. Johnson <sn...@apache.org>
AuthorDate: Sun Dec 1 18:33:39 2019 -0500
Merge AsciiDoc changes into 6.
---
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
it-selenium/pom.xml | 2 +-
pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/pom.xml b/app/pom.xml
index d654e01..c3aff47 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>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 8f46c2c..9ecd028 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.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index d1e485a..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.1-SNAPSHOT</version>
+ <version>6.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index e91a230..dad6f42 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>6.0.1-SNAPSHOT</version>
+ <version>6.0.0</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>6.0.1-SNAPSHOT</roller.version>
+ <roller.version>6.0.0</roller.version>
</properties>
<modules>