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 2018/10/21 21:14:15 UTC
[1/3] roller git commit: Use same version of Log4j2 as Struts does
Repository: roller
Updated Branches:
refs/heads/master fb34b0a67 -> bcea95ea4
Use same version of Log4j2 as Struts does
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/1848cd55
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/1848cd55
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/1848cd55
Branch: refs/heads/master
Commit: 1848cd55de2cb2e301ddd4d2e8ee51ee579ecb9b
Parents: 30ca737
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon Sep 3 15:57:54 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon Sep 3 15:57:54 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/1848cd55/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index ed8d4ad..7802a8a 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -45,7 +45,7 @@ limitations under the License.
<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>
[3/3] roller git commit: Merge branch 'roller-5.2.0'
Posted by sn...@apache.org.
Merge branch 'roller-5.2.0'
# Conflicts:
# assembly-release/sign-release.sh
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/bcea95ea
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/bcea95ea
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/bcea95ea
Branch: refs/heads/master
Commit: bcea95ea4b3aa803e1bbb076e0e3eb6c43c060e1
Parents: fb34b0a 0a8b286
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Oct 21 17:14:13 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Oct 21 17:14:13 2018 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] roller git commit: Preparing for 5.2.1-rc-2
Posted by sn...@apache.org.
Preparing for 5.2.1-rc-2
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/0a8b2865
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/0a8b2865
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/0a8b2865
Branch: refs/heads/master
Commit: 0a8b286525c81b8634b47c848aa738b693f4b93a
Parents: 1848cd5
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Sep 30 16:48:45 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Sep 30 16:48:45 2018 -0400
----------------------------------------------------------------------
assembly-release/sign-release.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/0a8b2865/assembly-release/sign-release.sh
----------------------------------------------------------------------
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 194121a..5d00fb8 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-export rcstring="-rc-1"
+export rcstring="-rc-2"
export vstring="5.2.1"
# for rc releases we rename the release files