svn commit: r1762963 - in /maven/plugins/trunk/maven-shade-plugin/src: it/services-resource-transformer-with-reloc-includes-excludes/ it/services-resource-transformer-with-reloc-includes-excludes/repo
Author: gboue
Date: Fri Sep 30 20:23:50 2016
New Revision: 1762963
URL: http://svn.apache.org/viewvc?rev=1762963=rev
Log:
[MSHADE-237] ServicesResourceTransformer relocates excluded classes
Exclude pattern specified for relocations were ignored by the
ServicesResourceTransformer. This could result in fully qualified name of
implementation classes, present in a file for a given interface, being
relocated, when the actual class was not.
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/mshade-237-one-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-one/0.1/mshade-237-one-0.1.pom
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/0.1/
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/0.1/mshade-237-two-0.1.jar
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/repo/org/apache/maven/its/shade/srt/mshade-237-two/0.1/mshade-237-two-0.1.pom
(with props)
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/verify.bsh
(with props)
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
maven/plugins/trunk/maven-shade-plugin/src/test/java/org/apache/maven/plugins/shade/resource/ServiceResourceTransformerTest.java
Added:
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml?rev=1762963=auto
==
---
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/it/services-resource-transformer-with-reloc-includes-excludes/pom.xml
Fri Sep 30 20:23:50 2016
@@ -0,0 +1,93 @@
+
+
+
+
+
+ 4.0.0
+
+ org.apache.maven.its.shade.srt
+ mshade-237
+ 1.0
+ jar
+ MSHADE-237
+
+Test the merging of META-INF/services/** entries, when relocation
includes/excludes patterns are specified
+
+
+
+
+ shade-it
+ file:///${basedir}/repo
+
+ignore
+
+
+false
+
+
+
+
+
+
+ org.apache.maven.its.shade.srt
+ mshade-237-one
+ 0.1
+
+
+ org.apache.maven.its.shade.srt
+ mshade-237-two
+ 0.1
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-shade-plugin
+@project.version@
+
+
+attach-shade
+package
+
+ shade
+
+
+ false
+
+
+
svn commit: r1762943 - /maven/plugins/trunk/maven-compiler-plugin/pom.xml
Author: rfscholte Date: Fri Sep 30 18:58:37 2016 New Revision: 1762943 URL: http://svn.apache.org/viewvc?rev=1762943=rev Log: [MCOMPILER-279] Passing multiple --add-exports args to the compilerArgs is not supported Upgrade to plexus-compiler-2.8.1 Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml Modified: maven/plugins/trunk/maven-compiler-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/pom.xml?rev=1762943=1762942=1762943=diff == --- maven/plugins/trunk/maven-compiler-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-compiler-plugin/pom.xml Fri Sep 30 18:58:37 2016 @@ -63,7 +63,7 @@ under the License. ! The following property is used in the integration tests MCOMPILER-157 --> 3.5 -2.8.1-SNAPSHOT +2.8.1 1.8.0 2.7.0-01 2.0.4-04
svn commit: r1762936 - /maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm
Author: gboue Date: Fri Sep 30 17:17:05 2016 New Revision: 1762936 URL: http://svn.apache.org/viewvc?rev=1762936=rev Log: Fix a typo: "to" was written twice. Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm Modified: maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm?rev=1762936=1762935=1762936=diff == --- maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm (original) +++ maven/plugins/trunk/maven-shade-plugin/src/site/apt/examples/resource-transformers.apt.vm Fri Sep 30 17:17:05 2016 @@ -131,8 +131,8 @@ Transformers in <<>> directory that maps interfaces to their implementation classes for lookup by the service locator. To relocate the class names of these implementation classes, and to - To merge multiple implementations - of the same interface into one service entry, the <<>> can be used: + merge multiple implementations of the same interface into one service entry, + the <<>> can be used: +-
svn commit: r1762932 - in /maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats: ./ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/maven/ src/main
Author: hboutemy
Date: Fri Sep 30 16:23:13 2016
New Revision: 1762932
URL: http://svn.apache.org/viewvc?rev=1762932=rev
Log:
[MSITE-782] added custom Velocity tool test (failing...)
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/invoker.properties
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/it/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/it/CustomVelocityTool.java
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/resources/tools.xml
(with props)
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy.edited
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/invoker.properties?rev=1762932=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/invoker.properties
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/invoker.properties
Fri Sep 30 16:23:13 2016
@@ -0,0 +1,18 @@
+# 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.
+
+invoker.goals = package site
Propchange:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/invoker.properties
--
svn:mime-type = text/plain
Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml?rev=1762932=1762931=1762932=diff
==
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml Fri Sep
30 16:23:13 2016
@@ -26,13 +26,21 @@ under the License.
org.apache.maven.plugins.site.its
doxia-formats
1.0-SNAPSHOT
- pom
+ jar
Doxia formats tests
@project.version@
+
+
+ org.apache.velocity
+ velocity-tools
+ 2.0
+
+
+
@@ -53,6 +61,11 @@ under the License.
velocity
1.5
+
+ ${project.groupId}
+ ${project.artifactId}
+ ${project.version}
+
Added:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/it/CustomVelocityTool.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/it/CustomVelocityTool.java?rev=1762932=auto
==
---
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/it/CustomVelocityTool.java
(added)
+++
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/main/java/org/apache/maven/plugins/site/it/CustomVelocityTool.java
Fri Sep 30 16:23:13 2016
@@ -0,0
