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 <[email protected]> Authored: Thu Aug 17 09:11:53 2017 +0200 Committer: Thorsten Schöning <[email protected]> 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">
