Repository: maven-wagon Updated Branches: refs/heads/master 824adca8d -> 00d43027f
WAGON-437: Igore RAT plugin for m2eclipse WAGON-438: Use more recent plexus-component-metadata plugin Project: http://git-wip-us.apache.org/repos/asf/maven-wagon/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-wagon/commit/00d43027 Tree: http://git-wip-us.apache.org/repos/asf/maven-wagon/tree/00d43027 Diff: http://git-wip-us.apache.org/repos/asf/maven-wagon/diff/00d43027 Branch: refs/heads/master Commit: 00d43027f740656df1423006770258c0d23611e9 Parents: 824adca Author: Jason van Zyl <jvan...@apache.org> Authored: Mon Apr 20 10:08:35 2015 -0400 Committer: Jason van Zyl <jvan...@apache.org> Committed: Mon Apr 20 10:08:35 2015 -0400 ---------------------------------------------------------------------- pom.xml | 25 ++++++++ wagon-providers/wagon-webdav-jackrabbit/pom.xml | 20 +------ .../main/plexus/META-INF/plexus/components.xml | 63 -------------------- .../META-INF/plexus/default-bindings.xml | 63 ++++++++++++++++++++ 4 files changed, 90 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/00d43027/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 661c524..59b1509 100644 --- a/pom.xml +++ b/pom.xml @@ -370,6 +370,31 @@ under the License. </excludes> </configuration> </plugin> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <versionRange>[0.11,)</versionRange> + <goals> + <goal>check</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> </plugins> </pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/00d43027/wagon-providers/wagon-webdav-jackrabbit/pom.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/pom.xml b/wagon-providers/wagon-webdav-jackrabbit/pom.xml index 45cd1a3..1972c63 100644 --- a/wagon-providers/wagon-webdav-jackrabbit/pom.xml +++ b/wagon-providers/wagon-webdav-jackrabbit/pom.xml @@ -131,29 +131,13 @@ under the License. <plugins> <plugin> <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> + <artifactId>plexus-component-metadata</artifactId> <executions> <execution> <id>generate</id> - <configuration> - <outputDirectory>${project.build.directory}/generated-resources/plexus/</outputDirectory> - </configuration> - <goals> - <goal>descriptor</goal> - </goals> - </execution> - <execution> - <id>merge-descriptors</id> - <configuration> - <descriptors> - <descriptor>${basedir}/src/main/plexus/META-INF/plexus/components.xml</descriptor> - <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor> - </descriptors> - </configuration> <goals> - <goal>merge-descriptors</goal> + <goal>generate-metadata</goal> </goals> - <phase>process-classes</phase> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/00d43027/wagon-providers/wagon-webdav-jackrabbit/src/main/plexus/META-INF/plexus/components.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/plexus/META-INF/plexus/components.xml b/wagon-providers/wagon-webdav-jackrabbit/src/main/plexus/META-INF/plexus/components.xml deleted file mode 100644 index 9328e67..0000000 --- a/wagon-providers/wagon-webdav-jackrabbit/src/main/plexus/META-INF/plexus/components.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -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. ---> -<component-set> - <components> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>dav</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a webdav remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>davs</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a webdav remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>dav+http</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a webdav remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - <component> - <role>org.apache.maven.wagon.Wagon</role> - <role-hint>dav+https</role-hint> - <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> - <instantiation-strategy>per-lookup</instantiation-strategy> - <description><p>WebDavWagon</p> -<p/> -<p>Allows using a webdav remote repository for downloads and deployments</p></description> - <isolated-realm>false</isolated-realm> - </component> - </components> -</component-set> http://git-wip-us.apache.org/repos/asf/maven-wagon/blob/00d43027/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml ---------------------------------------------------------------------- diff --git a/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml b/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml new file mode 100644 index 0000000..9328e67 --- /dev/null +++ b/wagon-providers/wagon-webdav-jackrabbit/src/main/resources/META-INF/plexus/default-bindings.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> +<component-set> + <components> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>dav</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a webdav remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>davs</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a webdav remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>dav+http</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a webdav remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + <component> + <role>org.apache.maven.wagon.Wagon</role> + <role-hint>dav+https</role-hint> + <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation> + <instantiation-strategy>per-lookup</instantiation-strategy> + <description><p>WebDavWagon</p> +<p/> +<p>Allows using a webdav remote repository for downloads and deployments</p></description> + <isolated-realm>false</isolated-realm> + </component> + </components> +</component-set>
