Repository: brooklyn-server Updated Branches: refs/heads/master f20bf0e77 -> f8476be1b
Remove Incubator DISCLAIMER file Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dde1124a Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dde1124a Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dde1124a Branch: refs/heads/master Commit: dde1124a9257304ae5869142eb61ac2f6b86ae17 Parents: f20bf0e Author: Richard Downer <rich...@apache.org> Authored: Fri Mar 11 13:35:01 2016 +0000 Committer: Richard Downer <rich...@apache.org> Committed: Fri Mar 11 13:35:41 2016 +0000 ---------------------------------------------------------------------- parent/pom.xml | 3 +-- utils/jmx/jmxmp-ssl-agent/pom.xml | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dde1124a/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 08d69e3..5e721a3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1109,7 +1109,7 @@ </configuration> </plugin> - <!-- Add off-the-schelf LICENSE, NOTICE and DISCLAIMER to each jar. Where off-the-shelf isn't suitable + <!-- Add off-the-schelf LICENSE and NOTICE to each jar. Where off-the-shelf isn't suitable - for submodules, they can disable this processing and intergrate their own files. --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1122,7 +1122,6 @@ <configuration> <resourceBundles> <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle> - <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle> </resourceBundles> </configuration> </execution> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dde1124a/utils/jmx/jmxmp-ssl-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml index 930f0a3..123e6f4 100644 --- a/utils/jmx/jmxmp-ssl-agent/pom.xml +++ b/utils/jmx/jmxmp-ssl-agent/pom.xml @@ -78,7 +78,6 @@ <resources> <resource>META-INF/LICENSE</resource> <resource>META-INF/NOTICE</resource> - <resource>META-INF/DISCLAIMER</resource> </resources> </transformer> <!-- Replace it with license/notice for the shaded artifact --> @@ -90,10 +89,6 @@ <resource>META-INF/NOTICE</resource> <file>src/main/license/NOTICE.shaded</file> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <resource>META-INF/DISCLAIMER</resource> - <file>src/main/license/DISCLAIMER.shaded</file> - </transformer> </transformers> </configuration> </plugin>
