You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2018/02/01 18:59:49 UTC
[1/2] allura git commit: Update copyright year
Repository: allura
Updated Branches:
refs/heads/master 4bc85b681 -> e34850716
Update copyright year
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/dd5a540c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/dd5a540c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/dd5a540c
Branch: refs/heads/master
Commit: dd5a540c5e91484aaf8e8ec6dec4154feb1b2d04
Parents: 4bc85b6
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Feb 1 13:56:12 2018 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Thu Feb 1 13:56:12 2018 -0500
----------------------------------------------------------------------
Allura/NOTICE | 2 +-
Allura/docs/conf.py | 2 +-
ForgeDiscussion/NOTICE | 2 +-
ForgeGit/NOTICE | 2 +-
ForgeImporters/NOTICE | 2 +-
ForgeImporters/docs/conf.py | 2 +-
ForgeLink/NOTICE | 2 +-
ForgeSVN/NOTICE | 2 +-
ForgeTracker/NOTICE | 2 +-
ForgeWiki/NOTICE | 2 +-
NOTICE | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/Allura/NOTICE
----------------------------------------------------------------------
diff --git a/Allura/NOTICE b/Allura/NOTICE
index f2ba30a..b793f8f 100644
--- a/Allura/NOTICE
+++ b/Allura/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/Allura/docs/conf.py
----------------------------------------------------------------------
diff --git a/Allura/docs/conf.py b/Allura/docs/conf.py
index 37db57e..a803bab 100644
--- a/Allura/docs/conf.py
+++ b/Allura/docs/conf.py
@@ -58,7 +58,7 @@ master_doc = 'index'
# General information about the project.
project = 'Apache Allura'
-copyright = '2012-2016 The Apache Software Foundation'
+copyright = '2012-2018 The Apache Software Foundation'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeDiscussion/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/NOTICE b/ForgeDiscussion/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeDiscussion/NOTICE
+++ b/ForgeDiscussion/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeGit/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeGit/NOTICE b/ForgeGit/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeGit/NOTICE
+++ b/ForgeGit/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeImporters/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeImporters/NOTICE b/ForgeImporters/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeImporters/NOTICE
+++ b/ForgeImporters/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeImporters/docs/conf.py
----------------------------------------------------------------------
diff --git a/ForgeImporters/docs/conf.py b/ForgeImporters/docs/conf.py
index d92ba0b..e5cb6dd 100644
--- a/ForgeImporters/docs/conf.py
+++ b/ForgeImporters/docs/conf.py
@@ -54,7 +54,7 @@ master_doc = 'index'
# General information about the project.
project = 'Apache Allura'
-copyright = '2012-2016 The Apache Software Foundation'
+copyright = '2012-2018 The Apache Software Foundation'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeLink/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeLink/NOTICE b/ForgeLink/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeLink/NOTICE
+++ b/ForgeLink/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeSVN/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeSVN/NOTICE b/ForgeSVN/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeSVN/NOTICE
+++ b/ForgeSVN/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeTracker/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeTracker/NOTICE b/ForgeTracker/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeTracker/NOTICE
+++ b/ForgeTracker/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/ForgeWiki/NOTICE
----------------------------------------------------------------------
diff --git a/ForgeWiki/NOTICE b/ForgeWiki/NOTICE
index f2ba30a..b793f8f 100644
--- a/ForgeWiki/NOTICE
+++ b/ForgeWiki/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/allura/blob/dd5a540c/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index f2ba30a..b793f8f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Allura
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[2/2] allura git commit: Update gpg handling commands in release
script
Posted by br...@apache.org.
Update gpg handling commands in release script
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e3485071
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e3485071
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e3485071
Branch: refs/heads/master
Commit: e34850716a6e328afcdd08f3cde36c92e40443e5
Parents: dd5a540
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Feb 1 13:59:31 2018 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Thu Feb 1 13:59:31 2018 -0500
----------------------------------------------------------------------
scripts/asf-release.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/e3485071/scripts/asf-release.sh
----------------------------------------------------------------------
diff --git a/scripts/asf-release.sh b/scripts/asf-release.sh
index fd76270..2aaa0b6 100755
--- a/scripts/asf-release.sh
+++ b/scripts/asf-release.sh
@@ -56,10 +56,9 @@ git commit -m "CHANGES updated for ASF release $VERSION"
DEFAULT_KEY=`grep ^default-key ~/.gnupg/gpg.conf | sed -e 's/default-key //'`
if [[ -z "$DEFAULT_KEY" ]]; then
- DEFAULT_KEY=`gpg --list-secret-keys | head -3 | tail -1 | sed -e 's/^.*\///' | sed -e 's/ .*//'`
+ DEFAULT_KEY=`gpg --list-secret-keys | egrep '[0-9A-F]{8}' | head -1 | sed -e 's/\W//g'`
fi
prompt KEY "PGP Key to sign with" "$DEFAULT_KEY"
-FINGERPRINT=`gpg --fingerprint $KEY | grep fingerprint | cut -d' ' -f 17-20 | sed -e 's/ //g'`
prompt RAT_LOG_PASTEBIN_URL "URL for RAT log pastebin (see scripts/src-license-check to create RAT report)"
@@ -112,8 +111,8 @@ Checksums:
The KEYS file can be found at:
http://www.apache.org/dist/allura/KEYS
-The release has been signed with key ($KEY):
- http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x$FINGERPRINT
+The release has been signed with key $KEY:
+ http://pgp.mit.edu:11371/pks/lookup?op=vindex&search=0x$KEY
Source corresponding to this release can be found at:
Commit: $COMMIT_SHA