svn commit: r1840320 - /commons/cms-site/trunk/doap/doap_weaver.rdf
Author: mbenson Date: Fri Sep 7 19:38:40 2018 New Revision: 1840320 URL: http://svn.apache.org/viewvc?rev=1840320=rev Log: CMS commit to commons by mbenson Modified: commons/cms-site/trunk/doap/doap_weaver.rdf Modified: commons/cms-site/trunk/doap/doap_weaver.rdf URL: http://svn.apache.org/viewvc/commons/cms-site/trunk/doap/doap_weaver.rdf?rev=1840320=1840319=1840320=diff == --- commons/cms-site/trunk/doap/doap_weaver.rdf (original) +++ commons/cms-site/trunk/doap/doap_weaver.rdf Fri Sep 7 19:38:40 2018 @@ -39,6 +39,13 @@ commons-weaver +2018-09-07 +2.0 + + + + +commons-weaver 2016-10-18 1.3
svn commit: r29203 - in /release/commons/weaver: binaries/ source/
Author: mbenson Date: Fri Sep 7 19:30:18 2018 New Revision: 29203 Log: remove previous release from release distribution repo Removed: release/commons/weaver/binaries/commons-weaver-1.3-bin.tar.gz release/commons/weaver/binaries/commons-weaver-1.3-bin.tar.gz.asc release/commons/weaver/binaries/commons-weaver-1.3-bin.tar.gz.sha1 release/commons/weaver/binaries/commons-weaver-1.3-bin.tar.gz.sha256 release/commons/weaver/binaries/commons-weaver-1.3-bin.zip release/commons/weaver/binaries/commons-weaver-1.3-bin.zip.asc release/commons/weaver/binaries/commons-weaver-1.3-bin.zip.sha1 release/commons/weaver/binaries/commons-weaver-1.3-bin.zip.sha256 release/commons/weaver/source/commons-weaver-1.3-src.tar.gz release/commons/weaver/source/commons-weaver-1.3-src.tar.gz.asc release/commons/weaver/source/commons-weaver-1.3-src.tar.gz.sha1 release/commons/weaver/source/commons-weaver-1.3-src.tar.gz.sha256 release/commons/weaver/source/commons-weaver-1.3-src.zip release/commons/weaver/source/commons-weaver-1.3-src.zip.asc release/commons/weaver/source/commons-weaver-1.3-src.zip.sha1 release/commons/weaver/source/commons-weaver-1.3-src.zip.sha256
svn commit: r1840319 - /commons/cms-site/trunk/conf/component_releases.properties
Author: mbenson Date: Fri Sep 7 19:25:42 2018 New Revision: 1840319 URL: http://svn.apache.org/viewvc?rev=1840319=rev Log: CMS commit to commons by mbenson Modified: commons/cms-site/trunk/conf/component_releases.properties Modified: commons/cms-site/trunk/conf/component_releases.properties URL: http://svn.apache.org/viewvc/commons/cms-site/trunk/conf/component_releases.properties?rev=1840319=1840318=1840319=diff == --- commons/cms-site/trunk/conf/component_releases.properties (original) +++ commons/cms-site/trunk/conf/component_releases.properties Fri Sep 7 19:25:42 2018 @@ -86,5 +86,5 @@ validatorVersion=1.6 validatorReleased=2017-02-21 vfsVersion=2.2 vfsReleased=2017-10-06 -weaverVersion=1.3 -weaverReleased=2016-10-18 +weaverVersion=2.0 +weaverReleased=2018-09-07
[commons-weaver] annotated tag rel/2.0 created (now b6fe470)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag rel/2.0 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at b6fe470 (tag) tagging 28eaa998f1f8e31f57de1778b97f92f2c90ee866 (commit) by Matt Benson on Fri Sep 7 12:12:36 2018 -0500 - Log - Create Commons Weaver 2.0 release tag -BEGIN PGP SIGNATURE- iEYEABECAAYFAluSsYQACgkQIXyc/yFj3c7EoQCfQKpdhxeCaX7/2b0vYAFwUSZn 8coAmweT4MDVNnIsovp96loR7DIgeaR/ =1QRv -END PGP SIGNATURE- --- No new revisions were added by this update.
[commons-weaver] annotated tag rel/2.0 created (now 4f2c504)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag rel/2.0 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at 4f2c504 (tag) tagging 13add7c734d637a5376e7aa9a828db64063487a9 (commit) replaces 2.0_RC1 by Matt Benson on Fri Sep 7 11:39:03 2018 -0500 - Log - Create Commons Weaver 2.0 release tag -BEGIN PGP SIGNATURE- iEYEABECAAYFAluSqacACgkQIXyc/yFj3c7DEACfYA7kb2zVo7oHWCjzeNArFCZv HI8An2NUas1rQHHFk+xwd/BcndnqM7ou =hiu8 -END PGP SIGNATURE- --- No new revisions were added by this update.
svn commit: r29199 - /dev/commons/weaver/2.0-RC1/ /dev/commons/weaver/2.0-RC1/binaries/ /dev/commons/weaver/2.0-RC1/source/ /release/commons/weaver/ /release/commons/weaver/binaries/ /release/commons/
Author: mbenson Date: Fri Sep 7 16:28:50 2018 New Revision: 29199 Log: Publish commons-weaver 2.0 Added: release/commons/weaver/HEADER.html - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/HEADER.html release/commons/weaver/README.html - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/README.html release/commons/weaver/RELEASE-NOTES.txt - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/RELEASE-NOTES.txt release/commons/weaver/binaries/commons-weaver-2.0-bin.tar.gz - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz release/commons/weaver/binaries/commons-weaver-2.0-bin.tar.gz.asc - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz.asc release/commons/weaver/binaries/commons-weaver-2.0-bin.tar.gz.sha256 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz.sha256 release/commons/weaver/binaries/commons-weaver-2.0-bin.tar.gz.sha512 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz.sha512 release/commons/weaver/binaries/commons-weaver-2.0-bin.zip - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip release/commons/weaver/binaries/commons-weaver-2.0-bin.zip.asc - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip.asc release/commons/weaver/binaries/commons-weaver-2.0-bin.zip.sha256 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip.sha256 release/commons/weaver/binaries/commons-weaver-2.0-bin.zip.sha512 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip.sha512 release/commons/weaver/source/commons-weaver-2.0-src.tar.gz - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz release/commons/weaver/source/commons-weaver-2.0-src.tar.gz.asc - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz.asc release/commons/weaver/source/commons-weaver-2.0-src.tar.gz.sha256 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz.sha256 release/commons/weaver/source/commons-weaver-2.0-src.tar.gz.sha512 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz.sha512 release/commons/weaver/source/commons-weaver-2.0-src.zip - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip release/commons/weaver/source/commons-weaver-2.0-src.zip.asc - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip.asc release/commons/weaver/source/commons-weaver-2.0-src.zip.sha256 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip.sha256 release/commons/weaver/source/commons-weaver-2.0-src.zip.sha512 - copied unchanged from r29198, dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip.sha512 Removed: dev/commons/weaver/2.0-RC1/HEADER.html dev/commons/weaver/2.0-RC1/README.html dev/commons/weaver/2.0-RC1/RELEASE-NOTES.txt dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz.asc dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz.sha256 dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.tar.gz.sha512 dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip.asc dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip.sha256 dev/commons/weaver/2.0-RC1/binaries/commons-weaver-2.0-bin.zip.sha512 dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz.asc dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz.sha256 dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.tar.gz.sha512 dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip.asc dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip.sha256 dev/commons/weaver/2.0-RC1/source/commons-weaver-2.0-src.zip.sha512
svn commit: r29084 - in /dev/commons/weaver/2.0-RC1: ./ binaries/ site/ site/commons-weaver-build-tools/ site/commons-weaver-build-tools/css/ site/commons-weaver-build-tools/images/ site/commons-weave
Author: mbenson Date: Sat Sep 1 16:40:45 2018 New Revision: 29084 Log: Staging release: commons-weaver, version: 2.0 [This commit notification would consist of 175 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[commons-weaver] annotated tag 2.0_RC1 created (now 0eed2d0)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag 2.0_RC1 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at 0eed2d0 (tag) tagging 28eaa998f1f8e31f57de1778b97f92f2c90ee866 (commit) by Matt Benson on Sat Sep 1 11:14:19 2018 -0500 - Log - [maven-release-plugin] copy for tag 2.0_RC1 --- No new revisions were added by this update.
[commons-weaver] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 13add7c [maven-release-plugin] prepare for next development iteration 13add7c is described below commit 13add7c734d637a5376e7aa9a828db64063487a9 Author: Matt Benson AuthorDate: Sat Sep 1 11:14:31 2018 -0500 [maven-release-plugin] prepare for next development iteration --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 4 ++-- processor/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 3ac7dc1..73aece7 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -2.0 +2.1-SNAPSHOT ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index 35941b2..5964c08 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -2.0 +2.1-SNAPSHOT 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index ff73367..73b7232 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -2.0 +2.1-SNAPSHOT ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index c061457..f10f9d0 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -2.0 +2.1-SNAPSHOT ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 29a6a96..b2ceef2 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -2.0 +2.1-SNAPSHOT commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index a549e41..9826f88 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -2.0 +2.1-SNAPSHOT ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index 67cc4e4..3276312 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -2.0 +2.1-SNAPSHOT commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index 575458b..a861c8d 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -2.0 +2.1-SNAPSHOT commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 6792502..658aaac 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -2.0 +2.1-SNAPSHOT commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 0b1cf77..1aa60c7 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -2.0 +2.1-SNAPSHOT commons-weaver-parent diff --git a/pom.xml b/pom.xml index aece83d..7d37db3 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 2.0 + 2.1-SNAPSHOT pom Apache Commons Weaver @@ -95,7 +95,7 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git -2.0_RC1 +HEAD diff --git a/processor/pom.xml b/processor/pom.xml index ee770b7..37fde70 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -2.0 +2.1-SNAPSHOT ../parent/pom.xml
[commons-weaver] branch master updated: [maven-release-plugin] prepare release 2.0_RC1
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 28eaa99 [maven-release-plugin] prepare release 2.0_RC1
28eaa99 is described below
commit 28eaa998f1f8e31f57de1778b97f92f2c90ee866
Author: Matt Benson
AuthorDate: Sat Sep 1 11:13:47 2018 -0500
[maven-release-plugin] prepare release 2.0_RC1
---
ant/pom.xml | 2 +-
build-tools/pom.xml | 2 +-
dist/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
modules/normalizer/pom.xml| 2 +-
modules/pom.xml | 2 +-
modules/privilizer/api/pom.xml| 2 +-
modules/privilizer/pom.xml| 2 +-
modules/privilizer/weaver/pom.xml | 2 +-
parent/pom.xml| 886 +++---
pom.xml | 3 +-
processor/pom.xml | 2 +-
12 files changed, 455 insertions(+), 454 deletions(-)
diff --git a/ant/pom.xml b/ant/pom.xml
index 4407ec4..3ac7dc1 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-parent
-2.0-SNAPSHOT
+2.0
../parent/pom.xml
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index 03ac52f..35941b2 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -21,7 +21,7 @@ under the License.
org.apache.commons
commons-weaver-base
-2.0-SNAPSHOT
+2.0
4.0.0
commons-weaver-build-tools
diff --git a/dist/pom.xml b/dist/pom.xml
index 2adc395..ff73367 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-parent
-2.0-SNAPSHOT
+2.0
../parent/pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 4ddf85d..c061457 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-parent
-2.0-SNAPSHOT
+2.0
../parent/pom.xml
diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml
index fbf6403..29a6a96 100644
--- a/modules/normalizer/pom.xml
+++ b/modules/normalizer/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-modules-parent
-2.0-SNAPSHOT
+2.0
commons-weaver-normalizer
Apache Commons Weaver Normalizer
diff --git a/modules/pom.xml b/modules/pom.xml
index ce924dd..a549e41 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@ under the License.
commons-weaver-parent
org.apache.commons
-2.0-SNAPSHOT
+2.0
../parent/pom.xml
diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml
index 5c6d26a..67cc4e4 100644
--- a/modules/privilizer/api/pom.xml
+++ b/modules/privilizer/api/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-privilizer-parent
-2.0-SNAPSHOT
+2.0
commons-weaver-privilizer-api
diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml
index 279ad8c..575458b 100644
--- a/modules/privilizer/pom.xml
+++ b/modules/privilizer/pom.xml
@@ -23,7 +23,7 @@ under the License.
org.apache.commons
commons-weaver-modules-parent
-2.0-SNAPSHOT
+2.0
commons-weaver-privilizer-parent
diff --git a/modules/privilizer/weaver/pom.xml
b/modules/privilizer/weaver/pom.xml
index e9003a4..6792502 100644
--- a/modules/privilizer/weaver/pom.xml
+++ b/modules/privilizer/weaver/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-privilizer-parent
-2.0-SNAPSHOT
+2.0
commons-weaver-privilizer
diff --git a/parent/pom.xml b/parent/pom.xml
index e5f276c..0b1cf77 100755
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,443 +1,443 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
-
-
-org.apache.commons
-commons-weaver-base
-2.0-SNAPSHOT
-
-
- commons-weaver-parent
- pom
-
- Apache Commons Weaver Parent
- Apache Commons Weaver Parent
-
-
-UTF-8
-
-3.0.0
-1.3
-
-
-
-
-
-org.apache.commons
-commons-weaver-processor
-${project.version}
-
-
-org.apache.commons
-commons-weaver-processor
-sources
-${project.version}
-
-
-org.apache.commons
-commons-weaver-processor
-javadoc
-${project.version}
-
-
-org.apache.commons
-commons-weaver-privilizer-api
-${project.version}
-
-
-org.apache.commons
-c
[commons-weaver] branch master updated: 1.4->2.0
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 6fa53e2 1.4->2.0
6fa53e2 is described below
commit 6fa53e2e785d0f466e0c561044cbde9120ca
Author: Matt Benson
AuthorDate: Sat Sep 1 11:02:05 2018 -0500
1.4->2.0
---
README.md | 210 +++---
RELEASE-NOTES.txt | 4 +-
pom.xml | 2 +-
src/changes/changes.xml | 2 +-
src/site/xdoc/download_weaver.xml | 26 ++---
5 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/README.md b/README.md
index afd2ac6..40e0c63 100644
--- a/README.md
+++ b/README.md
@@ -1,106 +1,106 @@
-
-
-Apache Commons Weaver
-===
-
-[](https://travis-ci.org/apache/commons-weaver)
-[](https://coveralls.io/r/apache/commons-weaver)
-[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-weaver-base/)
-[](https://javadoc.io/doc/org.apache.commons/commons-weaver-base/1.4)
-
+
+
+Apache Commons Weaver
+===
+
+[](https://travis-ci.org/apache/commons-weaver)
+[](https://coveralls.io/r/apache/commons-weaver)
+[](https://maven-badges.herokuapp.com/maven-central/org.apache.commons/commons-weaver-base/)
+[](https://javadoc.io/doc/org.apache.commons/commons-weaver-base/2.0)
+
Apache Commons Weaver provides an easy way to enhance compiled Java
-classes by generating ("weaving") bytecode into those classes.
-
-Documentation
--
-
-More information can be found on the [Apache Commons Weaver
homepage](https://commons.apache.org/proper/commons-weaver).
-The
[Javadoc](https://commons.apache.org/proper/commons-weaver/javadocs/api-release)
can be browsed.
-Questions related to the usage of Apache Commons Weaver should be posted to
the [user mailing list][ml].
-
-Where can I get the latest release?
-You can download source and binaries from our [download
page](https://commons.apache.org/proper/commons-weaver/download_weaver.cgi).
-
-Alternatively you can pull it from the central Maven repositories:
-
-```xml
-
- org.apache.commons
- commons-weaver-base
- 1.4
-
-```
-
-Contributing
-
-
-We accept Pull Requests via GitHub. The [developer mailing list][ml] is the
main channel of communication for contributors.
-There are some guidelines which will make applying PRs easier for us:
-+ No tabs! Please use spaces for indentation.
-+ Respect the code style.
-+ Create minimal diffs - disable on save actions like reformat source code or
organize imports. If you feel the source code should be reformatted create a
separate PR for this change.
-+ Provide JUnit tests for your changes and make sure your changes don't break
any existing tests by running ```mvn clean test```.
-
-If you plan to contribute on a regular basis, please consider filing a
[contributor license agreement](https://www.apache.org/licenses/#clas).
-You can learn more about contributing via GitHub in our [contribution
guidelines](CONTRIBUTING.md).
-
-License
-This code is under the [Apache Licence
v2](https://www.apache.org/licenses/LICENSE-2.0).
-
-See the `NOTICE.txt` file for required notices and attributions.
-
-Donations
--
-You like Apache Commons Weaver? Then [donate back to the
ASF](https://www.apache.org/foundation/contributing.html) to support the
development.
-
-Additional Resources
-
-
-+ [Apache Commons Homepage](https://commons.apache.org/)
-+ [Apache Issue Tracker (JIRA)](https://issues.apache.org/jira/browse/WEAVER)
-+ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
-+ `#apache-commons` IRC channel on `irc.freenode.org`
-
-[ml]:https://commons.apache.org/mail-lists.html
+classes by generating ("weaving") bytecode into those classes.
+
+Documentation
+-
+
+More information can be found on the [Apache Commons Weaver
homepage](https://commons.apache.org/proper/commons-weaver).
+The
[Javadoc](https://commons.apache.org/proper/commons-weaver/javadocs/api-release)
can be browsed.
+Questions rela
[commons-weaver] branch master updated (ae06e22 -> 453cb78)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from ae06e22 code quality add 69ef91e Build on Java 10; modification to public API requires major version bump new 453cb78 remove Javadoc references to javax.activation.DataSource; checkstyle 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: ant/pom.xml| 2 +- build-tools/pom.xml| 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml | 6 ++-- .../commons/weaver/normalizer/Normalizer.java | 4 +-- modules/pom.xml| 2 +- modules/privilizer/api/pom.xml | 2 +- modules/privilizer/pom.xml | 2 +- modules/privilizer/weaver/pom.xml | 2 +- .../commons/weaver/privilizer/Privilizer.java | 4 +-- parent/pom.xml | 2 +- pom.xml| 33 +- processor/pom.xml | 2 +- .../commons/weaver/model/WeaveEnvironment.java | 32 ++--- 15 files changed, 63 insertions(+), 36 deletions(-)
[commons-weaver] 01/01: remove Javadoc references to javax.activation.DataSource; checkstyle
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 453cb78f9cfc75ab9973df4ed41b1b18ba99fbee
Author: Matt Benson
AuthorDate: Fri Aug 31 11:23:33 2018 -0500
remove Javadoc references to javax.activation.DataSource; checkstyle
---
.../apache/commons/weaver/model/WeaveEnvironment.java | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
b/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
index 5785dff..0554193 100644
---
a/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
+++
b/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
@@ -25,8 +25,6 @@ import java.util.Properties;
import java.util.function.Supplier;
import java.util.logging.Logger;
-import javax.activation.DataSource;
-
import org.apache.commons.lang3.Validate;
import org.apache.commons.weaver.spi.Cleaner;
import org.apache.commons.weaver.spi.Weaver;
@@ -38,7 +36,7 @@ public abstract class WeaveEnvironment {
/**
* Represents a {@link WeaveEnvironment} resource.
*/
-public class Resource {
+public class Resource {
private final String name;
Resource(final String name) {
@@ -55,6 +53,8 @@ public abstract class WeaveEnvironment {
/**
* Get an {@link InputStream} for reading this {@link Resource}.
+ * @return {@link InputStream}
+ * @throws IOException if unable to read
*/
public InputStream getInputStream() throws IOException {
return classLoader.getResourceAsStream(name);
@@ -71,6 +71,7 @@ public abstract class WeaveEnvironment {
/**
* Get an {@link OutputStream} for writing to this {@link Resource}.
* @return {@link OutputStream}
+ * @throws IOException if unable to write
*/
public OutputStream getOutputStream() throws IOException {
return WeaveEnvironment.this.getOutputStream(name);
@@ -172,27 +173,27 @@ public abstract class WeaveEnvironment {
}
/**
- * Get a {@link DataSource} representing {@code cls}.
+ * Get a {@link Resource} representing {@code cls}.
* @param cls type
- * @return {@link DataSource}
+ * @return {@link Resource}
*/
public final Resource getClassfile(final Class cls) {
return getClassfile(cls.getName());
}
/**
- * Get a {@link DataSource} for the specified class.
+ * Get a {@link Resource} for the specified class.
* @param classname of type
- * @return {@link DataSource}
+ * @return {@link Resource}
*/
public final Resource getClassfile(final String classname) {
return getResource(getResourceName(classname));
}
/**
- * Get a {@link DataSource} for the specified resource.
+ * Get a {@link Resource} for the specified resource.
* @param name of resource
- * @return {@link DataSource}
+ * @return {@link Resource}
*/
public final Resource getResource(final String name) {
return new Resource(name);
[commons-weaver] 01/01: Build on Java 10; modification to public API requires major version bump
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch java10
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 69ef91e50a3fe3b736696c0ddc307e3c5bde0cb3
Author: Matt Benson
AuthorDate: Thu Aug 30 18:06:47 2018 -0500
Build on Java 10; modification to public API requires major version bump
---
ant/pom.xml| 2 +-
build-tools/pom.xml| 2 +-
dist/pom.xml | 2 +-
maven-plugin/pom.xml | 2 +-
modules/normalizer/pom.xml | 6 ++--
.../commons/weaver/normalizer/Normalizer.java | 4 +--
modules/pom.xml| 2 +-
modules/privilizer/api/pom.xml | 2 +-
modules/privilizer/pom.xml | 2 +-
modules/privilizer/weaver/pom.xml | 2 +-
.../commons/weaver/privilizer/Privilizer.java | 4 +--
parent/pom.xml | 2 +-
pom.xml| 33 +-
processor/pom.xml | 2 +-
.../commons/weaver/model/WeaveEnvironment.java | 15 +-
15 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/ant/pom.xml b/ant/pom.xml
index 247b51f..4407ec4 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-parent
-1.4-SNAPSHOT
+2.0-SNAPSHOT
../parent/pom.xml
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
index f856c89..03ac52f 100644
--- a/build-tools/pom.xml
+++ b/build-tools/pom.xml
@@ -21,7 +21,7 @@ under the License.
org.apache.commons
commons-weaver-base
-1.4-SNAPSHOT
+2.0-SNAPSHOT
4.0.0
commons-weaver-build-tools
diff --git a/dist/pom.xml b/dist/pom.xml
index 32b5cb5..2adc395 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-parent
-1.4-SNAPSHOT
+2.0-SNAPSHOT
../parent/pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 2548342..4ddf85d 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-parent
-1.4-SNAPSHOT
+2.0-SNAPSHOT
../parent/pom.xml
diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml
index 9d5378e..fbf6403 100644
--- a/modules/normalizer/pom.xml
+++ b/modules/normalizer/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-modules-parent
-1.4-SNAPSHOT
+2.0-SNAPSHOT
commons-weaver-normalizer
Apache Commons Weaver Normalizer
@@ -206,9 +206,9 @@ under the License.
${ant.version}
-org.eclipse.jdt.core.compiler
+org.eclipse.jdt
ecj
-4.4.2
+3.14.0
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 6d12d42..1bc29fd 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -32,8 +32,6 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
-import javax.activation.DataSource;
-
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.Conversion;
import org.apache.commons.lang3.Validate;
@@ -275,7 +273,7 @@ public class Normalizer {
super.visitEnd();
final byte[] bytecode = ((ClassWriter) cv).toByteArray();
-final DataSource classfile = env.getClassfile(className);
+final WeaveEnvironment.Resource classfile =
env.getClassfile(className);
env.debug("Writing class %s to %s", className,
classfile.getName());
try (OutputStream outputStream = classfile.getOutputStream()) {
outputStream.write(bytecode);
diff --git a/modules/pom.xml b/modules/pom.xml
index 127682d..ce924dd 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -22,7 +22,7 @@ under the License.
commons-weaver-parent
org.apache.commons
-1.4-SNAPSHOT
+2.0-SNAPSHOT
../parent/pom.xml
diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml
index b694280..5c6d26a 100644
--- a/modules/privilizer/api/pom.xml
+++ b/modules/privilizer/api/pom.xml
@@ -22,7 +22,7 @@ under the License.
org.apache.commons
commons-weaver-privilizer-parent
-1.4-SNAPSHOT
+2.0-SNAPSHOT
commons-weaver-privilizer-api
diff --git a/modules/privilizer/pom.xml
[commons-weaver] branch java10 created (now 69ef91e)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch java10 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at 69ef91e Build on Java 10; modification to public API requires major version bump This branch includes the following new commits: new 69ef91e Build on Java 10; modification to public API requires major version bump 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.
[commons-weaver] branch master updated: code quality
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new ae06e22 code quality
ae06e22 is described below
commit ae06e2237485ba239ce3d7224c93d6c4eb5a
Author: Matt Benson
AuthorDate: Thu Aug 30 16:55:08 2018 -0500
code quality
---
.../main/java/org/apache/commons/weaver/privilizer/Privilizing.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/modules/privilizer/api/src/main/java/org/apache/commons/weaver/privilizer/Privilizing.java
b/modules/privilizer/api/src/main/java/org/apache/commons/weaver/privilizer/Privilizing.java
index e4604b9..8a76502 100644
---
a/modules/privilizer/api/src/main/java/org/apache/commons/weaver/privilizer/Privilizing.java
+++
b/modules/privilizer/api/src/main/java/org/apache/commons/weaver/privilizer/Privilizing.java
@@ -31,20 +31,23 @@ public @interface Privilizing {
/**
* Models calls to blueprint methods defined on a specific class.
*/
-public @interface CallTo {
+@interface CallTo {
/**
* The class owning one or more blueprint method.
+ * @return {@link Class}
*/
Class value();
/**
* The names of the blueprint methods.
+ * @return {@link String}[]
*/
String[] methods() default { };
}
/**
* List of blueprint calls.
+ * @return {@link CallTo}[]
*/
CallTo[] value();
}
[commons-weaver] annotated tag 1.4_RC1 deleted (was bfb7c4d)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag 1.4_RC1 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. *** WARNING: tag 1.4_RC1 was deleted! *** tag was bfb7c4d The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r29048 - /dev/commons/weaver/1.4-RC1/
Author: mbenson Date: Thu Aug 30 21:45:59 2018 New Revision: 29048 Log: roll back commons-weaver 1.4-RC1 Removed: dev/commons/weaver/1.4-RC1/
[commons-weaver] branch master updated: [maven-release-plugin] rollback the release of 1.4_RC1
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 83fbfdc [maven-release-plugin] rollback the release of 1.4_RC1 83fbfdc is described below commit 83fbfdcf8ad77fdc5c1474ed20ce62af56ab1314 Author: Matt Benson AuthorDate: Thu Aug 30 16:44:22 2018 -0500 [maven-release-plugin] rollback the release of 1.4_RC1 --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 3 +-- processor/pom.xml | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 3747d72..247b51f 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f87e90d..f856c89 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.5-SNAPSHOT +1.4-SNAPSHOT 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index c646625..32b5cb5 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 425b3d7..2548342 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 7a54c5a..9d5378e 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index fda48cc..127682d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index b455dc9..b694280 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index a6fb1ed..af7aedc 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 304800a..1119dc5 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 63a1048..6acbe0d 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-parent diff --git a/pom.xml b/pom.xml index d5aa123..16d2759 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.5-SNAPSHOT + 1.4-SNAPSHOT pom Apache Commons Weaver @@ -93,7 +93,6 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git -HEAD diff --git a/processor/pom.xml b/processor/pom.xml index e078804..e68d99f 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml
[2/3] commons-release-plugin git commit: add Maven plugin report and centralize (version) configuration of said plugin to pluginManagement section of pom
add Maven plugin report and centralize (version) configuration of said plugin
to pluginManagement section of pom
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/555d0899
Tree:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/555d0899
Diff:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/555d0899
Branch: refs/heads/master
Commit: 555d089943e68ce2a7e4def6453f6ac084ef5728
Parents: 7263fec
Author: Matt Benson
Authored: Thu Aug 30 15:10:32 2018 -0500
Committer: Matt Benson
Committed: Thu Aug 30 15:10:32 2018 -0500
--
pom.xml | 12 +++-
src/site/site.xml | 1 +
2 files changed, 12 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/555d0899/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0082c57..5c4685b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -117,6 +117,7 @@
true
Rob Tompkins
B6E73D84EA4FCC47166087253FAAD2CD5ECBB314
+3.5.1
@@ -257,13 +258,18 @@
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ ${maven.plugin.version}
+
+org.apache.maven.plugins
maven-plugin-plugin
-3.5.1
@@ -463,6 +469,10 @@
+
+org.apache.maven.plugins
+maven-plugin-plugin
+
org.apache.maven.plugins
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/555d0899/src/site/site.xml
--
diff --git a/src/site/site.xml b/src/site/site.xml
index e9561ba..5bbd25a 100755
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -26,6 +26,7 @@
+
[1/3] commons-release-plugin git commit: document distServer plugin config parameter
Repository: commons-release-plugin Updated Branches: refs/heads/master 462dffabe -> db9fd9fc4 document distServer plugin config parameter Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/7263fecc Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/7263fecc Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/7263fecc Branch: refs/heads/master Commit: 7263feccc0d7c5127e116f1654146bb92efa6d45 Parents: 462dffa Author: Matt Benson Authored: Thu Aug 30 15:05:01 2018 -0500 Committer: Matt Benson Committed: Thu Aug 30 15:05:01 2018 -0500 -- src/site/xdoc/index.xml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/7263fecc/src/site/xdoc/index.xml -- diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index b440602..059adcd 100755 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -124,12 +124,17 @@ mvn -Duser.name= [-Duser.password= +To avoid specifying distribution credentials at the command +line, consider using the distServer plugin configuration parameter (property commons.distServer) +to specify a server definition in Maven settings.xml which defines your (encrypted, right?) authentication info. + + + If the component is new, then, before running this maven command, you would want to create the requisite subversion directory https://dist.apache.org/repos/dist/dev/commons/foo. Notice, that the way to perform a dry run of the release you need to include -Dcommons.release.dryRun=true -Ptest-deploy. -
[3/3] commons-release-plugin git commit: remove javancss plugin, favoring JaCoCo
remove javancss plugin, favoring JaCoCo
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/db9fd9fc
Tree:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/db9fd9fc
Diff:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/db9fd9fc
Branch: refs/heads/master
Commit: db9fd9fc4cb2e383e75f30c9857f1bb57220d0e9
Parents: 555d089
Author: Matt Benson
Authored: Thu Aug 30 15:14:09 2018 -0500
Committer: Matt Benson
Committed: Thu Aug 30 15:14:09 2018 -0500
--
pom.xml | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/db9fd9fc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5c4685b..d4ed948 100755
--- a/pom.xml
+++ b/pom.xml
@@ -609,10 +609,6 @@
-org.codehaus.mojo
-javancss-maven-plugin
-
-
org.jacoco
jacoco-maven-plugin
${commons.jacoco.version}
commons-release-plugin git commit: COMMONSSITE-123: introduce configuration parameter to perfom distribution checkin using Maven settings server credentials
Repository: commons-release-plugin
Updated Branches:
refs/heads/master c315ce0ce -> 462dffabe
COMMONSSITE-123: introduce configuration parameter to perfom distribution
checkin using Maven settings server credentials
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/462dffab
Tree:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/462dffab
Diff:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/462dffab
Branch: refs/heads/master
Commit: 462dffabe3c0c01a99fea2dffdc59067059cea02
Parents: c315ce0
Author: Matt Benson
Authored: Thu Aug 30 14:19:44 2018 -0500
Committer: Matt Benson
Committed: Thu Aug 30 14:19:44 2018 -0500
--
.../mojos/CommonsDistributionStagingMojo.java | 43 +++-
.../stage-distributions/stage-distributions.xml | 1 +
2 files changed, 42 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/462dffab/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
--
diff --git
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
index 6221c34..2846352 100755
---
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
+++
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
@@ -25,6 +25,7 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
@@ -37,9 +38,15 @@ import
org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.manager.BasicScmManager;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.provider.svn.svnexe.SvnExeScmProvider;
import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionResult;
import java.io.File;
import java.io.FileOutputStream;
@@ -49,6 +56,7 @@ import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Optional;
/**
* This class checks out the dev distribution location, copies the
distributions into that directory
@@ -143,6 +151,13 @@ public class CommonsDistributionStagingMojo extends
AbstractMojo {
private String commonsRcVersion;
/**
+ * The ID of the server (specified in settings.xml) which should be used
for dist authentication.
+ * This will be used in preference to {@link #username}/{@link #password}.
+ */
+@Parameter(property = "commons.distServer")
+private String distServer;
+
+/**
* The username for the distribution subversion repository. This is
typically your Apache id.
*/
@Parameter(property = "user.name")
@@ -155,6 +170,18 @@ public class CommonsDistributionStagingMojo extends
AbstractMojo {
private String password;
/**
+ * Maven {@link Settings}.
+ */
+@Parameter(defaultValue = "${settings}", readonly = true, required = true)
+private Settings settings;
+
+/**
+ * Maven {@link SettingsDecrypter} component.
+ */
+@Component
+private SettingsDecrypter settingsDecrypter;
+
+/**
* A subdirectory of the dist directory into which we are going to stage
the release candidate. We
* build this up in the {@link CommonsDistributionStagingMojo#execute()}
method. And, for example,
* the directory should look like
https://https://dist.apache.org/repos/dist/dev/commons/text/1.4-RC1.
@@ -183,8 +210,7 @@ public class CommonsDistributionStagingMojo extends
AbstractMojo {
ScmRepository repository =
scmManager.makeScmRepository(distSvnStagingUrl);
ScmProvider provider =
scmManager.getProviderByRepository(repository);
SvnScmProviderRepository providerRepository =
(SvnScmProviderRepository)
svn commit: r29044 - in /dev/commons/weaver/1.4-RC1: ./ binaries/ site/ site/commons-weaver-build-tools/ site/commons-weaver-build-tools/css/ site/commons-weaver-build-tools/images/ site/commons-weave
Author: mbenson Date: Thu Aug 30 19:11:29 2018 New Revision: 29044 Log: Staging release: commons-weaver, version: 1.4 [This commit notification would consist of 172 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
[commons-weaver] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 69ac94a [maven-release-plugin] prepare for next development iteration 69ac94a is described below commit 69ac94aa6eedd7c7fb2c74cd2b20e3a6ec36114f Author: Matt Benson AuthorDate: Wed Aug 29 16:52:03 2018 -0500 [maven-release-plugin] prepare for next development iteration --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 4 ++-- processor/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index adfb72c..3747d72 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f0ea423..f87e90d 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.4 +1.5-SNAPSHOT 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index e6e5783..c646625 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 0ce02bb..425b3d7 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 6a5bd5c..7a54c5a 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4 +1.5-SNAPSHOT commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index 6a9c9b8..fda48cc 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index 32ae6f6..b455dc9 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4 +1.5-SNAPSHOT commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index 27fec31..a6fb1ed 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4 +1.5-SNAPSHOT commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index aa60cc3..304800a 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4 +1.5-SNAPSHOT commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 66f4a3c..63a1048 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.4 +1.5-SNAPSHOT commons-weaver-parent diff --git a/pom.xml b/pom.xml index 326ed3c..d5aa123 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.4 + 1.5-SNAPSHOT pom Apache Commons Weaver @@ -93,7 +93,7 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git -1.4_RC1 +HEAD diff --git a/processor/pom.xml b/processor/pom.xml index bf6ec5a..e078804 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml
[commons-weaver] annotated tag 1.4_RC1 created (now bfb7c4d)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag 1.4_RC1 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at bfb7c4d (tag) tagging 6fc31c3b650adcf9592615bcbb7ce1b5e598efc1 (commit) by Matt Benson on Wed Aug 29 16:51:57 2018 -0500 - Log - [maven-release-plugin] copy for tag 1.4_RC1 --- No new revisions were added by this update.
[commons-weaver] branch master updated: [maven-release-plugin] prepare release 1.4_RC1
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 6fc31c3 [maven-release-plugin] prepare release 1.4_RC1 6fc31c3 is described below commit 6fc31c3b650adcf9592615bcbb7ce1b5e598efc1 Author: Matt Benson AuthorDate: Wed Aug 29 16:51:42 2018 -0500 [maven-release-plugin] prepare release 1.4_RC1 --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 3 ++- processor/pom.xml | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 247b51f..adfb72c 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f856c89..f0ea423 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.4-SNAPSHOT +1.4 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index 32b5cb5..e6e5783 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2548342..0ce02bb 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 9d5378e..6a5bd5c 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4-SNAPSHOT +1.4 commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index 127682d..6a9c9b8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index b694280..32ae6f6 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index af7aedc..27fec31 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 1119dc5..aa60cc3 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 6acbe0d..66f4a3c 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.4-SNAPSHOT +1.4 commons-weaver-parent diff --git a/pom.xml b/pom.xml index 16d2759..326ed3c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.4-SNAPSHOT + 1.4 pom Apache Commons Weaver @@ -93,6 +93,7 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git +1.4_RC1 diff --git a/processor/pom.xml b/processor/pom.xml index e68d99f..bf6ec5a 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml
[commons-weaver] annotated tag 1.4_RC1 deleted (was 1793ae1)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag 1.4_RC1 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. *** WARNING: tag 1.4_RC1 was deleted! *** tag was 1793ae1 The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[commons-weaver] branch master updated: [maven-release-plugin] rollback the release of 1.4_RC1
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new e5abdee [maven-release-plugin] rollback the release of 1.4_RC1 e5abdee is described below commit e5abdee1aef6229992917cffd3a5fd22b6c7edc1 Author: Matt Benson AuthorDate: Wed Aug 29 16:46:53 2018 -0500 [maven-release-plugin] rollback the release of 1.4_RC1 --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 3 +-- processor/pom.xml | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index adfb72c..247b51f 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.4-SNAPSHOT ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f0ea423..f856c89 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.4 +1.4-SNAPSHOT 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index e6e5783..32b5cb5 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.4-SNAPSHOT ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 0ce02bb..2548342 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.4-SNAPSHOT ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 6a5bd5c..9d5378e 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4 +1.4-SNAPSHOT commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index 6a9c9b8..127682d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.4 +1.4-SNAPSHOT ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index 32ae6f6..b694280 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4 +1.4-SNAPSHOT commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index 27fec31..af7aedc 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4 +1.4-SNAPSHOT commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index aa60cc3..1119dc5 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4 +1.4-SNAPSHOT commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 66f4a3c..6acbe0d 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.4 +1.4-SNAPSHOT commons-weaver-parent diff --git a/pom.xml b/pom.xml index 326ed3c..16d2759 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.4 + 1.4-SNAPSHOT pom Apache Commons Weaver @@ -93,7 +93,6 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git -1.4_RC1 diff --git a/processor/pom.xml b/processor/pom.xml index bf6ec5a..e68d99f 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.4-SNAPSHOT ../parent/pom.xml
[commons-weaver] branch master updated: [maven-release-plugin] prepare release 1.4_RC1
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new a0b7ad7 [maven-release-plugin] prepare release 1.4_RC1 a0b7ad7 is described below commit a0b7ad7e9a8c2a5bceed3fb5a183456686c0e501 Author: Matt Benson AuthorDate: Wed Aug 29 16:46:20 2018 -0500 [maven-release-plugin] prepare release 1.4_RC1 --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 3 ++- processor/pom.xml | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 247b51f..adfb72c 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f856c89..f0ea423 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.4-SNAPSHOT +1.4 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index 32b5cb5..e6e5783 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2548342..0ce02bb 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 9d5378e..6a5bd5c 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4-SNAPSHOT +1.4 commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index 127682d..6a9c9b8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index b694280..32ae6f6 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index af7aedc..27fec31 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 1119dc5..aa60cc3 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 6acbe0d..66f4a3c 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.4-SNAPSHOT +1.4 commons-weaver-parent diff --git a/pom.xml b/pom.xml index 16d2759..326ed3c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.4-SNAPSHOT + 1.4 pom Apache Commons Weaver @@ -93,6 +93,7 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git +1.4_RC1 diff --git a/processor/pom.xml b/processor/pom.xml index e68d99f..bf6ec5a 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml
[commons-weaver] branch master updated: [maven-release-plugin] rollback the release of 1.4_RC1
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new e816852 [maven-release-plugin] rollback the release of 1.4_RC1 e816852 is described below commit e816852fbfdff9c4d4b3818ddd019968bda5b383 Author: Matt Benson AuthorDate: Wed Aug 29 16:44:01 2018 -0500 [maven-release-plugin] rollback the release of 1.4_RC1 --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 3 +-- processor/pom.xml | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 3747d72..247b51f 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f87e90d..f856c89 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.5-SNAPSHOT +1.4-SNAPSHOT 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index c646625..32b5cb5 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 425b3d7..2548342 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 7a54c5a..9d5378e 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index fda48cc..127682d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index b455dc9..b694280 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index a6fb1ed..af7aedc 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 304800a..1119dc5 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 63a1048..6acbe0d 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.5-SNAPSHOT +1.4-SNAPSHOT commons-weaver-parent diff --git a/pom.xml b/pom.xml index d5aa123..16d2759 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.5-SNAPSHOT + 1.4-SNAPSHOT pom Apache Commons Weaver @@ -93,7 +93,6 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git -HEAD diff --git a/processor/pom.xml b/processor/pom.xml index e078804..e68d99f 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.5-SNAPSHOT +1.4-SNAPSHOT ../parent/pom.xml
svn commit: r29021 - in /dev/commons/weaver: binaries/ source/
Author: mbenson Date: Wed Aug 29 21:43:25 2018 New Revision: 29021 Log: new structure for commons dist Removed: dev/commons/weaver/binaries/ dev/commons/weaver/source/
[commons-weaver] branch master updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 76c9b04 [maven-release-plugin] prepare for next development iteration 76c9b04 is described below commit 76c9b04b1da001e20df02396bd49bf63c717bed8 Author: Matt Benson AuthorDate: Wed Aug 29 15:57:32 2018 -0500 [maven-release-plugin] prepare for next development iteration --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 4 ++-- processor/pom.xml | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index adfb72c..3747d72 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f0ea423..f87e90d 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.4 +1.5-SNAPSHOT 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index e6e5783..c646625 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 0ce02bb..425b3d7 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 6a5bd5c..7a54c5a 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4 +1.5-SNAPSHOT commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index 6a9c9b8..fda48cc 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.4 +1.5-SNAPSHOT ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index 32ae6f6..b455dc9 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4 +1.5-SNAPSHOT commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index 27fec31..a6fb1ed 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4 +1.5-SNAPSHOT commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index aa60cc3..304800a 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4 +1.5-SNAPSHOT commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 66f4a3c..63a1048 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.4 +1.5-SNAPSHOT commons-weaver-parent diff --git a/pom.xml b/pom.xml index 326ed3c..d5aa123 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.4 + 1.5-SNAPSHOT pom Apache Commons Weaver @@ -93,7 +93,7 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git -1.4_RC1 +HEAD diff --git a/processor/pom.xml b/processor/pom.xml index bf6ec5a..e078804 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4 +1.5-SNAPSHOT ../parent/pom.xml
[commons-weaver] annotated tag 1.4_RC1 created (now 1793ae1)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to annotated tag 1.4_RC1 in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at 1793ae1 (tag) tagging a4f74fc400215a0f01cda9c8674db36e7c2d945d (commit) by Matt Benson on Wed Aug 29 15:57:27 2018 -0500 - Log - [maven-release-plugin] copy for tag 1.4_RC1 --- No new revisions were added by this update.
[commons-weaver] branch master updated: [maven-release-plugin] prepare release 1.4_RC1
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new a4f74fc [maven-release-plugin] prepare release 1.4_RC1 a4f74fc is described below commit a4f74fc400215a0f01cda9c8674db36e7c2d945d Author: Matt Benson AuthorDate: Wed Aug 29 15:57:12 2018 -0500 [maven-release-plugin] prepare release 1.4_RC1 --- ant/pom.xml | 2 +- build-tools/pom.xml | 2 +- dist/pom.xml | 2 +- maven-plugin/pom.xml | 2 +- modules/normalizer/pom.xml| 2 +- modules/pom.xml | 2 +- modules/privilizer/api/pom.xml| 2 +- modules/privilizer/pom.xml| 2 +- modules/privilizer/weaver/pom.xml | 2 +- parent/pom.xml| 2 +- pom.xml | 3 ++- processor/pom.xml | 2 +- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 247b51f..adfb72c 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/build-tools/pom.xml b/build-tools/pom.xml index f856c89..f0ea423 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.commons commons-weaver-base -1.4-SNAPSHOT +1.4 4.0.0 commons-weaver-build-tools diff --git a/dist/pom.xml b/dist/pom.xml index 32b5cb5..e6e5783 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 2548342..0ce02bb 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 9d5378e..6a5bd5c 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4-SNAPSHOT +1.4 commons-weaver-normalizer Apache Commons Weaver Normalizer diff --git a/modules/pom.xml b/modules/pom.xml index 127682d..6a9c9b8 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -22,7 +22,7 @@ under the License. commons-weaver-parent org.apache.commons -1.4-SNAPSHOT +1.4 ../parent/pom.xml diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index b694280..32ae6f6 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer-api diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index af7aedc..27fec31 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-modules-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer-parent diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 1119dc5..aa60cc3 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-privilizer-parent -1.4-SNAPSHOT +1.4 commons-weaver-privilizer diff --git a/parent/pom.xml b/parent/pom.xml index 6acbe0d..66f4a3c 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-weaver-base -1.4-SNAPSHOT +1.4 commons-weaver-parent diff --git a/pom.xml b/pom.xml index 16d2759..326ed3c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ under the License. commons-weaver-base - 1.4-SNAPSHOT + 1.4 pom Apache Commons Weaver @@ -93,6 +93,7 @@ under the License. scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git http://gitbox.apache.org/repos/asf/commons-weaver.git +1.4_RC1 diff --git a/processor/pom.xml b/processor/pom.xml index e68d99f..bf6ec5a 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.commons commons-weaver-parent -1.4-SNAPSHOT +1.4 ../parent/pom.xml
[commons-weaver] branch master updated: add release date guess
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 34d61d7 add release date guess 34d61d7 is described below commit 34d61d7431a8d542757630afe7d6eb43d302ede5 Author: Matt Benson AuthorDate: Wed Aug 29 15:53:33 2018 -0500 add release date guess --- src/changes/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index b6786e4..75db770 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -23,7 +23,7 @@ Matt Benson - + NullPointerException when weaving class with no package. Maven plugin was packaged without its (generated) HelpMojo class. Upgrade to Java 8.
[commons-weaver] branch master updated: set up release plugin in dist module
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 80a9e81 set up release plugin in dist module
80a9e81 is described below
commit 80a9e81f9f1e599684d3e300149bbb9465159088
Author: Matt Benson
AuthorDate: Wed Aug 29 15:46:53 2018 -0500
set up release plugin in dist module
---
dist/pom.xml | 6 ++
1 file changed, 6 insertions(+)
diff --git a/dist/pom.xml b/dist/pom.xml
index 91bc53a..32b5cb5 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -120,6 +120,12 @@ under the License.
+
+true
+
${basedir}/../target/staging
+
${basedir}/../RELEASE-NOTES.txt
+
+
commons-release-plugin git commit: use StringBuilder instead of StringBuffer for instances used on a single thread
Repository: commons-release-plugin
Updated Branches:
refs/heads/master 7505912b8 -> c315ce0ce
use StringBuilder instead of StringBuffer for instances used on a single thread
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/c315ce0c
Tree:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/c315ce0c
Diff:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/c315ce0c
Branch: refs/heads/master
Commit: c315ce0cee4f3477a9af1070f06b7285e1694c0a
Parents: 7505912
Author: Matt Benson
Authored: Wed Aug 29 15:34:20 2018 -0500
Committer: Matt Benson
Committed: Wed Aug 29 15:34:20 2018 -0500
--
.../plugin/mojos/CommonsDistributionDetachmentMojo.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/c315ce0c/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
--
diff --git
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
index e569223..8528084 100755
---
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
+++
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojo.java
@@ -241,13 +241,12 @@ public class CommonsDistributionDetachmentMojo extends
AbstractMojo {
*properly wrapped so that Maven can
handle it.
*/
private void copyRemovedArtifactsToWorkingDirectory() throws
MojoExecutionException {
-StringBuffer copiedArtifactAbsolutePath;
final String wdAbsolutePath = workingDirectory.getAbsolutePath();
getLog().info(
"Copying " + detachedArtifacts.size() + " detached artifacts
to working directory " + wdAbsolutePath);
for (Artifact artifact: detachedArtifacts) {
File artifactFile = artifact.getFile();
-copiedArtifactAbsolutePath = new StringBuffer(wdAbsolutePath);
+StringBuilder copiedArtifactAbsolutePath = new
StringBuilder(wdAbsolutePath);
copiedArtifactAbsolutePath.append("/");
copiedArtifactAbsolutePath.append(artifactFile.getName());
File copiedArtifact = new
File(copiedArtifactAbsolutePath.toString());
@@ -299,7 +298,7 @@ public class CommonsDistributionDetachmentMojo extends
AbstractMojo {
* @return a {@link String} that is the absolute path to the
.sha256 file.
*/
private String getSha256FilePath(File directory, File file) {
-StringBuffer buffer = new StringBuffer(directory.getAbsolutePath());
+StringBuilder buffer = new StringBuilder(directory.getAbsolutePath());
buffer.append("/");
buffer.append(file.getName());
buffer.append(".sha256");
@@ -314,7 +313,7 @@ public class CommonsDistributionDetachmentMojo extends
AbstractMojo {
* @return a {@link String} that is the absolute path to the
.sha512 file.
*/
private String getSha512FilePath(File directory, File file) {
-StringBuffer buffer = new StringBuffer(directory.getAbsolutePath());
+StringBuilder buffer = new StringBuilder(directory.getAbsolutePath());
buffer.append("/");
buffer.append(file.getName());
buffer.append(".sha512");
@@ -329,7 +328,7 @@ public class CommonsDistributionDetachmentMojo extends
AbstractMojo {
* @return the generated key
*/
private String getArtifactKey(Artifact artifact) {
-StringBuffer artifactKey = new StringBuffer();
+StringBuilder artifactKey = new StringBuilder();
artifactKey.append(artifact.getArtifactId()).append('-')
.append(artifact.getVersion()).append('-');
if (artifact.hasClassifier()) {
commons-release-plugin git commit: COMMONSSITE-122: stage-distributions mojo assumes site directory has basename 'site'
Repository: commons-release-plugin
Updated Branches:
refs/heads/master d584fab29 -> 7505912b8
COMMONSSITE-122: stage-distributions mojo assumes site directory has basename
'site'
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo
Commit:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/7505912b
Tree:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/7505912b
Diff:
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/7505912b
Branch: refs/heads/master
Commit: 7505912b803ad4394ceb4ef70dd866d20b2627e5
Parents: d584fab
Author: Matt Benson
Authored: Wed Aug 29 14:59:21 2018 -0500
Committer: Matt Benson
Committed: Wed Aug 29 14:59:21 2018 -0500
--
.../release/plugin/mojos/CommonsDistributionStagingMojo.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/7505912b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
--
diff --git
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
index 7fb1ea0..6221c34 100755
---
a/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
+++
b/src/main/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojo.java
@@ -352,12 +352,12 @@ public class CommonsDistributionStagingMojo extends
AbstractMojo {
"\"mvn site\" was not run before this goal, or a
siteDirectory did not exist."
);
}
+File siteInScm = new File(distVersionRcVersionDirectory, "site");
try {
-FileUtils.copyDirectoryToDirectory(siteDirectory,
distVersionRcVersionDirectory);
+FileUtils.copyDirectory(siteDirectory, siteInScm);
} catch (IOException e) {
throw new MojoExecutionException("Site copying failed", e);
}
-File siteInScm = new File(distVersionRcVersionDirectory, "site");
return new ArrayList<>(FileUtils.listFiles(siteInScm, null, true));
}
[commons-weaver] branch master updated (d513b00 -> b00837f)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from d513b00 update autogenerated files using commons-build-plugin 1.10-SNAPSHOT new 31d53e5 update copyright new b00837f update ASM version in release notes The 2 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: NOTICE.txt| 2 +- RELEASE-NOTES.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[commons-weaver] 01/02: update copyright
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 31d53e5e33db0f454b361fd0004c7f04df287ec7 Author: Matt Benson AuthorDate: Tue Aug 28 17:04:59 2018 -0500 update copyright --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index cc689a3..3e00480 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Commons Weaver -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/).
[commons-weaver] 02/02: update ASM version in release notes
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit b00837f38b672ea5d9ba00a49bffa6843ce7913d Author: Matt Benson AuthorDate: Tue Aug 28 17:05:13 2018 -0500 update ASM version in release notes --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 7121847..511e592 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -22,7 +22,7 @@ o WEAVER-23: Privilizer Weaver computes Object for all variable types in catch Changes: o WEAVER-20: Remove commons-io, commons-collections dependencies. o WEAVER-21: Upgrade xbean-finder to v4.9. -o WEAVER-22: Upgrade modules to ASM 6.2. +o WEAVER-22: Upgrade modules to ASM 6.2.1. o WEAVER-25: Reject blueprint methods that access entities that would be inaccessible. o WEAVER-26: Upgrade to commons-parent v47.
[commons-weaver] branch master updated: update autogenerated files using commons-build-plugin 1.10-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new d513b00 update autogenerated files using commons-build-plugin 1.10-SNAPSHOT d513b00 is described below commit d513b006b5046db3943005211cebd7423b0221f0 Author: Matt Benson AuthorDate: Tue Aug 28 16:53:45 2018 -0500 update autogenerated files using commons-build-plugin 1.10-SNAPSHOT --- CONTRIBUTING.md | 44 ++--- README.md| 11 ++- src/site/xdoc/issue-tracking.xml | 102 +++ src/site/xdoc/mail-lists.xml | 205 +++ 4 files changed, 345 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1f9ab94..c427e96 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -50,48 +50,66 @@ Getting Started + Make sure you have a [JIRA account](https://issues.apache.org/jira/). + Make sure you have a [GitHub account](https://github.com/signup/free). -+ If you're planning to implement a new feature it makes sense to discuss you're changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Weaver's scope. -+ Submit a ticket for your issue, assuming one does not already exist. ++ If you're planning to implement a new feature it makes sense to discuss your changes on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make sure you're not wasting your time on something that isn't considered to be in Apache Commons Weaver's scope. ++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist. + Clearly describe the issue including steps to reproduce when it is a bug. + Make sure you fill in the earliest version that you know has the issue. -+ Fork the repository on GitHub. ++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-), +[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository. Making Changes -- -+ Create a topic branch from where you want to base your work (this is usually the master/trunk branch). ++ Create a _topic branch_ for your isolated work. + * Usually you should base your branch on the `master` or `trunk` branch. + * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `WEAVER-123-InputStream`. + * If you have submitted multiple JIRA issues, try to maintain separate branches and pull requests. + Make commits of logical units. + * Make sure your commit messages are meaningful and in the proper format. Your commit message should contain the key of the JIRA issue. + * e.g. `WEAVER-123: Close input stream earlier` + Respect the original code style: + Only use spaces for indentation. - + Create minimal diffs - disable on save actions like reformat source code or organize imports. If you feel the source code should be reformatted create a separate PR for this change. - + Check for unnecessary whitespace with git diff --check before committing. -+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue. -+ Make sure you have added the necessary tests for your changes. + + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize Imports_. If you feel the source code should be reformatted create a separate PR for this change first. + + Check for unnecessary whitespace with `git diff` -- check before committing. ++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`. + Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken. Making Trivial Changes -- +The JIRA tickets are used to generate the changelog for the next release. + For changes of a trivial nature to comments and documentation, it is not always necessary to create a new ticket in JIRA. In this case, it is appropriate to start the first line of a commit with '(doc)' instead of a ticket number. + Submitting Changes -- -+ Sign the [Contributor License Agreement][cla] if you haven't already. ++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already. + * Note that small patches & typical bug fixes do not require a CLA as +clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions) +covers them. + Push your changes to a topic branch in your fork of the repository. -+ Submit a pull request to the repository in the apache organization. ++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization. + * Verify _F
[commons-weaver] branch master updated: generate 1.4 download page using commons-build-plugin 1.10-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new e0e218b generate 1.4 download page using commons-build-plugin 1.10-SNAPSHOT e0e218b is described below commit e0e218bc9f33a386aeb563337cd59f115cd7e4ff Author: Matt Benson AuthorDate: Tue Aug 28 16:43:16 2018 -0500 generate 1.4 download page using commons-build-plugin 1.10-SNAPSHOT --- src/site/xdoc/download_weaver.xml | 42 --- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/site/xdoc/download_weaver.xml b/src/site/xdoc/download_weaver.xml index 717ea08..7b1b24f 100644 --- a/src/site/xdoc/download_weaver.xml +++ b/src/site/xdoc/download_weaver.xml @@ -29,19 +29,21 @@ limitations under the License. | 1) Re-generate using: mvn commons:download-page | | | | 2) Set the following properties in the component's pom: | - |- commons.componentid (required, alphabetic, lower case) | + |- commons.componentid (required, alphabetic, lower case) | |- commons.release.version (required) | |- commons.release.name(required) | |- commons.binary.suffix (optional) | | (defaults to "-bin", set to "" for pre-maven2 releases) | |- commons.release.desc(optional) | |- commons.release.subdir (optional) | + |- commons.release.hash(optional, lowercase, default sha256) | | | - |- commons.release.2/3.version (conditional) | - |- commons.release.2/3.name (conditional) | - |- commons.release.2/3.binary.suffix (optional)| - |- commons.release.2/3.desc (optional)| - |- commons.release.2/3.subdir(optional)| + |- commons.release.[234].version (conditional) | + |- commons.release.[234].name (conditional) | + |- commons.release.[234].binary.suffix (optional) | + |- commons.release.[234].desc (optional) | + |- commons.release.[234].subdir(optional) | + |- commons.release.[234].hash (optional, lowercase, [sha256])| | | | 3) Example Properties| |(commons.release.name inherited by parent:| @@ -102,7 +104,7 @@ limitations under the License. It is essential that you https://www.apache.org/info/verification.html;>verify the integrity of downloaded files, preferably using the PGP signature (*.asc files); -failing that using the MD5 hash (*.md5 checksum files). +failing that using the SHA256 hash (*.sha256 checksum files). The https://www.apache.org/dist/commons/KEYS;>KEYS @@ -111,32 +113,32 @@ limitations under the License. - + - commons-weaver-1.3-bin.tar.gz - https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.3-bin.tar.gz.md5;>md5 - https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.3-bin.tar.gz.asc;>pgp + commons-weaver-1.4-bin.tar.gz + https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.4-bin.tar.gz.sha256;>sha256 + https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.4-bin.tar.gz.asc;>pgp - commons-weaver-1.3-bin.zip - https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.3-bin.zip.md5;>md5 - https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.3-bin.zip.asc;>pgp + commons-weaver-1.4-bin.zip + https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.4-bin.zip.sha256;>sha256 + https://www.apache.org/dist/commons/weaver/binaries/commons-weaver-1.4-bin.zip.asc;>pgp - commons-weaver-1.3-src.tar.gz - https://www.apache.org/dist/commons/weaver/source/commons-weaver-1.3-src.tar.gz.md5;>md5 - https://www.apache.org/dist/commons/weaver/source/commons-weaver-1.3-src.tar.gz.asc;>pgp + commons-weaver-1.4-src.tar.gz +
[commons-weaver] branch master updated: release properties
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 65b2386 release properties
65b2386 is described below
commit 65b2386a7806a65ffbf55dddce08f12bf9414fe4
Author: Matt Benson
AuthorDate: Tue Aug 28 15:04:34 2018 -0500
release properties
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 793e848..16d2759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@ under the License.
org.apache.commons.weaver
1.4
commons-weaver-${commons.release.version}
-RC2
+RC1
WEAVER
12315320
commons-weaver
[commons-weaver] branch master updated: code quality
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 125e3a4 code quality
125e3a4 is described below
commit 125e3a468fe1816d5c789ee11617858ca5f68a25
Author: Matt Benson
AuthorDate: Tue Aug 28 14:59:55 2018 -0500
code quality
---
.../org/apache/commons/weaver/checkstyle.xml | 1 -
.../resources/org/apache/commons/weaver/pmd.xml| 14 ++
maven-plugin/pom.xml | 4 +
.../maven/JavaLoggingToMojoLoggingRedirector.java | 4 +-
.../commons/weaver/normalizer/Normalizer.java | 56 --
.../commons/weaver/privilizer/AccessLevel.java | 2 +-
.../weaver/privilizer/BlueprintingVisitor.java | 188 +
.../privilizer/InlineNestedPrivilegedCalls.java| 14 +-
.../commons/weaver/privilizer/Privilized.java | 1 +
.../weaver/privilizer/PrivilizingVisitor.java | 2 +-
parent/pom.xml | 6 +-
.../java/org/apache/commons/weaver/Consumes.java | 1 +
.../java/org/apache/commons/weaver/Finder.java | 76 ++---
.../java/org/apache/commons/weaver/Inflater.java | 10 +-
.../java/org/apache/commons/weaver/Produces.java | 1 +
.../weaver/lifecycle/WeaveLifecycleToken.java | 1 +
.../apache/commons/weaver/model/ScanResult.java| 6 +-
.../org/apache/commons/weaver/model/Weavable.java | 2 +-
.../commons/weaver/model/WeaveEnvironment.java | 7 +-
.../org/apache/commons/weaver/utils/URLArray.java | 8 +-
20 files changed, 278 insertions(+), 126 deletions(-)
diff --git
a/build-tools/src/main/resources/org/apache/commons/weaver/checkstyle.xml
b/build-tools/src/main/resources/org/apache/commons/weaver/checkstyle.xml
index cb72326..9e63863 100644
--- a/build-tools/src/main/resources/org/apache/commons/weaver/checkstyle.xml
+++ b/build-tools/src/main/resources/org/apache/commons/weaver/checkstyle.xml
@@ -153,7 +153,6 @@
-
diff --git a/build-tools/src/main/resources/org/apache/commons/weaver/pmd.xml
b/build-tools/src/main/resources/org/apache/commons/weaver/pmd.xml
index 4009047..3a79213 100644
--- a/build-tools/src/main/resources/org/apache/commons/weaver/pmd.xml
+++ b/build-tools/src/main/resources/org/apache/commons/weaver/pmd.xml
@@ -27,9 +27,11 @@ limitations under the License.
+
+
@@ -38,6 +40,12 @@ limitations under the License.
+
+
+
+
+
+
@@ -46,11 +54,17 @@ limitations under the License.
+
+
+
+
+
+
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 558e851..2548342 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -177,6 +177,9 @@ under the License.
/org/apache/commons/weaver/pmd.xml
false
+
+target/generated-sources/plugin
+
@@ -185,6 +188,7 @@ under the License.
${checkstyle.version}
org/apache/commons/weaver/checkstyle.xml
+ org/apache/commons/weaver/maven/HelpMojo.java
diff --git
a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
index 4534cec..a4866a7 100644
---
a/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
+++
b/maven-plugin/src/main/java/org/apache/commons/weaver/maven/JavaLoggingToMojoLoggingRedirector.java
@@ -42,7 +42,7 @@ public class JavaLoggingToMojoLoggingRedirector {
/**
* The Maven mojo logger to delegate messages to.
*/
-private final Log mojoLogger;
+final Log mojoLogger;
private JDKLogHandler activeHandler;
@@ -86,7 +86,7 @@ public class JavaLoggingToMojoLoggingRedirector {
public void deactivate() {
final Logger rootLogger = LogManager.getLogManager().getLogger("");
// remove old handlers
-
+
if (Stream.of(rootLogger.getHandlers()).anyMatch(h -> h ==
activeHandler)) {
rootLogger.removeHandler(activeHandler);
}
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 890b3b8..6d12d42 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -64,9 +64,6 @@ import org.objectweb.asm.commons.SimpleRemapper
[commons-weaver] branch master updated: upgrade to ASM 6.2.1
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 57f3b1d upgrade to ASM 6.2.1
57f3b1d is described below
commit 57f3b1d28f251b592b936f78dd69651e5f8b
Author: Matt Benson
AuthorDate: Fri Aug 24 16:48:23 2018 -0500
upgrade to ASM 6.2.1
---
LICENSE-asm6.2.txt => LICENSE-asm6.2.1.txt | 0
.../commons/weaver/normalizer/Normalizer.java | 4 +--
.../commons/weaver/privilizer/Privilizer.java | 4 +--
pom.xml| 2 +-
.../commons/weaver/model/WeaveEnvironment.java | 38 --
src/changes/changes.xml| 2 +-
6 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/LICENSE-asm6.2.txt b/LICENSE-asm6.2.1.txt
similarity index 100%
rename from LICENSE-asm6.2.txt
rename to LICENSE-asm6.2.1.txt
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 1894dba..890b3b8 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -230,8 +230,8 @@ public class Normalizer {
}
@Override
-protected String getCommonSuperClass(final String type1, final String
type2) {
-return env.getCommonSuperClass(type1, type2);
+protected ClassLoader getClassLoader() {
+return env.classLoader;
}
}
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
index 25d54b0..218cea3 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
@@ -83,8 +83,8 @@ public class Privilizer {
}
@Override
-protected String getCommonSuperClass(final String type1, final String
type2) {
-return env.getCommonSuperClass(type1, type2);
+protected ClassLoader getClassLoader() {
+return env.classLoader;
}
}
diff --git a/pom.xml b/pom.xml
index 1d59d42..793e848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@ under the License.
1.8
1.9.4
-6.2
+6.2.1
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
b/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
index af7bd2b..565eb4b 100644
---
a/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
+++
b/processor/src/main/java/org/apache/commons/weaver/model/WeaveEnvironment.java
@@ -215,44 +215,6 @@ public abstract class WeaveEnvironment {
}
/**
- * Calculate a common superclass for the specified classnames, in terms of
the {@link WeaveEnvironment}'s
- * {@link #classLoader}. This method exists as a convenience feature for
weaver modules that use ASM, and is
- * implemented with the same logic as the method of the same name in that
library's {@code ClassVisitor} class.
- *
- * @param type1
- * @param type2
- * @return {@link String} internal name of superclass common to {@code
type1} and {@code type2}
- */
-public final String getCommonSuperClass(final String type1, final String
type2) {
-// https://gitlab.ow2.org/asm/asm/merge_requests/166
-Class class1;
-try {
-class1 = Class.forName(type1.replace('/', '.'), false,
classLoader);
-} catch (Exception e) {
-throw new TypeNotPresentException(type1, e);
-}
-Class class2;
-try {
-class2 = Class.forName(type2.replace('/', '.'), false,
classLoader);
-} catch (Exception e) {
-throw new TypeNotPresentException(type2, e);
-}
-if (class1.isAssignableFrom(class2)) {
-return type1;
-}
-if (class2.isAssignableFrom(class1)) {
-return type2;
-}
-if (class1.isInterface() || class2.isInterface()) {
-return "java/lang/Object";
-}
-do {
-class1 = class1.getSuperclass();
-} while (!class1.isAssignableFrom(class2));
-return class1.getName().replace('.', '/');
-}
-
-/**
* Delete the specified resource.
* @param name to delete
* @return whether successful
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e5f1a8a..b6786e4 100644
--- a/src/changes/changes.xml
+++ b/src/change
[commons-weaver] branch master updated: update building instructions
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 75bf561 update building instructions 75bf561 is described below commit 75bf561f9a326efe17ba11af8afd8e873c4d26a6 Author: Matt Benson AuthorDate: Fri Aug 24 16:33:19 2018 -0500 update building instructions --- src/site/markdown/building.md | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/site/markdown/building.md b/src/site/markdown/building.md index ecff52e..78126b8 100644 --- a/src/site/markdown/building.md +++ b/src/site/markdown/building.md @@ -17,13 +17,10 @@ specific language governing permissions and limitations under the License. --> -Apache Maven 3 is required to build Apache Commons Weaver. Things to know: +Apache Maven 3 is required to build Apache Commons Weaver, using Java 8. ### Site building issues Apache Commons Weaver uses the japicmp report for API compatibility reporting. This requires that the `package` goal be invoked in the same Maven run as the -`site` goal. Further, the site generation process runs out of permgen space when -built with default JVM settings (on applicable Java versions); the `MAVEN_OPTS -environment variable can be used to set `MaxPermSize`. `-XX:MaxPermSize=128m` -seems to be adequate on Java 7. +`site` goal.
[commons-weaver] branch master updated: ignore shaded oac.lang3 for antlib japicmp report
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new e2de9e1 ignore shaded oac.lang3 for antlib japicmp report e2de9e1 is described below commit e2de9e133a01cf30819824f42e78e55d2bd1b7f3 Author: Matt Benson AuthorDate: Fri Aug 24 16:27:42 2018 -0500 ignore shaded oac.lang3 for antlib japicmp report --- ant/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/ant/pom.xml b/ant/pom.xml index 9c4f5ad..247b51f 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -64,6 +64,7 @@ under the License. org.apache.commons.weaver.ant._collections4 +org.apache.commons.weaver.ant._lang3 org.apache.commons.weaver.ant._xbean
[commons-weaver] branch master updated: Workaround for japicmp report generation. Can be removed when parent moves to 48+.
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new cbb280f Workaround for japicmp report generation. Can be removed when parent moves to 48+. cbb280f is described below commit cbb280fd833f089a8c15acb6fda7815b597ecce8 Author: Roberto Cortez AuthorDate: Fri Aug 24 18:34:54 2018 +0100 Workaround for japicmp report generation. Can be removed when parent moves to 48+. --- pom.xml | 9 + 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 0564f26..1d59d42 100644 --- a/pom.xml +++ b/pom.xml @@ -149,6 +149,15 @@ under the License. build-helper-maven-plugin 1.9 + + + com.github.siom79.japicmp + japicmp-maven-plugin + +false + +
[commons-weaver] 01/03: diamond
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit ba7c4b250028e72446d7dc27dad92f85ffe7cba3
Author: Matt Benson
AuthorDate: Thu Aug 2 19:23:16 2018 -0500
diamond
---
.../main/java/org/apache/commons/weaver/model/WeavableConstructor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java
b/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java
index 1a75c7b..2f78da2 100644
---
a/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java
+++
b/processor/src/main/java/org/apache/commons/weaver/model/WeavableConstructor.java
@@ -50,6 +50,6 @@ public class WeavableConstructor extends
*/
@Override
protected WeavableConstructorParameter createParameter(final int index)
{
-return new WeavableConstructorParameter(Integer.valueOf(index),
this);
+return new WeavableConstructorParameter<>(Integer.valueOf(index),
this);
}
}
[commons-weaver] 03/03: code simplifications made possible with Java 8; additional null-safe method override
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 74d1f65274f5c47e4b7ff554df5ad23bcd9a5992
Author: Matt Benson
AuthorDate: Thu Aug 2 19:24:53 2018 -0500
code simplifications made possible with Java 8; additional null-safe method
override
---
.../commons/weaver/model/WeavablePackage.java | 26 +-
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
b/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
index e789a5f..fe324f4 100644
---
a/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
+++
b/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
@@ -27,7 +27,8 @@ import java.util.concurrent.ConcurrentSkipListMap;
* {@link Weavable} {@link Package}.
*/
public class WeavablePackage extends Weavable {
-private static final Comparator CMP =
Comparator.nullsFirst(Comparator.comparing(WeavablePackage::getTarget,
Comparator.nullsFirst(Comparator.comparing(Package::getName;
+private static final Comparator CMP =
Comparator.nullsFirst(Comparator
+.comparing(WeavablePackage::getTarget,
Comparator.nullsFirst(Comparator.comparing(Package::getName;
private final ConcurrentNavigableMap> clazzes =
new ConcurrentSkipListMap<>();
@@ -45,17 +46,9 @@ public class WeavablePackage extends
Weavable {
* @param generic type of {@code cls}
* @return {@link WeavableClass}
*/
+@SuppressWarnings("unchecked")
public synchronized WeavableClass getWeavable(final Class cls) {
-final String key = cls.getName();
-if (clazzes.containsKey(key)) {
-@SuppressWarnings("unchecked")
-final WeavableClass result = (WeavableClass)
clazzes.get(key);
-return result;
-}
-final WeavableClass result = new WeavableClass<>(cls, this);
-@SuppressWarnings("unchecked")
-final WeavableClass faster = (WeavableClass)
clazzes.putIfAbsent(key, result);
-return faster == null ? result : faster;
+return (WeavableClass) clazzes.computeIfAbsent(cls.getName(), k ->
new WeavableClass<>(cls, this));
}
/**
@@ -75,4 +68,15 @@ public class WeavablePackage extends
Weavable {
public int compareTo(final WeavablePackage arg0) {
return CMP.compare(this, arg0);
}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public String toString() {
+if (getTarget() == null) {
+return "Weavable default package";
+}
+return super.toString();
+}
}
[commons-weaver] branch master updated (9a35449 -> 74d1f65)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from 9a35449 updates in preparation of a 1.4 release new ba7c4b2 diamond new 3adac28 code simplifications made possible with Java 8 new 74d1f65 code simplifications made possible with Java 8; additional null-safe method override The 3 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: .../apache/commons/weaver/model/WeavableClass.java | 27 ++ .../commons/weaver/model/WeavableConstructor.java | 2 +- .../commons/weaver/model/WeavablePackage.java | 26 - 3 files changed, 23 insertions(+), 32 deletions(-)
[commons-weaver] 02/03: code simplifications made possible with Java 8
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 3adac28baaca2d7153a0aa83e36fd06c9ec0d2ab
Author: Matt Benson
AuthorDate: Thu Aug 2 19:24:17 2018 -0500
code simplifications made possible with Java 8
---
.../apache/commons/weaver/model/WeavableClass.java | 27 ++
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java
b/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java
index 9d78a7a..308b23d 100644
--- a/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java
+++ b/processor/src/main/java/org/apache/commons/weaver/model/WeavableClass.java
@@ -22,6 +22,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Collections;
+import java.util.Comparator;
import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
@@ -33,6 +34,8 @@ import org.apache.commons.weaver.utils.Args;
* @param type
*/
public class WeavableClass extends NestedWeavable,
Class, WeavablePackage, Package> {
+private static final Comparator> CLASS_COMPARATOR =
Comparator.comparing(Class::getName);
+
private final ConcurrentNavigableMap> fields =
new ConcurrentSkipListMap<>();
private final ConcurrentNavigableMap,
WeavableConstructor> ctors = new ConcurrentSkipListMap<>(
@@ -59,13 +62,7 @@ public class WeavableClass extends
NestedWeavable, Class,
* @return {@link WeavableField}
*/
public WeavableField getWeavable(final Field fld) {
-final String key = fld.getName();
-if (fields.containsKey(key)) {
-return fields.get(key);
-}
-final WeavableField result = new WeavableField<>(fld, this);
-final WeavableField faster = fields.putIfAbsent(key, result);
-return faster == null ? result : faster;
+return fields.computeIfAbsent(fld.getName(), k -> new
WeavableField<>(fld, this));
}
/**
@@ -74,12 +71,7 @@ public class WeavableClass extends
NestedWeavable, Class,
* @return {@link WeavableMethod}
*/
public WeavableMethod getWeavable(final Method methd) {
-if (methods.containsKey(methd)) {
-return methods.get(methd);
-}
-final WeavableMethod result = new WeavableMethod<>(methd, this);
-final WeavableMethod faster = methods.putIfAbsent(methd, result);
-return faster == null ? result : faster;
+return methods.computeIfAbsent(methd, k -> new WeavableMethod<>(methd,
this));
}
/**
@@ -88,12 +80,7 @@ public class WeavableClass extends
NestedWeavable, Class,
* @return {@link WeavableConstructor}
*/
public WeavableConstructor getWeavable(final Constructor ctor) {
-if (ctors.containsKey(ctor)) {
-return ctors.get(ctor);
-}
-final WeavableConstructor result = new WeavableConstructor<>(ctor,
this);
-final WeavableConstructor faster = ctors.putIfAbsent(ctor, result);
-return faster == null ? result : faster;
+return ctors.computeIfAbsent(ctor, k -> new
WeavableConstructor<>(ctor, this));
}
/**
@@ -125,6 +112,6 @@ public class WeavableClass extends
NestedWeavable, Class,
*/
@Override
protected int localCompareTo(final WeavableClass obj) {
-return getTarget().getName().compareTo(obj.getTarget().getName());
+return obj == null ? 1 : CLASS_COMPARATOR.compare(getTarget(),
obj.getTarget());
}
}
[commons-weaver] branch master updated: updates in preparation of a 1.4 release
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 9a35449 updates in preparation of a 1.4 release
9a35449 is described below
commit 9a3544935cfeb4a6fb16dc3b95b4e30299beefd2
Author: Matt Benson
AuthorDate: Thu Aug 2 18:56:58 2018 -0500
updates in preparation of a 1.4 release
---
RELEASE-NOTES.txt | 21 +
pom.xml | 2 +-
src/changes/changes.xml | 12 +++-
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 98402ad..7121847 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,25 +1,30 @@
- Apache Commons Weaver 1.3
+ Apache Commons Weaver 1.4
RELEASE NOTES
-The Apache Commons team is pleased to announce the release of Apache Commons
Weaver 1.3
+The Apache Commons team is pleased to announce the release of Apache Commons
Weaver 1.4
Apache Commons Weaver provides an easy way to enhance compiled Java
classes by generating ("weaving") bytecode into those classes.
-Requires Java 6 or greater.
+Requires Java 8 or greater.
Changes in this version include:
New features:
-o WEAVER-12: Provide a mechanism for working with all classfiles found in
the weave environment
+o WEAVER-19: Upgrade to Java 8.
+o WEAVER-24: Blueprint method references.
Fixed Bugs:
-o WEAVER-11: bytecode generated with java 7 or 8 is different and can break
on earlier versions
-o WEAVER-15: m2e build encounters missing class
+o WEAVER-16: NullPointerException when weaving class with no package.
+o WEAVER-17: Maven plugin was packaged without its (generated) HelpMojo
class.
+o WEAVER-23: Privilizer Weaver computes Object for all variable types in
catch context.
Changes:
-o WEAVER-13: Make Ant tasks' system classpath inclusion optional
-o WEAVER-14: upgrade modules to asm 5.1
+o WEAVER-20: Remove commons-io, commons-collections dependencies.
+o WEAVER-21: Upgrade xbean-finder to v4.9.
+o WEAVER-22: Upgrade modules to ASM 6.2.
+o WEAVER-25: Reject blueprint methods that access entities that would be
inaccessible.
+o WEAVER-26: Upgrade to commons-parent v47.
Historical list of changes:
http://commons.apache.org/proper/commons-weaver/changes-report.html
diff --git a/pom.xml b/pom.xml
index 2fc5d9a..0564f26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@ under the License.
weaver
org.apache.commons.weaver
-1.3
+1.4
commons-weaver-${commons.release.version}
RC2
WEAVER
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3869af1..e5f1a8a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,14 +24,16 @@
- Upgrade to Java 8.
+ NullPointerException when weaving
class with no package.
+ Maven plugin was packaged without
its (generated) HelpMojo class.
+ Upgrade to Java 8.
Remove commons-io,
commons-collections dependencies.
- Upgrade xbean-finder to
v4.8.
- Upgrade modules to ASM
6.1.
+ Upgrade xbean-finder to
v4.9.
+ Upgrade modules to ASM
6.2.
Privilizer Weaver computes Object
for all variable types in catch context.
- Blueprint method
references.
+ Blueprint method
references.
Reject blueprint methods that
access entities that would be inaccessible.
- Upgrade to commons-parent
v46.
+ Upgrade to commons-parent
v47.
bytecode generated with java 7 or 8
is different and can break on earlier versions
[commons-weaver] branch master updated: WEAVER-17 make help mojo work by upgrading maven-plugin version to 3.5.2
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 1cddfd8 WEAVER-17 make help mojo work by upgrading maven-plugin version to 3.5.2 1cddfd8 is described below commit 1cddfd8a91464fb180ba8e207c21e359ee2ddb10 Author: Matt Benson AuthorDate: Thu Aug 2 18:32:21 2018 -0500 WEAVER-17 make help mojo work by upgrading maven-plugin version to 3.5.2 --- maven-plugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 07b80f1..558e851 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -35,7 +35,7 @@ under the License. UTF-8 3.1.0 -3.5.1 +3.5.2 1.1.0
[commons-weaver] branch master updated: WEAVER-16 handle classes with no package
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
The following commit(s) were added to refs/heads/master by this push:
new 2602313 WEAVER-16 handle classes with no package
2602313 is described below
commit 26023136195cff65a6629c45756ea8332b50cc0a
Author: Matt Benson
AuthorDate: Thu Aug 2 18:11:19 2018 -0500
WEAVER-16 handle classes with no package
---
.../src/main/java/org/apache/commons/weaver/model/ScanResult.java| 5 -
.../main/java/org/apache/commons/weaver/model/WeavablePackage.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java
b/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java
index 7f3ce0e..71bcf10 100644
--- a/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java
+++ b/processor/src/main/java/org/apache/commons/weaver/model/ScanResult.java
@@ -26,6 +26,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.Optional;
import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
@@ -181,7 +182,9 @@ public class ScanResult {
* @return {@link WeavablePackage}
*/
public WeavablePackage getWeavable(final Package pkg) {
-final String key = pkg.getName();
+final String key =
+Optional.ofNullable(pkg).map(Package::getName).orElse("");
+
if (packages.containsKey(key)) {
return packages.get(key);
}
diff --git
a/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
b/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
index e1a5c9a..e789a5f 100644
---
a/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
+++
b/processor/src/main/java/org/apache/commons/weaver/model/WeavablePackage.java
@@ -19,6 +19,7 @@
package org.apache.commons.weaver.model;
import java.util.Collections;
+import java.util.Comparator;
import java.util.concurrent.ConcurrentNavigableMap;
import java.util.concurrent.ConcurrentSkipListMap;
@@ -26,6 +27,7 @@ import java.util.concurrent.ConcurrentSkipListMap;
* {@link Weavable} {@link Package}.
*/
public class WeavablePackage extends Weavable {
+private static final Comparator CMP =
Comparator.nullsFirst(Comparator.comparing(WeavablePackage::getTarget,
Comparator.nullsFirst(Comparator.comparing(Package::getName;
private final ConcurrentNavigableMap> clazzes =
new ConcurrentSkipListMap<>();
@@ -71,6 +73,6 @@ public class WeavablePackage extends
Weavable {
*/
@Override
public int compareTo(final WeavablePackage arg0) {
-return getTarget().getName().compareTo(arg0.getTarget().getName());
+return CMP.compare(this, arg0);
}
}
[commons-weaver] branch master updated: upgrade parent
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 8532217 upgrade parent 8532217 is described below commit 8532217b1914d5bbee75eda0a13763ace8550cc7 Author: Matt Benson AuthorDate: Thu Aug 2 12:12:16 2018 -0500 upgrade parent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf92b95..2fc5d9a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-parent -46 +47 commons-weaver-base
[commons-weaver] branch master updated: remove modules' scm config sections
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 866d131 remove modules' scm config sections 866d131 is described below commit 866d131e442d5379f742d8fa89c8edb3405399b1 Author: Matt Benson AuthorDate: Thu Aug 2 11:54:45 2018 -0500 remove modules' scm config sections --- ant/pom.xml | 6 -- build-tools/pom.xml | 6 -- dist/pom.xml | 6 -- maven-plugin/pom.xml | 6 -- modules/normalizer/pom.xml| 6 -- modules/pom.xml | 6 -- modules/privilizer/api/pom.xml| 6 -- modules/privilizer/pom.xml| 6 -- modules/privilizer/weaver/pom.xml | 5 - parent/pom.xml| 6 -- processor/pom.xml | 6 -- 11 files changed, 65 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 4ad1b24..9c4f5ad 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -35,12 +35,6 @@ under the License. - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/ant - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/ant -http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ant - - org.apache.commons diff --git a/build-tools/pom.xml b/build-tools/pom.xml index d27a395..f856c89 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -28,12 +28,6 @@ under the License. Apache Commons Weaver Build Tools Provide common setup, from http://maven.apache.org/plugins/maven-checkstyle-plugin/examples/multi-module-config.html - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/build-tools - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/build-tools - http://svn.apache.org/viewvc/commons/proper/weaver/trunk/build-tools - - diff --git a/dist/pom.xml b/dist/pom.xml index 2927d97..91bc53a 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -33,12 +33,6 @@ under the License. Creates the Apache Commons Weaver multimodule distribution. - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/dist - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/dist -http://svn.apache.org/viewvc/commons/proper/weaver/trunk/dist - - org.apache.commons diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index d7ebb30..07b80f1 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -39,12 +39,6 @@ under the License. 1.1.0 - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/maven-plugin - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/maven-plugin - http://svn.apache.org/viewvc/commons/proper/weaver/trunk/maven-plugin - - org.apache.commons diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index 9898571..9d5378e 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -36,12 +36,6 @@ under the License. collective footprint on your archive and more importantly on your JVM. - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/normalizer - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/normalizer - http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer - - org.apache.commons diff --git a/modules/pom.xml b/modules/pom.xml index d3c87e8..127682d 100644 --- a/modules/pom.xml +++ b/modules/pom.xml @@ -32,12 +32,6 @@ under the License. Apache Commons Weaver Modules aggregator project Hosts weaver modules. - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules -http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules - - privilizer normalizer diff --git a/modules/privilizer/api/pom.xml b/modules/privilizer/api/pom.xml index 14d8c1d..b694280 100644 --- a/modules/privilizer/api/pom.xml +++ b/modules/privilizer/api/pom.xml @@ -28,12 +28,6 @@ under the License. commons-weaver-privilizer-api Apache Commons Weaver Privilizer API - - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/privilizer/api - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/privilizer/api - http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/api - - diff --git a/modules/privilizer/pom.xml b/modules/privilizer/pom.xml index 97fddcc..af7aedc 100644 --- a/modules/privilizer/pom.xml +++ b/modules/privilizer/pom.xml @@ -35,12 +35,6 @@ under the License. Privilizer provides
[commons-weaver] branch master updated: upgrade xbean-finder to 4.9
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new d5a70a4 upgrade xbean-finder to 4.9 d5a70a4 is described below commit d5a70a43bc22286f94eb9a92e0a1b8b27aa46fd3 Author: Matt Benson AuthorDate: Wed Aug 1 14:13:36 2018 -0500 upgrade xbean-finder to 4.9 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 235b718..ea3627a 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -152,7 +152,7 @@ under the License. org.apache.xbean xbean-finder-shaded -4.8 +4.9 org.apache.commons
[commons-weaver] 03/03: move japicmp exclusions to pluginManagement (apply same config to mojo, report); alignment
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit d0bf4bdaf1f4644e091dcd11236b439395f1d06a Author: Matt Benson AuthorDate: Mon Jun 18 17:03:17 2018 -0500 move japicmp exclusions to pluginManagement (apply same config to mojo, report); alignment --- modules/normalizer/pom.xml| 30 ++ modules/privilizer/weaver/pom.xml | 122 -- 2 files changed, 80 insertions(+), 72 deletions(-) diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index ffeb875..9898571 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -78,6 +78,23 @@ under the License. + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + +org.apache.commons.weaver.normalizer._asm +org.apache.commons.weaver.normalizer._io +org.apache.commons.weaver.normalizer._lang3 + + + + + + @@ -146,19 +163,6 @@ under the License. - - com.github.siom79.japicmp - japicmp-maven-plugin - - - - org.apache.commons.weaver.normalizer._asm - org.apache.commons.weaver.normalizer._io - org.apache.commons.weaver.normalizer._lang3 - - - - org.apache.maven.plugins maven-antrun-plugin diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index c2b0d97..54178f0 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -73,6 +73,23 @@ under the License. + + + + com.github.siom79.japicmp + japicmp-maven-plugin + + + +org.apache.commons.weaver.privilizer._asm +org.apache.commons.weaver.privilizer._io +org.apache.commons.weaver.privilizer._lang3 + + + + + + maven-invoker-plugin @@ -128,65 +145,52 @@ under the License. - - org.apache.maven.plugins - maven-shade-plugin - - - shade - - shade - - - true - true - - - org.apache.commons:commons-lang3 - org.ow2.asm:* - - - - - org.apache.commons.lang3. - org.apache.commons.weaver.privilizer._lang3. - - - org.objectweb.asm. - org.apache.commons.weaver.privilizer._asm. - - - - - org.apache.commons:commons-lang3 - - META-INF/** - - - - org.ow2.asm:* - - META-INF/** - - - - - - - - - com.github.siom79.japicmp - japicmp-maven-plugin - - - - org.apache.commons.weaver.privilizer._asm - org.apache.commons.weaver.privilizer._io - org.apache.commons.weaver.privilizer._lang3 - - - - + +org.apache.maven.plugins +maven-shade-plugin + + +shade + + shade + + + true + true + + + org.apache.commons:commons-lang3 + org.ow2.asm:* + + + + + org.apache.commons.lang3. + org.apache.commons.weaver.privilizer._lang3. + + + org.objectweb.asm. + org.apache.commons.weaver.privilizer._asm. + + + + + org.apache.commons:commons-lang3 + +META-INF/** + + + + org.ow2.asm:* + +META-INF/** + + + + + + +
[commons-weaver] branch master updated (fb1c27d -> d0bf4bd)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from fb1c27d Merge remote-tracking branch 'origin/master' new 4077c37 roll back japicmp version due to #210 new 753f164 disable japicmp for build-tools module new d0bf4bd move japicmp exclusions to pluginManagement (apply same config to mojo, report); alignment The 3 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: build-tools/pom.xml | 11 modules/normalizer/pom.xml| 30 ++ modules/privilizer/weaver/pom.xml | 122 -- pom.xml | 2 +- 4 files changed, 92 insertions(+), 73 deletions(-)
[commons-weaver] 02/03: disable japicmp for build-tools module
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 753f16476f727bec639f289d083d5dc0b9fdb326 Author: Matt Benson AuthorDate: Mon Jun 18 16:55:01 2018 -0500 disable japicmp for build-tools module --- build-tools/pom.xml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/build-tools/pom.xml b/build-tools/pom.xml index aadf121..d27a395 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -35,6 +35,17 @@ under the License. + + + + com.github.siom79.japicmp + japicmp-maven-plugin + +true + + + + maven-source-plugin
[commons-weaver] 01/03: roll back japicmp version due to #210
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 4077c37589090b69a364ab720cb0fd14dda61ac4
Author: Matt Benson
AuthorDate: Mon Jun 18 16:49:20 2018 -0500
roll back japicmp version due to #210
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9c9f016..cf92b95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
commons-weaver
https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}
-0.12.0
+0.11.1
[commons-weaver] 02/04: omit shaded classes from API compatibility reporting
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit cb2eb7c2caafa4807531d4c4bbc4c6f070611ee4 Author: Matt Benson AuthorDate: Sun Jun 17 11:49:31 2018 -0500 omit shaded classes from API compatibility reporting --- modules/normalizer/pom.xml| 13 + modules/privilizer/weaver/pom.xml | 13 + 2 files changed, 26 insertions(+) diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index d6d408a..d2f60c8 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -151,6 +151,19 @@ under the License. + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + org.apache.commons.weaver.normalizer._asm + org.apache.commons.weaver.normalizer._io + org.apache.commons.weaver.normalizer._lang3 + + + + org.apache.maven.plugins maven-antrun-plugin diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index b8e9301..c2b0d97 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -174,6 +174,19 @@ under the License. + + com.github.siom79.japicmp + japicmp-maven-plugin + + + + org.apache.commons.weaver.privilizer._asm + org.apache.commons.weaver.privilizer._io + org.apache.commons.weaver.privilizer._lang3 + + + + -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 01/04: bump japicmp version to latest
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit efd3694823475189fbcb12518d71374cb4fc1560
Author: Matt Benson
AuthorDate: Sun Jun 17 11:48:58 2018 -0500
bump japicmp version to latest
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cf92b95..9c9f016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
commons-weaver
https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}
-0.11.1
+0.12.0
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 04/04: Merge remote-tracking branch 'origin/master'
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit fb1c27de7a1c0ddf3fdde335c69a47c33fd2e1a5 Merge: 1f19f70 fc323c8 Author: Matt Benson AuthorDate: Sun Jun 17 11:53:51 2018 -0500 Merge remote-tracking branch 'origin/master' .gitignore | 17 + 1 file changed, 17 insertions(+) -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated (fc323c8 -> fb1c27d)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from fc323c8 adding proper gitignore new efd3694 bump japicmp version to latest new cb2eb7c omit shaded classes from API compatibility reporting new 1f19f70 remove shading instructions for commons-io, which is no longer a dependency new fb1c27d Merge remote-tracking branch 'origin/master' The 4 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: modules/normalizer/pom.xml| 18 +- modules/privilizer/weaver/pom.xml | 13 + pom.xml | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 03/04: remove shading instructions for commons-io, which is no longer a dependency
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 1f19f702d2f6bc708d479e9472970f53c39efc01 Author: Matt Benson AuthorDate: Sun Jun 17 11:53:31 2018 -0500 remove shading instructions for commons-io, which is no longer a dependency --- modules/normalizer/pom.xml | 5 - 1 file changed, 5 deletions(-) diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml index d2f60c8..ffeb875 100644 --- a/modules/normalizer/pom.xml +++ b/modules/normalizer/pom.xml @@ -109,7 +109,6 @@ under the License. org.apache.commons:commons-lang3 - commons-io:commons-io org.ow2.asm:* @@ -119,10 +118,6 @@ under the License. org.apache.commons.weaver.normalizer._lang3. - org.apache.commons.io. - org.apache.commons.weaver.normalizer._io. - - org.objectweb.asm. org.apache.commons.weaver.normalizer._asm. -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated (bf128d3 -> 225d87a)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from bf128d3 cleanup warnings; add utility method new 9465921 upgrade doxia-module-markdown new 225d87a upgrade to ASM 6.2 The 2 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: LICENSE-asm6.1.txt => LICENSE-asm6.2.txt | 0 pom.xml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename LICENSE-asm6.1.txt => LICENSE-asm6.2.txt (100%) -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 02/02: upgrade to ASM 6.2
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 225d87ae3b4de3552890cd119d74cf5fd0a37c3f Author: Matt Benson AuthorDate: Tue May 29 11:46:21 2018 -0500 upgrade to ASM 6.2 --- LICENSE-asm6.1.txt => LICENSE-asm6.2.txt | 0 pom.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE-asm6.1.txt b/LICENSE-asm6.2.txt similarity index 100% rename from LICENSE-asm6.1.txt rename to LICENSE-asm6.2.txt diff --git a/pom.xml b/pom.xml index 9fe4eae..cf92b95 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 1.8 1.9.4 -6.1 +6.2 -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 01/02: upgrade doxia-module-markdown
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 946592117891bca3d3bce620dd0e847262b97d13 Author: Matt Benson AuthorDate: Tue May 29 11:42:35 2018 -0500 upgrade doxia-module-markdown --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0725e66..9fe4eae 100644 --- a/pom.xml +++ b/pom.xml @@ -293,7 +293,7 @@ under the License. org.apache.maven.doxia doxia-module-markdown -1.6 +1.8 -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated (12bbfdd -> bf128d3)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from 12bbfdd merge duplicate plugin declaration new 198c4f7 Javadoc cleanup new bf128d3 cleanup warnings; add utility method The 2 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: .../apache/commons/weaver/ant/WeaverSettings.java | 4 +-- .../commons/weaver/normalizer/Normalizer.java | 19 --- .../commons/weaver/privilizer/ActionGenerator.java | 4 +-- .../weaver/privilizer/BlueprintingVisitor.java | 2 +- .../commons/weaver/privilizer/Privilizer.java | 35 +++- .../weaver/privilizer/PrivilizerCleaner.java | 2 +- .../weaver/privilizer/PrivilizingVisitor.java | 2 +- .../commons/weaver/model/WeaveEnvironment.java | 38 ++ 8 files changed, 56 insertions(+), 50 deletions(-) -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 01/02: Javadoc cleanup
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 198c4f722d374b94fb9c34bf6a3951b9ac09e94d
Author: Matt Benson <mben...@apache.org>
AuthorDate: Thu May 17 10:43:18 2018 -0500
Javadoc cleanup
---
ant/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/ant/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
b/ant/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
index 0686e2f..4f29896 100644
--- a/ant/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
+++ b/ant/src/main/java/org/apache/commons/weaver/ant/WeaverSettings.java
@@ -110,7 +110,7 @@ public class WeaverSettings extends DataType {
/**
* Return the effective classpath as a {@link List} of {@link String}
* filesystem paths. If {@link #includeSystemClasspath}, system classpath
will be appended.
- * @return List
+ * @return {@link List} of {@link String}
*/
public List getClasspathEntries() {
final Path path = new Path(getProject());
@@ -201,7 +201,7 @@ public class WeaverSettings extends DataType {
/**
* Merge nested {@code propertyset} and {@code properties}; latter takes
precedence.
- * @return Properties
+ * @return {@link Properties}
*/
public Properties getProperties() {
if (isReference()) {
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 02/02: cleanup warnings; add utility method
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit bf128d3e93feb5765905ba2e69cd354721a9e7e3
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri May 18 12:00:38 2018 -0500
cleanup warnings; add utility method
---
.../commons/weaver/normalizer/Normalizer.java | 19 ---
.../commons/weaver/privilizer/ActionGenerator.java | 4 +--
.../weaver/privilizer/BlueprintingVisitor.java | 2 +-
.../commons/weaver/privilizer/Privilizer.java | 35 +++-
.../weaver/privilizer/PrivilizerCleaner.java | 2 +-
.../weaver/privilizer/PrivilizingVisitor.java | 2 +-
.../commons/weaver/model/WeaveEnvironment.java | 38 ++
7 files changed, 54 insertions(+), 48 deletions(-)
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index b40b225..1894dba 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -220,7 +220,7 @@ public class Normalizer {
}
}
-private static final class CustomClassWriter extends ClassWriter {
+private final class CustomClassWriter extends ClassWriter {
CustomClassWriter(final int flags) {
super(flags);
}
@@ -231,7 +231,7 @@ public class Normalizer {
@Override
protected String getCommonSuperClass(final String type1, final String
type2) {
-return "java/lang/Object";
+return env.getCommonSuperClass(type1, type2);
}
}
@@ -264,7 +264,7 @@ public class Normalizer {
try (OutputStream outputStream = classfile.getOutputStream()) {
outputStream.write(bytecode);
} catch (final IOException e) {
-throw new RuntimeException(e);
+throw new IllegalStateException(e);
}
}
}
@@ -333,7 +333,7 @@ public class Normalizer {
} catch (final RuntimeException e) {
throw e;
} catch (final Exception e) {
-throw new RuntimeException(e);
+throw new IllegalStateException(e);
}
}
return result;
@@ -358,10 +358,8 @@ public class Normalizer {
* @param key {@link String} {@link Pair} indicating supertype and
constructor signature
* @param toMerge matching classes
* @throws IOException on I/O error
- * @throws ClassNotFoundException if class not found
*/
-private void rewrite(final Pair<String, String> key, final
Set toMerge) throws IOException,
-ClassNotFoundException {
+private void rewrite(final Pair<String, String> key, final
Set toMerge) throws IOException {
final String target = copy(key, toMerge.iterator().next());
env.info("Merging %s identical %s implementations with constructor %s
to type %s", toMerge.size(),
key.getLeft(), key.getRight(), target);
@@ -478,16 +476,14 @@ public class Normalizer {
* @param classWrapper
* @return the generated classname.
* @throws IOException
- * @throws ClassNotFoundException
*/
-private String copy(final Pair<String, String> key, final ClassWrapper
classWrapper) throws IOException,
-ClassNotFoundException {
+private String copy(final Pair<String, String> key, final ClassWrapper
classWrapper) throws IOException {
env.debug("Copying %s to %s", key, targetPackage);
final MessageDigest md5;
try {
md5 = MessageDigest.getInstance("MD5");
} catch (final NoSuchAlgorithmException e) {
-throw new RuntimeException(e);
+throw new IllegalStateException(e);
}
md5.update(key.getLeft().getBytes(StandardCharsets.UTF_8));
md5.update(key.getRight().getBytes(StandardCharsets.UTF_8));
@@ -500,7 +496,6 @@ public class Normalizer {
try (InputStream bytecode =
env.getClassfile(classWrapper.wrapped).getInputStream()) {
final ClassReader reader = new ClassReader(bytecode);
-
final ClassVisitor writeClass = new WriteClass();
// we're doing most of this by hand; we only read the original
class to hijack signature, ctor exceptions,
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
index 9f880a8..34eb130 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
++
[commons-weaver] 01/02: ws
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 954f4bf531d7eab2224a9a2fe4ba525b27ad11db
Author: Matt Benson <mben...@apache.org>
AuthorDate: Thu May 10 17:47:33 2018 -0500
ws
---
.../java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
index e6c6226..ac3b1ce 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
@@ -301,7 +301,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
final Pair<Type, Method> methodKey;
final Type owner;
-NestedMethodInvocationHandler(final MethodVisitor mvr, final
Pair<Type,Method> methodKey) {
+NestedMethodInvocationHandler(final MethodVisitor mvr, final
Pair<Type, Method> methodKey) {
super(mvr);
this.methodKey = methodKey;
this.owner = methodKey.getLeft();
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] branch master updated (3809773 -> 12bbfdd)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. from 3809773 Java 8 only for travis new 954f4bf ws new 12bbfdd merge duplicate plugin declaration The 2 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: build-tools/pom.xml| 14 +- .../commons/weaver/privilizer/BlueprintingVisitor.java | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 02/02: merge duplicate plugin declaration
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 12bbfdd0ac4428b7fd2b1227c73fc8af657cf79c Author: Matt Benson <mben...@apache.org> AuthorDate: Wed May 16 14:06:02 2018 -0500 merge duplicate plugin declaration --- build-tools/pom.xml | 14 +- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/build-tools/pom.xml b/build-tools/pom.xml index a0d142b..aadf121 100644 --- a/build-tools/pom.xml +++ b/build-tools/pom.xml @@ -55,6 +55,11 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin + + +**/* + + create-javadoc-jar @@ -62,15 +67,6 @@ under the License. - -org.apache.maven.plugins -maven-javadoc-plugin - - -**/* - - - -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated: Java 8 only for travis
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 3809773 Java 8 only for travis 3809773 is described below commit 3809773161cb9acd6128ca4b18c2fd97d95186ee Author: Matt Benson <mben...@apache.org> AuthorDate: Thu May 10 17:33:01 2018 -0500 Java 8 only for travis --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ded5c5b..f9c7d17 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,7 @@ language: java sudo: false jdk: - - openjdk6 - - openjdk7 + - openjdk8 - oraclejdk8 after_success: -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated: changes
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 0b64d12 changes 0b64d12 is described below commit 0b64d12446e9eb84a144be6547fa8e0bbdcadc20 Author: Matt Benson <mben...@apache.org> AuthorDate: Thu May 10 16:51:28 2018 -0500 changes --- src/changes/changes.xml | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index e9c0297..3869af1 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -23,8 +23,15 @@ Matt Benson - - Update Apache Commons IO from 2.5 to 2.6. + + Upgrade to Java 8. + Remove commons-io, commons-collections dependencies. + Upgrade xbean-finder to v4.8. + Upgrade modules to ASM 6.1. + Privilizer Weaver computes Object for all variable types in catch context. + Blueprint method references. + Reject blueprint methods that access entities that would be inaccessible. + Upgrade to commons-parent v46. bytecode generated with java 7 or 8 is different and can break on earlier versions -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated: upgrade to latest commons-parent
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new b8be2ba upgrade to latest commons-parent b8be2ba is described below commit b8be2baeaf10e54036b36a0d9ff6940a565192d5 Author: Matt Benson <mben...@apache.org> AuthorDate: Thu May 10 15:58:18 2018 -0500 upgrade to latest commons-parent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da565f5..0725e66 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.commons commons-parent -43 +46 commons-weaver-base -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch trunk deleted (was 9329b14)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. was 9329b14 Update commons-parent from 42 to 43. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated (d6f0dcb -> c30ed1b)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. discard d6f0dcb update scm discard cc3e5c7 upgrade to ASM API v6 omit 6569dd1 blueprint method references; reject blueprint methods that access inaccessible classes/methods/ctors (other than other methods also being imported omit 232f479 clone from ClassWriter#getCommonSuperClass omit b3b4583 upgrade modules to ASM 6.1 omit 1c6c4e3 small cleanups omit c419b33 small cleanups omit 9fea2ca upgrade xbean-finder omit 08ac94d upgrade japicmp omit 3dd506f remove shading for obsolete deps omit 11f857a upgrade commons-lang3 omit ad16043 centralize ASM versions omit 5f50c12 remove obsolete dependencies omit 901ba1a Java 8; assorted minor refactorings omit 9329b14 Update commons-parent from 42 to 43. omit ff299cf [WEAVER-18] Update Apache Commons IO from 2.5 to 2.6 omit 712ac86 Update from Apache Commons IO 2.5 to 2.6. omit 6c1c61f README.md: add maven central badge omit 9f44a37 README.md: remove broken maven central badge omit 62a7991 add README.md and CONTRIBUTING.md omit 5453785 .travis.yml: remove oraclejdk7 (no longer available) and add openjdk6 omit fa60e75 (chore) adding commons.module.name to pom omit 920388a Add oraclejdk7 to Travis CI. omit 85ef88d Fix apidocs link for Normalizer omit 83e70e4 Add starter TravisCI configuration. Will pick up Travis profile from new parent module when released. omit 998fa25 update checkout directory on source-repository report to simple component name omit c89242a correct 1.3 release date omit 50e3d8f update download page omit 36981f6 [maven-release-plugin] prepare for next development iteration omit 4a78b83 [maven-release-plugin] prepare release 1.3_RC2 omit b23d9ba generate release notes using -Dchanges.version omit 4957170 RC2 omit 926d2f0 [maven-release-plugin] rollback the release of 1.3_RC1 omit a0af234 [maven-release-plugin] prepare for next development iteration omit e7cb2ee [maven-release-plugin] prepare release 1.3_RC1 omit bd97e5a license omit 6a3cdce centralize and update rat settings; document justification for exclusions omit 63cc539 [maven-release-plugin] rollback the release of 1.3_RC1 omit b3c7f26 [maven-release-plugin] prepare for next development iteration omit df570a2 [maven-release-plugin] prepare release 1.3_RC1 omit 65133e4 japicmp: report only filename omit 7ec9eff [maven-release-plugin] rollback the release of 1.3_RC1 omit 02aa496 [maven-release-plugin] prepare for next development iteration omit 8a10921 [maven-release-plugin] prepare release 1.3_RC1 omit 40d760e override unnecessary gpg passphrase setup omit df89968 [maven-release-plugin] rollback the release of 1.3_RC1 omit 41e5bc9 [maven-release-plugin] prepare for next development iteration omit bfa6a52 [maven-release-plugin] prepare release 1.3_RC1 omit 1edc92e fail the build if any expected notices were missing; specifically this will guard against upgrading the ASM version without upgrading the corresponding license file to be bundled omit 15d70aa update bundled license to current ASM version omit 85da6e5 1.3 release notes omit 38ec3a2 use japicmp instead of clirr omit beef03d upgrade to latest commons-parent release and set up for 1.3 RC1 omit 558d994 code quality omit b54590f mvn install caveat no longer true with current project structure omit 09aa9b0 whitespace omit 85f49ec use aether APIs rather than Maven implementation for dependency gathering omit c20bf40 ignore omit ebd140c [WEAVER-15] Ensure that all dependency artifacts are available to commons-weaver mojos regardless of project build status omit 8d9b564 [WEAVER-15] depend on commons-io explicitly omit 8271dc2 remove empty directories omit 5f8651e remove obsolete Javadoc comment on private inner class omit cea745b remove obsolete Javadoc comment on private inner class omit fbe713c [WEAVER-11] use java.lang.Object for asm common superclass to avoid issues of unavailable classes in inheritance hierarchy due to compilation target different than compilation JVM omit f613223 [WEAVER-14] upgrade modules to asm 5.1 omit 5eb631b [WEAVER-13] weaversettings@includesystemclasspath omit fbd5506 revert omit b88c49d [WEAVER-13] weaversettings@includesystemclasspath omit 8aec337 [WEAVER-13] documentation omit ef96892 [WEAVER-13] weaversettings@includesystemclasspath omit fd97a21 consolidate duplicate code omit 707def5 move shading to basic profile omit 0f76141 [WEAVER-12] Provide a mechanism for working with all classfiles found in the weave environment omit ca28612 correct 1.2 release date
[commons-weaver] branch master updated (141e820 -> d6f0dcb)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. omit 141e820 update scm omit 52c0f98 upgrade to ASM API v6 new cc3e5c7 upgrade to ASM API v6 new d6f0dcb update scm This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (141e820) \ N -- N -- N refs/heads/master (d6f0dcb) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 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: -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 02/02: update scm
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit d6f0dcb09773e0b1c1445606882dd25cafe22234 Author: Matt Benson <mben...@apache.org> AuthorDate: Mon Apr 30 20:07:26 2018 -0500 update scm --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a7bc55d..da565f5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,9 +90,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/ - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/ -http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ + scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git + scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git +http://gitbox.apache.org/repos/asf/commons-weaver.git -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 01/02: upgrade to ASM API v6
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit cc3e5c787a3df58bdef6bd9a1093dd0083a43cb9
Author: Matt Benson <mben...@apache.org>
AuthorDate: Thu Apr 26 11:21:24 2018 -0500
upgrade to ASM API v6
---
.../src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java | 2 +-
.../src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 67b1c40..b40b225 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -289,7 +289,7 @@ public class Normalizer {
*/
public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER +
"targetPackage";
-private static final int ASM_VERSION = Opcodes.ASM5;
+private static final int ASM_VERSION = Opcodes.ASM6;
private final WeaveEnvironment env;
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
index 50f84f4..1fd50d8 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
@@ -171,7 +171,7 @@ public class Privilizer {
private static final String GENERATE_NAME = "__privileged_%s";
-static final int ASM_VERSION = Opcodes.ASM5;
+static final int ASM_VERSION = Opcodes.ASM6;
static final Type[] EMPTY_TYPE_ARRAY = new Type[0];
static Type wrap(final Type type) {
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] reference refs/remotes/origin/master created (now 141e820)
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a change to reference refs/remotes/origin/master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git. at 141e820 update scm No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] branch master updated: update scm
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git The following commit(s) were added to refs/heads/master by this push: new 141e820 update scm 141e820 is described below commit 141e820c70fa3a86d49b740076b11ba50dc8b456 Author: Matt Benson <mben...@apache.org> AuthorDate: Sun Apr 29 15:38:22 2018 -0500 update scm --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a7bc55d..da565f5 100644 --- a/pom.xml +++ b/pom.xml @@ -90,9 +90,9 @@ under the License. - scm:svn:http://svn.apache.org/repos/asf/commons/proper/weaver/trunk/ - scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/ -http://svn.apache.org/viewvc/commons/proper/weaver/trunk/ + scm:git:http://gitbox.apache.org/repos/asf/commons-weaver.git + scm:git:https://gitbox.apache.org/repos/asf/commons-weaver.git +http://gitbox.apache.org/repos/asf/commons-weaver.git -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 08/13: small cleanups
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit c419b33493ab5578e3a2d73675bcfd3b2111b215
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri Apr 20 11:26:46 2018 -0500
small cleanups
---
.../org/apache/commons/weaver/privilizer/ActionGenerator.java | 2 +-
.../commons/weaver/privilizer/InlineNestedPrivilegedCalls.java| 1 -
.../org/apache/commons/weaver/privilizer/PrivilizerCleaner.java | 1 -
.../org/apache/commons/weaver/privilizer/PrivilizingVisitor.java | 8 ++--
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
index 20f2121..9f880a8 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
@@ -86,7 +86,7 @@ class ActionGenerator extends Privilizer.WriteClass
implements Builder {
this.impl = new Method(implName, methd.getDescriptor());
this.implIsStatic = Modifier.isStatic(access);
final Type[] args =
-implIsStatic ? methd.getArgumentTypes() :
ArrayUtils.add(methd.getArgumentTypes(), 0, owner.target);
+implIsStatic ? methd.getArgumentTypes() : ArrayUtils.insert(0,
methd.getArgumentTypes(), owner.target);
this.helper = new Method(privilizer().generateName("access$" + index),
methd.getReturnType(), args);
this.result = privilizer().wrap(methd.getReturnType());
this.fields = fields(args);
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
index c045b13..2795a22 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
@@ -22,7 +22,6 @@ import java.util.Map;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.Method;
import org.objectweb.asm.tree.ClassNode;
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
index 78673f5..bb09954 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizerCleaner.java
@@ -31,7 +31,6 @@ import org.apache.commons.weaver.model.WeaveInterest;
import org.apache.commons.weaver.spi.Cleaner;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
/**
* Removes classes privilized with a different policy.
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
index ccfe259..09c8cce 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/PrivilizingVisitor.java
@@ -149,12 +149,8 @@ class PrivilizingVisitor extends
Privilizer.PrivilizerClassVisitor {
privilizer().env.debug("setting up unconditional
privileged execution due to policy %s", policy);
}
// generate action:
-final Type[] ctorArgs;
-if (instanceMethod) {
-ctorArgs = ArrayUtils.add(methd.getArgumentTypes(), 0,
target);
-} else {
-ctorArgs = methd.getArgumentTypes();
-}
+final Type[] ctorArgs =
+instanceMethod ? ArrayUtils.insert(0,
methd.getArgumentTypes(), target) : methd.getArgumentTypes();
final Type actionType = new ActionGenerator(access, methd,
exceptions, PrivilizingVisitor.this).build();
newInstance(actionType);
dup();
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 09/13: small cleanups
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 1c6c4e3dc4666dfa3ad86feefb197f8df34c7ade
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri Apr 20 11:32:34 2018 -0500
small cleanups
---
.../java/org/apache/commons/weaver/normalizer/Normalizer.java | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index d0be3dd..67b1c40 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.MessageFormat;
@@ -35,7 +35,6 @@ import java.util.stream.Stream;
import javax.activation.DataSource;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.CharEncoding;
import org.apache.commons.lang3.Conversion;
import org.apache.commons.lang3.Validate;
import org.apache.commons.lang3.mutable.MutableBoolean;
@@ -291,7 +290,6 @@ public class Normalizer {
public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER +
"targetPackage";
private static final int ASM_VERSION = Opcodes.ASM5;
-private static final Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
private final WeaveEnvironment env;
@@ -491,8 +489,8 @@ public class Normalizer {
} catch (final NoSuchAlgorithmException e) {
throw new RuntimeException(e);
}
-md5.update(key.getLeft().getBytes(UTF8));
-md5.update(key.getRight().getBytes(UTF8));
+md5.update(key.getLeft().getBytes(StandardCharsets.UTF_8));
+md5.update(key.getRight().getBytes(StandardCharsets.UTF_8));
final long digest = Conversion.byteArrayToLong(md5.digest(), 0, 0L, 0,
Long.SIZE / Byte.SIZE);
@@ -525,7 +523,6 @@ public class Normalizer {
public MethodVisitor visitMethod(final int access, final
String name, final String desc,
final String signature, final String[] exceptions) {
if (INIT.equals(name)) {
-
final Method staticCtor = new Method(INIT,
key.getRight());
final Type[] argumentTypes =
staticCtor.getArgumentTypes();
final Type[] exceptionTypes =
toObjectTypes(exceptions);
@@ -551,7 +548,7 @@ public class Normalizer {
*/
{
final Method instanceCtor =
-new Method(INIT, Type.VOID_TYPE,
ArrayUtils.add(argumentTypes, 0, OBJECT_TYPE));
+new Method(INIT, Type.VOID_TYPE,
ArrayUtils.insert(0, argumentTypes, OBJECT_TYPE));
final GeneratorAdapter mgen =
new GeneratorAdapter(Opcodes.ACC_PUBLIC,
instanceCtor, signature, exceptionTypes,
writeClass);
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 12/13: blueprint method references; reject blueprint methods that access inaccessible classes/methods/ctors (other than other methods also being imported
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 6569dd18ec5c9a02cb3308d1552de7d0c5ed3505
Author: Matt Benson <mben...@apache.org>
AuthorDate: Tue Apr 24 17:16:02 2018 -0500
blueprint method references; reject blueprint methods that access
inaccessible classes/methods/ctors (other than other methods also being imported
---
modules/privilizer/weaver/src/it/sample/pom.xml| 7 +
.../example/MethodReferencesUsingBlueprints.java | 67 ++
.../MethodReferencesUsingBlueprintsTest.java | 81 +++
.../weaver/privilizer/BlueprintingVisitor.java | 256 ++---
.../commons/weaver/privilizer/Privilizer.java | 44 ++--
5 files changed, 346 insertions(+), 109 deletions(-)
diff --git a/modules/privilizer/weaver/src/it/sample/pom.xml
b/modules/privilizer/weaver/src/it/sample/pom.xml
index e0c2d20..c1927c4 100755
--- a/modules/privilizer/weaver/src/it/sample/pom.xml
+++ b/modules/privilizer/weaver/src/it/sample/pom.xml
@@ -54,6 +54,13 @@ under the License.
+maven-compiler-plugin
+
+ 1.8
+ 1.8
+
+
+
@project.groupId@
commons-weaver-maven-plugin
@project.version@
diff --git
a/modules/privilizer/weaver/src/it/sample/src/main/java/org/apache/commons/weaver/privilizer/example/MethodReferencesUsingBlueprints.java
b/modules/privilizer/weaver/src/it/sample/src/main/java/org/apache/commons/weaver/privilizer/example/MethodReferencesUsingBlueprints.java
new file mode 100644
index 000..3e696be
--- /dev/null
+++
b/modules/privilizer/weaver/src/it/sample/src/main/java/org/apache/commons/weaver/privilizer/example/MethodReferencesUsingBlueprints.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.commons.weaver.privilizer.example;
+
+import java.util.function.BiFunction;
+import java.util.function.BinaryOperator;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
+import java.util.function.UnaryOperator;
+
+import org.apache.commons.weaver.privilizer.Privilizing;
+import org.apache.commons.weaver.privilizer.Privilizing.CallTo;
+
+@Privilizing({ @CallTo(Utils.class), @CallTo(value = Utils.More.class, methods
= "getProperty") })
+public class MethodReferencesUsingBlueprints {
+
+public String utilsReadPublicConstant() {
+final Supplier s = Utils::readPublicConstant;
+return s.get();
+}
+
+public int utilsReadPrivateField() {
+final IntSupplier s = Utils::readPrivateField;
+return s.getAsInt();
+}
+
+public String utilsGetProperty() {
+final Supplier s = Utils::getProperty;
+return s.get();
+}
+
+public String utilsGetProperty(int i, String key) {
+final BiFunction<Integer, String, String> f = Utils::getProperty;
+return f.apply(i, key);
+}
+
+public String utilsGetProperty(String key) {
+final UnaryOperator o = Utils::getProperty;
+return o.apply(key);
+}
+
+public String moreGetProperty() {
+final Supplier s = Utils.More::getProperty;
+return s.get();
+}
+
+public String moreGetTopStackElementClassName() {
+final Supplier s = Utils.More::getTopStackElementClassName;
+return s.get();
+}
+}
diff --git
a/modules/privilizer/weaver/src/it/sample/src/test/java/org/apache/commons/weaver/privilizer/example/MethodReferencesUsingBlueprintsTest.java
b/modules/privilizer/weaver/src/it/sample/src/test/java/org/apache/commons/weaver/privilizer/example/MethodReferencesUsingBlueprintsTest.java
new file mode 100644
index 000..1fb59d6
--- /dev/null
+++
b/modules/privilizer/weaver/src/it/sample/src/test/java/org/apache/commons/weaver/privilizer/example/MethodReferencesUsingBlueprintsTest.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright owners
[commons-weaver] 03/13: centralize ASM versions
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit ad16043d781a24e4d8d79be9114dd26fc2fccde3
Author: Matt Benson <mben...@apache.org>
AuthorDate: Thu Apr 19 18:01:04 2018 -0500
centralize ASM versions
---
.../org/apache/commons/weaver/normalizer/Normalizer.java| 13 +++--
.../commons/weaver/privilizer/BlueprintingVisitor.java | 10 +-
.../weaver/privilizer/InlineNestedPrivilegedCalls.java | 6 +++---
.../org/apache/commons/weaver/privilizer/Privilizer.java| 5 +++--
.../apache/commons/weaver/privilizer/PrivilizerCleaner.java | 2 +-
.../commons/weaver/privilizer/PrivilizingVisitor.java | 2 +-
.../src/main/java/org/apache/commons/weaver/Finder.java | 9 +
7 files changed, 25 insertions(+), 22 deletions(-)
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 1c8be3f..d0be3dd 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -72,7 +72,7 @@ public class Normalizer {
private static final class Inspector extends ClassVisitor {
private final class InspectConstructor extends MethodVisitor {
private InspectConstructor() {
-super(Opcodes.ASM5);
+super(ASM_VERSION);
}
@Override
@@ -104,7 +104,7 @@ public class Normalizer {
private String superName;
private Inspector() {
-super(Opcodes.ASM5);
+super(ASM_VERSION);
}
@Override
@@ -159,7 +159,7 @@ public class Normalizer {
private static final class Remap extends ClassRemapper {
private final class RewriteConstructor extends MethodVisitor {
private RewriteConstructor(final MethodVisitor wrapped) {
-super(Opcodes.ASM5, wrapped);
+super(ASM_VERSION, wrapped);
}
@Override
@@ -240,11 +240,11 @@ public class Normalizer {
private String className;
WriteClass() {
-super(Opcodes.ASM5, new
CustomClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
+super(ASM_VERSION, new
CustomClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS));
}
WriteClass(final ClassReader reader) {
-super(Opcodes.ASM5, new CustomClassWriter(reader, 0));
+super(ASM_VERSION, new CustomClassWriter(reader, 0));
}
@Override
@@ -290,6 +290,7 @@ public class Normalizer {
*/
public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER +
"targetPackage";
+private static final int ASM_VERSION = Opcodes.ASM5;
private static final Charset UTF8 = Charset.forName(CharEncoding.UTF_8);
private final WeaveEnvironment env;
@@ -507,7 +508,7 @@ public class Normalizer {
// we're doing most of this by hand; we only read the original
class to hijack signature, ctor exceptions,
// etc.:
-reader.accept(new ClassVisitor(Opcodes.ASM5) {
+reader.accept(new ClassVisitor(ASM_VERSION) {
Type supertype;
@Override
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
index 00a7049..a12e79d 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/BlueprintingVisitor.java
@@ -72,7 +72,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
BlueprintingVisitor(@SuppressWarnings("PMD.UnusedFormalParameter") final
Privilizer privilizer, //false positive
final ClassVisitor nextVisitor,
final Privilizing config) {
-privilizer.super(new ClassNode(Opcodes.ASM5));
+privilizer.super(new ClassNode(Privilizer.ASM_VERSION));
this.nextVisitor = nextVisitor;
// load up blueprint methods:
@@ -117,7 +117,7 @@ class BlueprintingVisitor extends
Privilizer.PrivilizerClassVisitor {
}
private ClassNode read(final String className) {
-final ClassNode result = new ClassNode(Opcodes.ASM5);
+final ClassNode result = new ClassNode(Privilizer.ASM_VERSION);
try (InputStream bytecode =
privilizer().env.getClassfile(className).getInputStream();) {
new ClassReader(bytecode).accept(result, ClassReader.SKIP_DEBUG |
ClassReader.EXPAND_FRAMES
[commons-weaver] 11/13: clone from ClassWriter#getCommonSuperClass
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 232f479747b016d307e214ad5906f82db0c5a58b
Author: Matt Benson <mben...@apache.org>
AuthorDate: Mon Apr 23 14:30:33 2018 -0500
clone from ClassWriter#getCommonSuperClass
---
.../commons/weaver/privilizer/Privilizer.java | 31 --
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
index ae8036b..5da66bd 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
@@ -73,7 +73,7 @@ public class Privilizer {
}
}
-private static final class CustomClassWriter extends ClassWriter {
+private final class CustomClassWriter extends ClassWriter {
CustomClassWriter(final int flags) {
super(flags);
}
@@ -84,7 +84,34 @@ public class Privilizer {
@Override
protected String getCommonSuperClass(final String type1, final String
type2) {
-return "java/lang/Object";
+//https://gitlab.ow2.org/asm/asm/merge_requests/166
+ClassLoader classLoader = env.classLoader;
+Class class1;
+try {
+class1 = Class.forName(type1.replace('/', '.'), false,
classLoader);
+} catch (Exception e) {
+throw new TypeNotPresentException(type1, e);
+}
+Class class2;
+try {
+class2 = Class.forName(type2.replace('/', '.'), false,
classLoader);
+} catch (Exception e) {
+throw new TypeNotPresentException(type2, e);
+}
+if (class1.isAssignableFrom(class2)) {
+return type1;
+}
+if (class2.isAssignableFrom(class1)) {
+return type2;
+}
+if (class1.isInterface() || class2.isInterface()) {
+return "java/lang/Object";
+} else {
+do {
+class1 = class1.getSuperclass();
+} while (!class1.isAssignableFrom(class2));
+return class1.getName().replace('.', '/');
+}
}
}
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 07/13: upgrade xbean-finder
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 9fea2ca74d233c0fdfaee26529bff692ed355a97
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri Apr 20 11:20:03 2018 -0500
upgrade xbean-finder
---
ant/pom.xml | 4
modules/privilizer/weaver/pom.xml| 1 -
parent/pom.xml | 2 +-
processor/pom.xml| 11 +--
.../src/main/java/org/apache/commons/weaver/Finder.java | 16
5 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/ant/pom.xml b/ant/pom.xml
index fcfbb7f..4ad1b24 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -65,8 +65,12 @@ under the License.
+
+org.apache.commons.weaver.Finder$Visitor
+
org.apache.commons.weaver.ant._collections4
+org.apache.commons.weaver.ant._xbean
diff --git a/modules/privilizer/weaver/pom.xml
b/modules/privilizer/weaver/pom.xml
index 9f561f7..33b6cd1 100644
--- a/modules/privilizer/weaver/pom.xml
+++ b/modules/privilizer/weaver/pom.xml
@@ -36,7 +36,6 @@ under the License.
scm:svn:https://svn.apache.org/repos/asf/commons/proper/weaver/trunk/modules/privilizer/weaver
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/weaver
-
org.apache.commons
diff --git a/parent/pom.xml b/parent/pom.xml
index d14d446..235b718 100755
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -152,7 +152,7 @@ under the License.
org.apache.xbean
xbean-finder-shaded
-4.5
+4.8
org.apache.commons
diff --git a/processor/pom.xml b/processor/pom.xml
index 275b544..0772486 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -68,8 +68,15 @@ under the License.
japicmp-maven-plugin
-
-
org\.apache\.commons\.collections4\..+
+
+
+org.apache.commons.weaver.Finder$Visitor
+
+
+
+
org\.apache\.commons\.collections4\..+
+
org\.apache\.xbean\.asm5\..+
+
diff --git a/processor/src/main/java/org/apache/commons/weaver/Finder.java
b/processor/src/main/java/org/apache/commons/weaver/Finder.java
index 9eb5b60..b08bc1b 100644
--- a/processor/src/main/java/org/apache/commons/weaver/Finder.java
+++ b/processor/src/main/java/org/apache/commons/weaver/Finder.java
@@ -48,13 +48,13 @@ import org.apache.commons.weaver.model.ScanResult;
import org.apache.commons.weaver.model.Scanner;
import org.apache.commons.weaver.model.WeaveInterest;
import org.apache.commons.weaver.utils.Annotations;
-import org.apache.xbean.asm5.AnnotationVisitor;
-import org.apache.xbean.asm5.ClassReader;
-import org.apache.xbean.asm5.ClassVisitor;
-import org.apache.xbean.asm5.FieldVisitor;
-import org.apache.xbean.asm5.MethodVisitor;
-import org.apache.xbean.asm5.Opcodes;
-import org.apache.xbean.asm5.Type;
+import org.apache.xbean.asm6.AnnotationVisitor;
+import org.apache.xbean.asm6.ClassReader;
+import org.apache.xbean.asm6.ClassVisitor;
+import org.apache.xbean.asm6.FieldVisitor;
+import org.apache.xbean.asm6.MethodVisitor;
+import org.apache.xbean.asm6.Opcodes;
+import org.apache.xbean.asm6.Type;
import org.apache.xbean.finder.Annotated;
import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.Parameter;
@@ -494,7 +494,7 @@ class Finder extends AnnotationFinder implements Scanner {
}
}
-private static final int ASM_VERSION = Opcodes.ASM5;
+private static final int ASM_VERSION = Opcodes.ASM6;
private static final int ASM_FLAGS = ClassReader.SKIP_CODE +
ClassReader.SKIP_DEBUG + ClassReader.SKIP_FRAMES;
private static final String INIT = "";
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 10/13: upgrade modules to ASM 6.1
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit b3b4583a1b8981739a569e0ef89b7ac141ed2ea8
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri Apr 20 15:28:05 2018 -0500
upgrade modules to ASM 6.1
---
LICENSE-asm5.1.txt => LICENSE-asm6.1.txt | 0
modules/normalizer/pom.xml | 44 ++
modules/privilizer/weaver/pom.xml | 155 +
.../weaver/privilizer/BlueprintingVisitor.java | 3 +-
pom.xml| 2 +-
5 files changed, 80 insertions(+), 124 deletions(-)
diff --git a/LICENSE-asm5.1.txt b/LICENSE-asm6.1.txt
similarity index 100%
rename from LICENSE-asm5.1.txt
rename to LICENSE-asm6.1.txt
diff --git a/modules/normalizer/pom.xml b/modules/normalizer/pom.xml
index 961b330..d6d408a 100644
--- a/modules/normalizer/pom.xml
+++ b/modules/normalizer/pom.xml
@@ -49,6 +49,18 @@ under the License.
provided
+ org.ow2.asm
+ asm
+
+
+ org.ow2.asm
+ asm-commons
+
+
+ org.ow2.asm
+ asm-tree
+
+
org.apache.commons
commons-lang3
@@ -65,37 +77,6 @@ under the License.
test
-
-
- basic
-
-true
-
-
-
- org.ow2.asm
- asm
-
-
- org.ow2.asm
- asm-commons
-
-
- org.ow2.asm
- asm-tree
-
-
-
-
- dev
-
-
- org.ow2.asm
- asm-debug-all
-
-
-
-
@@ -237,7 +218,6 @@ under the License.
commons-lang3
-
${project.build.directory}/it/sample/lib
diff --git a/modules/privilizer/weaver/pom.xml
b/modules/privilizer/weaver/pom.xml
index 33b6cd1..b8e9301 100644
--- a/modules/privilizer/weaver/pom.xml
+++ b/modules/privilizer/weaver/pom.xml
@@ -47,99 +47,30 @@ under the License.
provided
+ org.ow2.asm
+ asm
+
+
+ org.ow2.asm
+ asm-commons
+
+
+ org.ow2.asm
+ asm-tree
+
+
+ org.ow2.asm
+ asm-util
+
+
+ org.ow2.asm
+ asm-analysis
+
+
org.apache.commons
commons-lang3
-
-
- basic
-
-true
-
-
-
- org.ow2.asm
- asm
-
-
- org.ow2.asm
- asm-commons
-
-
- org.ow2.asm
- asm-tree
-
-
- org.ow2.asm
- asm-util
-
-
- org.ow2.asm
- asm-analysis
-
-
-
-
-
-org.apache.maven.plugins
-maven-shade-plugin
-
-
-shade
-
- shade
-
-
- true
-
true
-
-
- org.apache.commons:commons-lang3
- org.ow2.asm:*
-
-
-
-
- org.apache.commons.lang3.
-
org.apache.commons.weaver.privilizer._lang3.
-
-
- org.objectweb.asm.
-
org.apache.commons.weaver.privilizer._asm.
-
-
-
-
- org.apache.commons:commons-lang3
-
-META-INF/**
-
-
-
- org.ow2.asm:*
-
-META-INF/**
-
-
-
-
-
-
-
-
-
-
-
- dev
-
-
- org.ow2.asm
- asm-debug-all
-
-
-
-
@@ -197,6 +128,52 @@ under the License.
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+ shade
+
+ shade
+
+
+ true
+
true
+
+
+ org.apache.commons:commons-lang3
+ org.ow2.asm:*
+
+
+
+
+ org.apache.commons.lang3.
+
org.apache.commons.weaver.privilizer._lang3.
+
+
+ org.obje
[commons-weaver] 13/13: upgrade to ASM API v6
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 52c0f9888fd7d8fb2f1db02be109067d4b91c1b3
Author: Matt Benson <mben...@thegeneral.com>
AuthorDate: Thu Apr 26 11:21:24 2018 -0500
upgrade to ASM API v6
---
.../src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java | 2 +-
.../src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
index 67b1c40..b40b225 100644
---
a/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
+++
b/modules/normalizer/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
@@ -289,7 +289,7 @@ public class Normalizer {
*/
public static final String CONFIG_TARGET_PACKAGE = CONFIG_WEAVER +
"targetPackage";
-private static final int ASM_VERSION = Opcodes.ASM5;
+private static final int ASM_VERSION = Opcodes.ASM6;
private final WeaveEnvironment env;
diff --git
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
index 50f84f4..1fd50d8 100644
---
a/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
+++
b/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
@@ -171,7 +171,7 @@ public class Privilizer {
private static final String GENERATE_NAME = "__privileged_%s";
-static final int ASM_VERSION = Opcodes.ASM5;
+static final int ASM_VERSION = Opcodes.ASM6;
static final Type[] EMPTY_TYPE_ARRAY = new Type[0];
static Type wrap(final Type type) {
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 06/13: upgrade japicmp
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 08ac94ddeecac78a9bfeffdb7cfc77934e7662d1
Author: Matt Benson <mben...@apache.org>
AuthorDate: Fri Apr 20 11:19:35 2018 -0500
upgrade japicmp
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c3bf4cc..73330bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
commons-weaver
https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}
-0.9.1
+0.11.1
--
To stop receiving notification emails like this one, please contact
mben...@apache.org.
[commons-weaver] 01/13: Java 8; assorted minor refactorings
This is an automated email from the ASF dual-hosted git repository.
mbenson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-weaver.git
commit 901ba1ae923352168dc5857c3b3d462a915f7e0f
Author: Gary D. Gregory <ggreg...@apache.org>
AuthorDate: Sun Jan 7 20:53:24 2018 +
Java 8; assorted minor refactorings
---
BUILDING.txt | 2 +-
ant/pom.xml| 1 -
.../commons/weaver/ant/AbstractWeaverTask.java | 1 -
.../org/apache/commons/weaver/ant/CleanTask.java | 4 +-
.../org/apache/commons/weaver/ant/WeaveTask.java | 4 +-
.../apache/commons/weaver/ant/WeaverSettings.java | 2 -
maven-plugin/pom.xml | 2 +-
.../commons/weaver/maven/AbstractCWMojo.java | 12 +-
.../commons/weaver/maven/AbstractPrepareMojo.java | 4 +-
.../commons/weaver/maven/AbstractWeaveMojo.java| 4 +-
.../maven/JavaLoggingToMojoLoggingRedirector.java | 21 +-
.../apache/commons/weaver/maven/PrepareMojo.java | 1 -
.../commons/weaver/maven/TestPrepareMojo.java | 1 -
.../apache/commons/weaver/maven/TestWeaveMojo.java | 1 -
.../org/apache/commons/weaver/maven/WeaveMojo.java | 1 -
modules/normalizer/pom.xml | 2 -
.../commons/weaver/normalizer/Normalizer.java | 65 ++---
.../weaver/normalizer/NormalizerWeaver.java| 1 -
.../apache/commons/weaver/normalizer/Utils.java| 9 +-
modules/privilizer/weaver/pom.xml | 3 -
.../commons/weaver/privilizer/ActionGenerator.java | 8 +-
.../weaver/privilizer/BlueprintingVisitor.java | 52 ++--
.../apache/commons/weaver/privilizer/Field.java| 12 +-
.../commons/weaver/privilizer/FieldAccess.java | 1 -
.../apache/commons/weaver/privilizer/Policy.java | 1 -
.../commons/weaver/privilizer/Privilizer.java | 23 +-
.../weaver/privilizer/PrivilizerCleaner.java | 11 +-
.../weaver/privilizer/PrivilizerWeaver.java| 2 +-
.../weaver/privilizer/PrivilizingVisitor.java | 5 +-
pom.xml| 9 +-
.../org/apache/commons/weaver/CleanProcessor.java | 2 +-
.../java/org/apache/commons/weaver/Finder.java | 281 +++--
.../java/org/apache/commons/weaver/Inflater.java | 88 +++
.../org/apache/commons/weaver/ProcessorBase.java | 4 +-
.../org/apache/commons/weaver/WeaveProcessor.java | 2 +-
.../apache/commons/weaver/model/ScanRequest.java | 4 +-
.../apache/commons/weaver/model/ScanResult.java| 9 +-
.../org/apache/commons/weaver/model/Weavable.java | 2 +-
.../apache/commons/weaver/model/WeavableClass.java | 39 +--
.../commons/weaver/model/WeavableConstructor.java | 1 -
.../weaver/model/WeavableConstructorParameter.java | 1 -
.../commons/weaver/model/WeavableExecutable.java | 3 +-
.../commons/weaver/model/WeavableMethod.java | 2 +-
.../weaver/model/WeavableMethodParameter.java | 1 -
.../commons/weaver/model/WeavablePackage.java | 6 +-
.../commons/weaver/model/WeavableParameter.java| 1 -
.../commons/weaver/model/WeaveEnvironment.java | 37 +--
.../apache/commons/weaver/model/WeaveInterest.java | 20 +-
.../java/org/apache/commons/weaver/utils/Args.java | 1 -
.../org/apache/commons/weaver/utils/Providers.java | 33 +--
.../org/apache/commons/weaver/utils/URLArray.java | 60 ++---
51 files changed, 300 insertions(+), 562 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
deleted file mode 12
index 5af3810..000
--- a/BUILDING.txt
+++ /dev/null
@@ -1 +0,0 @@
-src/site/markdown/building.md
\ No newline at end of file
diff --git a/BUILDING.txt b/BUILDING.txt
new file mode 100644
index 000..0fcdf1e
--- /dev/null
+++ b/BUILDING.txt
@@ -0,0 +1 @@
+link src/site/markdown/building.md
\ No newline at end of file
diff --git a/ant/pom.xml b/ant/pom.xml
index dd472ae..0db620b 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -111,7 +111,6 @@ under the License.
org.apache.maven.plugins
maven-shade-plugin
-2.1
shade
diff --git
a/ant/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
b/ant/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
index fde4f9e..50c66c9 100644
--- a/ant/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
+++ b/ant/src/main/java/org/apache/commons/weaver/ant/AbstractWeaverTask.java
@@ -66,5 +66,4 @@ public abstract class AbstractWeaverTask extends Task {
settings.setRefid(new Reference(getProject(), refid));
add(settings);
}
-
}
\ No newline at end of file
diff --git a/ant/src/main/java/org/apache/commons/weaver/ant/CleanTask.java
b/ant/src/main/java/org/apache/commons/weaver/ant/CleanTask.java
index a91f9da..1756958 100644
--- a/ant/src/main/java/org/apache/commons/weaver/ant/CleanTas
[commons-weaver] 05/13: remove shading for obsolete deps
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 3dd506f431bdc9fa5a563e27b653bd2ec8af05d0 Author: Matt Benson <mben...@apache.org> AuthorDate: Fri Apr 20 11:07:21 2018 -0500 remove shading for obsolete deps --- ant/pom.xml | 20 modules/privilizer/weaver/pom.xml | 11 --- 2 files changed, 31 deletions(-) diff --git a/ant/pom.xml b/ant/pom.xml index 0db620b..fcfbb7f 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -129,14 +129,6 @@ under the License. - org.apache.commons.collections4. - org.apache.commons.weaver.ant._collections4. - - - org.apache.commons.io. - org.apache.commons.weaver.ant._io. - - org.apache.commons.lang3. org.apache.commons.weaver.ant._lang3. @@ -147,18 +139,6 @@ under the License. - org.apache.commons:commons-collections4 - -META-INF/** - - - - commons-io:commons-io - -META-INF/** - - - org.apache.commons:commons-lang3 META-INF/** diff --git a/modules/privilizer/weaver/pom.xml b/modules/privilizer/weaver/pom.xml index 306fce1..9f561f7 100644 --- a/modules/privilizer/weaver/pom.xml +++ b/modules/privilizer/weaver/pom.xml @@ -97,7 +97,6 @@ under the License. org.apache.commons:commons-lang3 - commons-io:commons-io org.ow2.asm:* @@ -107,10 +106,6 @@ under the License. org.apache.commons.weaver.privilizer._lang3. - org.apache.commons.io. - org.apache.commons.weaver.privilizer._io. - - org.objectweb.asm. org.apache.commons.weaver.privilizer._asm. @@ -123,12 +118,6 @@ under the License. - commons-io:commons-io - -META-INF/** - - - org.ow2.asm:* META-INF/** -- To stop receiving notification emails like this one, please contact mben...@apache.org.
[commons-weaver] 04/13: upgrade commons-lang3
This is an automated email from the ASF dual-hosted git repository. mbenson pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-weaver.git commit 11f857a71e4ea75bcba4bfcd8ae66c912388f3e6 Author: Matt Benson <mben...@apache.org> AuthorDate: Fri Apr 20 11:07:02 2018 -0500 upgrade commons-lang3 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 754d607..d14d446 100755 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -157,7 +157,7 @@ under the License. org.apache.commons commons-lang3 -3.4 +3.7 org.ow2.asm -- To stop receiving notification emails like this one, please contact mben...@apache.org.
