You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2017/08/17 07:12:36 UTC
[1/6] logging-log4cxx git commit: Prepare for next development
iteration: 0.11.1
Repository: logging-log4cxx
Updated Branches:
refs/heads/next_stable 884b21369 -> df8f23b8f
refs/heads/release_scripts e1265f0fd -> 3ca47c80a
Prepare for next development iteration: 0.11.1
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/f5f73b63
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/f5f73b63
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/f5f73b63
Branch: refs/heads/next_stable
Commit: f5f73b636f025b752eb8fa7e86a9cfd7a99e5eea
Parents: 5878003
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 19:54:35 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 19:54:35 2017 +0200
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++------------
src/changes/changes.xml | 5 +++++
2 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5f73b63/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5697b54..b7188b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>log4cxx</groupId>
<artifactId>apache-log4cxx</artifactId>
<packaging>pom</packaging>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
<name>Apache log4cxx</name>
<description>Logging framework for C++.</description>
<url>http://logging.apache.org/log4cxx</url>
@@ -181,7 +181,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
+ <version>0.11.1-SNAPSHOT</version>
<executions>
<execution>
<phase>compile</phase>
@@ -279,26 +279,26 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.9.3</version>
+ <version>0.11.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
- <version>1.0b2</version>
+ <version>0.11.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>cpptasks</artifactId>
- <version>1.0b5</version>
+ <version>0.11.1-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
+ <version>0.11.1-SNAPSHOT</version>
<configuration>
<descriptors>
<descriptor>src/assembly/source.xml</descriptor>
@@ -318,12 +318,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
+ <version>0.11.1-SNAPSHOT</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>0.11.1-SNAPSHOT</version>
<configuration>
<templateFile>${basedir}/src/site/site.vm</templateFile>
</configuration>
@@ -331,7 +331,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3</version>
+ <version>0.11.1-SNAPSHOT</version>
<configuration>
<tagNameFormat>v@{project.version}-RCx</tagNameFormat>
<goals>site-deploy assembly:assembly</goals>
@@ -344,7 +344,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.14</version>
+ <version>0.11.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -354,7 +354,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>0.11.1-SNAPSHOT</version>
<reportSets>
<reportSet>
<reports>
@@ -369,7 +369,7 @@
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.9</version>
+ <version>0.11.1-SNAPSHOT</version>
<reportSets>
<reportSet>
<reports>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5f73b63/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index bdf1b7b..9aa187a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
</properties>
<body>
+ <release version="0.11.1"
+ date="XXXX-XX-XX"
+ description="Maintenance release">
+ </release>
+
<release version="0.11.0"
date="2017-08-16"
description="Maintenance release">
[5/6] logging-log4cxx git commit: Merge commit
'3ca47c80a273dd1e01b71aaf2970c037e8055f13' into next_stable
Posted by ts...@apache.org.
Merge commit '3ca47c80a273dd1e01b71aaf2970c037e8055f13' into next_stable
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/b75a57f7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/b75a57f7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/b75a57f7
Branch: refs/heads/next_stable
Commit: b75a57f71727d964aef24ebdcb94f5899ce8a3b5
Parents: 884b213 3ca47c8
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 09:08:16 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 09:08:16 2017 +0200
----------------------------------------------------------------------
pom.xml | 22 ++++-----
releasePerform.sh | 113 ++++++++++++++++++++++++++-----------------
src/changes/changes.xml | 5 ++
3 files changed, 84 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/b75a57f7/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index dd149c5,b7188b9..84695f5
--- a/pom.xml
+++ b/pom.xml
@@@ -331,9 -331,9 +331,9 @@@
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>2.3</version>
+ <version>0.11.1-SNAPSHOT</version>
<configuration>
- <tagNameFormat>v@{project.version}-RCx</tagNameFormat>
+ <tagNameFormat>v@{project.version}-RC1</tagNameFormat>
<goals>site-deploy assembly:assembly</goals>
</configuration>
</plugin>
[4/6] logging-log4cxx git commit: functions added
Posted by ts...@apache.org.
functions added
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3ca47c80
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3ca47c80
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3ca47c80
Branch: refs/heads/next_stable
Commit: 3ca47c80a273dd1e01b71aaf2970c037e8055f13
Parents: e1265f0
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 09:07:22 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 09:07:22 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 100 ++++++++++++++++++++++++++++++-------------------
1 file changed, 61 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3ca47c80/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index 99f542f..a290bf1 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -27,49 +27,71 @@
# most likely prepared by the preparing counterpart.
#
-# log4cxx is able to build using private copies of apr and apr-util, which are expected in some
-# special relative dir structure. That doesn't work with the default working dir "perform" uses,
-# which is "target/checkout". So we either need to make apr and apr-util available in "target" or
-# change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
-# contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
-# well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
-# that dir by default...
-WD_RELEASE="$(pwd)/../log4cxx-next_stable"
-WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
+function main()
+{
+ # log4cxx is able to build using private copies of apr and apr-util, which are expected in some
+ # special relative dir structure. That doesn't work with the default working dir "perform" uses,
+ # which is "target/checkout". So we either need to make apr and apr-util available in "target" or
+ # change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
+ # contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
+ # well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
+ # that dir by default...
+ WD_RELEASE="$( pwd)/../log4cxx-next_stable"
+ WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
-rm -rf "${WD_RELEASE}"
-mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
+ perform_release
+ prepare_dist_dev
+ sign_and_copy
+ publish_for_vote
+}
+
+function perform_release()
+{
+ rm -rf "${WD_RELEASE}"
+ mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
+}
# Prepare dist/dev to get the release candidate published for a vote.
-mkdir -p "${WD_DIST_DEV}"
-pushd "${WD_DIST_DEV}" > /dev/null
-if [ ! -d ".svn" ]
-then
- svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
-fi
-svn up
+function prepare_dist_dev()
+{
+ mkdir -p "${WD_DIST_DEV}"
+ pushd "${WD_DIST_DEV}" > /dev/null
+ if [ ! -d ".svn" ]
+ then
+ svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
+ fi
+ svn up
+}
-# Might be a good idea to have another look at the GPG plugin for Maven in the future:
-#
-# http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
-# http://maven.apache.org/plugins/maven-gpg-plugin/
-pushd "${WD_RELEASE}/target" > /dev/null
-for file in *.tar.gz *.zip
-do
- echo "Processing ${file}:"
+function sign_and_copy()
+{
+ # Might be a good idea to have another look at the GPG plugin for Maven in the future:
+ #
+ # http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
+ # http://maven.apache.org/plugins/maven-gpg-plugin/
+ pushd "${WD_RELEASE}/target" > /dev/null
+ for file in "*.tar.gz" "*.zip"
+ do
+ echo "Processing ${file}:"
+
+ gpg -ab --yes "${file}" > "${file}.asc"
+ md5sum "${file}" > "${file}.md5"
+ sha512sum "${file}" > "${file}.sha"
- gpg -ab --yes "${file}" > "${file}.asc"
- md5sum "${file}" > "${file}.md5"
- sha512sum "${file}" > "${file}.sha"
+ # No symlinks because those would be treated as is, no hardlinks because it should be safer for
+ # commits.
+ cp --force "${file}" "${WD_DIST_DEV}"
+ cp --force "${file}.asc" "${WD_DIST_DEV}"
+ cp --force "${file}.md5" "${WD_DIST_DEV}"
+ cp --force "${file}.sha" "${WD_DIST_DEV}"
+ done
+}
- # No symlinks because those would be treated as is, no hardlinks because it should be safer for
- # commits.
- cp --force "${file}" "${WD_DIST_DEV}"
- cp --force "${file}.asc" "${WD_DIST_DEV}"
- cp --force "${file}.md5" "${WD_DIST_DEV}"
- cp --force "${file}.sha" "${WD_DIST_DEV}"
-done
+function publish_for_vote()
+{
+ pushd "${WD_DIST_DEV}" > /dev/null
+ svn add --force "*.*"
+ svn ci -m "Publishing artifacts for new release to vote on."
+}
-pushd "${WD_DIST_DEV}" > /dev/null
-svn add --force *.*
-svn ci -m "Adding artifacts for new release to vote on."
+main
[2/6] logging-log4cxx git commit: Docs
Posted by ts...@apache.org.
Docs
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/e1265f0f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/e1265f0f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/e1265f0f
Branch: refs/heads/next_stable
Commit: e1265f0fd3e44d6cac1c5ea3a417a313a5284cf5
Parents: f5f73b6
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Wed Aug 16 19:58:54 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Wed Aug 16 19:58:54 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/e1265f0f/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index e1d7a01..99f542f 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -18,20 +18,22 @@
##
# Perform a release.
#
-# Performing a release involves Maven currently to build an test things and we
-# ran into problems with the default dir structure maven assumes. This script
-# works around those and we need to sign the release archives anyway, which can
-# be easily automated as well to not need to follow manual instructions always.
+# Performing a release involves Maven currently to build and test things and we ran into problems
+# with the default dir structure maven assumes. This script works around those and we need to sign
+# the release archives anyway, which can be easily automated as well to not need to follow manual
+# instructions always.
+#
+# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
+# most likely prepared by the preparing counterpart.
#
-# log4cxx is able to build using private copies of apr and apr-util, which are
-# expected in some special relative dir structure. That doesn't work with the
-# default working dir "perform" uses, which is "target/checkout". So we either
-# need to make apr and apr-util available in "target" or change the working
-# dir. Making available seems easy using symlinks, but "mvn clean" deletes the
-# contents(!) of the linked dirs then. And always copying things around seems a
-# bit unnecessary as well, so I'm using a relocation of the folder for now. The
-# downside is that "mvn clean" is ignoring that dir by default...
+# log4cxx is able to build using private copies of apr and apr-util, which are expected in some
+# special relative dir structure. That doesn't work with the default working dir "perform" uses,
+# which is "target/checkout". So we either need to make apr and apr-util available in "target" or
+# change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
+# contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
+# well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
+# that dir by default...
WD_RELEASE="$(pwd)/../log4cxx-next_stable"
WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
@@ -47,8 +49,7 @@ then
fi
svn up
-# Might be a good idea to have another look at the GPG plugin for Maven in the
-# future:
+# Might be a good idea to have another look at the GPG plugin for Maven in the future:
#
# http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
# http://maven.apache.org/plugins/maven-gpg-plugin/
@@ -61,8 +62,8 @@ do
md5sum "${file}" > "${file}.md5"
sha512sum "${file}" > "${file}.sha"
- # No symlinks because those would be treated as is, no hardlinks because it
- # should be safer for commits.
+ # No symlinks because those would be treated as is, no hardlinks because it should be safer for
+ # commits.
cp --force "${file}" "${WD_DIST_DEV}"
cp --force "${file}.asc" "${WD_DIST_DEV}"
cp --force "${file}.md5" "${WD_DIST_DEV}"
[3/6] logging-log4cxx git commit: functions added
Posted by ts...@apache.org.
functions added
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/3ca47c80
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/3ca47c80
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/3ca47c80
Branch: refs/heads/release_scripts
Commit: 3ca47c80a273dd1e01b71aaf2970c037e8055f13
Parents: e1265f0
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 09:07:22 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 09:07:22 2017 +0200
----------------------------------------------------------------------
releasePerform.sh | 100 ++++++++++++++++++++++++++++++-------------------
1 file changed, 61 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/3ca47c80/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index 99f542f..a290bf1 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -27,49 +27,71 @@
# most likely prepared by the preparing counterpart.
#
-# log4cxx is able to build using private copies of apr and apr-util, which are expected in some
-# special relative dir structure. That doesn't work with the default working dir "perform" uses,
-# which is "target/checkout". So we either need to make apr and apr-util available in "target" or
-# change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
-# contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
-# well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
-# that dir by default...
-WD_RELEASE="$(pwd)/../log4cxx-next_stable"
-WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
+function main()
+{
+ # log4cxx is able to build using private copies of apr and apr-util, which are expected in some
+ # special relative dir structure. That doesn't work with the default working dir "perform" uses,
+ # which is "target/checkout". So we either need to make apr and apr-util available in "target" or
+ # change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
+ # contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
+ # well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
+ # that dir by default...
+ WD_RELEASE="$( pwd)/../log4cxx-next_stable"
+ WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
-rm -rf "${WD_RELEASE}"
-mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
+ perform_release
+ prepare_dist_dev
+ sign_and_copy
+ publish_for_vote
+}
+
+function perform_release()
+{
+ rm -rf "${WD_RELEASE}"
+ mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
+}
# Prepare dist/dev to get the release candidate published for a vote.
-mkdir -p "${WD_DIST_DEV}"
-pushd "${WD_DIST_DEV}" > /dev/null
-if [ ! -d ".svn" ]
-then
- svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
-fi
-svn up
+function prepare_dist_dev()
+{
+ mkdir -p "${WD_DIST_DEV}"
+ pushd "${WD_DIST_DEV}" > /dev/null
+ if [ ! -d ".svn" ]
+ then
+ svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
+ fi
+ svn up
+}
-# Might be a good idea to have another look at the GPG plugin for Maven in the future:
-#
-# http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
-# http://maven.apache.org/plugins/maven-gpg-plugin/
-pushd "${WD_RELEASE}/target" > /dev/null
-for file in *.tar.gz *.zip
-do
- echo "Processing ${file}:"
+function sign_and_copy()
+{
+ # Might be a good idea to have another look at the GPG plugin for Maven in the future:
+ #
+ # http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
+ # http://maven.apache.org/plugins/maven-gpg-plugin/
+ pushd "${WD_RELEASE}/target" > /dev/null
+ for file in "*.tar.gz" "*.zip"
+ do
+ echo "Processing ${file}:"
+
+ gpg -ab --yes "${file}" > "${file}.asc"
+ md5sum "${file}" > "${file}.md5"
+ sha512sum "${file}" > "${file}.sha"
- gpg -ab --yes "${file}" > "${file}.asc"
- md5sum "${file}" > "${file}.md5"
- sha512sum "${file}" > "${file}.sha"
+ # No symlinks because those would be treated as is, no hardlinks because it should be safer for
+ # commits.
+ cp --force "${file}" "${WD_DIST_DEV}"
+ cp --force "${file}.asc" "${WD_DIST_DEV}"
+ cp --force "${file}.md5" "${WD_DIST_DEV}"
+ cp --force "${file}.sha" "${WD_DIST_DEV}"
+ done
+}
- # No symlinks because those would be treated as is, no hardlinks because it should be safer for
- # commits.
- cp --force "${file}" "${WD_DIST_DEV}"
- cp --force "${file}.asc" "${WD_DIST_DEV}"
- cp --force "${file}.md5" "${WD_DIST_DEV}"
- cp --force "${file}.sha" "${WD_DIST_DEV}"
-done
+function publish_for_vote()
+{
+ pushd "${WD_DIST_DEV}" > /dev/null
+ svn add --force "*.*"
+ svn ci -m "Publishing artifacts for new release to vote on."
+}
-pushd "${WD_DIST_DEV}" > /dev/null
-svn add --force *.*
-svn ci -m "Adding artifacts for new release to vote on."
+main
[6/6] logging-log4cxx git commit: Revert "Merge commit
'3ca47c80a273dd1e01b71aaf2970c037e8055f13' into next_stable"
Posted by ts...@apache.org.
Revert "Merge commit '3ca47c80a273dd1e01b71aaf2970c037e8055f13' into next_stable"
This reverts commit b75a57f71727d964aef24ebdcb94f5899ce8a3b5, reversing
changes made to 884b21369aaf97516064c68678e9978ba66f02a2.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/df8f23b8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/df8f23b8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/df8f23b8
Branch: refs/heads/next_stable
Commit: df8f23b8f7894ade2a13e08d3630838b2e8b58f3
Parents: b75a57f
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Thu Aug 17 09:11:53 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Thu Aug 17 09:11:53 2017 +0200
----------------------------------------------------------------------
pom.xml | 22 ++++-----
releasePerform.sh | 113 +++++++++++++++++--------------------------
src/changes/changes.xml | 5 --
3 files changed, 56 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/df8f23b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 84695f5..dd149c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>1.7</version>
<executions>
<execution>
<phase>compile</phase>
@@ -279,26 +279,26 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>1.9.3</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>1.0b2</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>cpptasks</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>1.0b5</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>2.3</version>
<configuration>
<descriptors>
<descriptor>src/assembly/source.xml</descriptor>
@@ -318,12 +318,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>1.0-alpha-3</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>3.3</version>
<configuration>
<templateFile>${basedir}/src/site/site.vm</templateFile>
</configuration>
@@ -331,7 +331,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>2.3</version>
<configuration>
<tagNameFormat>v@{project.version}-RC1</tagNameFormat>
<goals>site-deploy assembly:assembly</goals>
@@ -344,7 +344,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>1.2.14</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -354,7 +354,7 @@
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>2.7</version>
<reportSets>
<reportSet>
<reports>
@@ -369,7 +369,7 @@
<plugin>
<artifactId>maven-changes-plugin</artifactId>
- <version>0.11.1-SNAPSHOT</version>
+ <version>2.9</version>
<reportSets>
<reportSet>
<reports>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/df8f23b8/releasePerform.sh
----------------------------------------------------------------------
diff --git a/releasePerform.sh b/releasePerform.sh
index a290bf1..e1d7a01 100755
--- a/releasePerform.sh
+++ b/releasePerform.sh
@@ -18,80 +18,57 @@
##
# Perform a release.
#
-# Performing a release involves Maven currently to build and test things and we ran into problems
-# with the default dir structure maven assumes. This script works around those and we need to sign
-# the release archives anyway, which can be easily automated as well to not need to follow manual
-# instructions always.
+# Performing a release involves Maven currently to build an test things and we
+# ran into problems with the default dir structure maven assumes. This script
+# works around those and we need to sign the release archives anyway, which can
+# be easily automated as well to not need to follow manual instructions always.
#
-# It's impoirtant to note that this script is expected to be executed in the branch "next_stable",
-# most likely prepared by the preparing counterpart.
-#
-
-function main()
-{
- # log4cxx is able to build using private copies of apr and apr-util, which are expected in some
- # special relative dir structure. That doesn't work with the default working dir "perform" uses,
- # which is "target/checkout". So we either need to make apr and apr-util available in "target" or
- # change the working dir. Making available seems easy using symlinks, but "mvn clean" deletes the
- # contents(!) of the linked dirs then. And always copying things around seems a bit unnecessary as
- # well, so I'm using a relocation of the folder for now. The downside is that "mvn clean" ignores
- # that dir by default...
- WD_RELEASE="$( pwd)/../log4cxx-next_stable"
- WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
- perform_release
- prepare_dist_dev
- sign_and_copy
- publish_for_vote
-}
+# log4cxx is able to build using private copies of apr and apr-util, which are
+# expected in some special relative dir structure. That doesn't work with the
+# default working dir "perform" uses, which is "target/checkout". So we either
+# need to make apr and apr-util available in "target" or change the working
+# dir. Making available seems easy using symlinks, but "mvn clean" deletes the
+# contents(!) of the linked dirs then. And always copying things around seems a
+# bit unnecessary as well, so I'm using a relocation of the folder for now. The
+# downside is that "mvn clean" is ignoring that dir by default...
+WD_RELEASE="$(pwd)/../log4cxx-next_stable"
+WD_DIST_DEV="$(pwd)/../log4cxx-dist-dev"
-function perform_release()
-{
- rm -rf "${WD_RELEASE}"
- mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
-}
+rm -rf "${WD_RELEASE}"
+mvn release:perform "-DworkingDirectory=${WD_RELEASE}"
# Prepare dist/dev to get the release candidate published for a vote.
-function prepare_dist_dev()
-{
- mkdir -p "${WD_DIST_DEV}"
- pushd "${WD_DIST_DEV}" > /dev/null
- if [ ! -d ".svn" ]
- then
- svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
- fi
- svn up
-}
+mkdir -p "${WD_DIST_DEV}"
+pushd "${WD_DIST_DEV}" > /dev/null
+if [ ! -d ".svn" ]
+then
+ svn co "https://dist.apache.org/repos/dist/dev/logging/log4cxx" .
+fi
+svn up
-function sign_and_copy()
-{
- # Might be a good idea to have another look at the GPG plugin for Maven in the future:
- #
- # http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
- # http://maven.apache.org/plugins/maven-gpg-plugin/
- pushd "${WD_RELEASE}/target" > /dev/null
- for file in "*.tar.gz" "*.zip"
- do
- echo "Processing ${file}:"
-
- gpg -ab --yes "${file}" > "${file}.asc"
- md5sum "${file}" > "${file}.md5"
- sha512sum "${file}" > "${file}.sha"
+# Might be a good idea to have another look at the GPG plugin for Maven in the
+# future:
+#
+# http://blog.sonatype.com/2010/01/how-to-generate-pgp-signatures-with-maven/
+# http://maven.apache.org/plugins/maven-gpg-plugin/
+pushd "${WD_RELEASE}/target" > /dev/null
+for file in *.tar.gz *.zip
+do
+ echo "Processing ${file}:"
- # No symlinks because those would be treated as is, no hardlinks because it should be safer for
- # commits.
- cp --force "${file}" "${WD_DIST_DEV}"
- cp --force "${file}.asc" "${WD_DIST_DEV}"
- cp --force "${file}.md5" "${WD_DIST_DEV}"
- cp --force "${file}.sha" "${WD_DIST_DEV}"
- done
-}
+ gpg -ab --yes "${file}" > "${file}.asc"
+ md5sum "${file}" > "${file}.md5"
+ sha512sum "${file}" > "${file}.sha"
-function publish_for_vote()
-{
- pushd "${WD_DIST_DEV}" > /dev/null
- svn add --force "*.*"
- svn ci -m "Publishing artifacts for new release to vote on."
-}
+ # No symlinks because those would be treated as is, no hardlinks because it
+ # should be safer for commits.
+ cp --force "${file}" "${WD_DIST_DEV}"
+ cp --force "${file}.asc" "${WD_DIST_DEV}"
+ cp --force "${file}.md5" "${WD_DIST_DEV}"
+ cp --force "${file}.sha" "${WD_DIST_DEV}"
+done
-main
+pushd "${WD_DIST_DEV}" > /dev/null
+svn add --force *.*
+svn ci -m "Adding artifacts for new release to vote on."
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/df8f23b8/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9aa187a..bdf1b7b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,11 +23,6 @@
</properties>
<body>
- <release version="0.11.1"
- date="XXXX-XX-XX"
- description="Maintenance release">
- </release>
-
<release version="0.11.0"
date="2017-08-16"
description="Maintenance release">