[MNG-6140] renamed aether to resolver, added slf4j-provider Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1cb2e92b Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1cb2e92b Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1cb2e92b
Branch: refs/heads/DEPMGMT-INCLUDE Commit: 1cb2e92b5ad6bc2baa80c48b6357d5f42df4e48f Parents: 8972072 Author: Hervé Boutemy <hbout...@apache.org> Authored: Mon Dec 26 19:21:29 2016 +0100 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Wed Feb 1 07:59:53 2017 +0100 ---------------------------------------------------------------------- src/site/resources/images/maven-deps.png | Bin 73105 -> 69305 bytes src/site/xdoc/index.xml | 54 ++++++++++++++------------ src/site/xdoc/maven-deps.odg | Bin 32324 -> 18602 bytes 3 files changed, 29 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/1cb2e92b/src/site/resources/images/maven-deps.png ---------------------------------------------------------------------- diff --git a/src/site/resources/images/maven-deps.png b/src/site/resources/images/maven-deps.png index d23033f..a7084e8 100644 Binary files a/src/site/resources/images/maven-deps.png and b/src/site/resources/images/maven-deps.png differ http://git-wip-us.apache.org/repos/asf/maven/blob/1cb2e92b/src/site/xdoc/index.xml ---------------------------------------------------------------------- diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml index 4cd2f66..78c47fb 100644 --- a/src/site/xdoc/index.xml +++ b/src/site/xdoc/index.xml @@ -1,22 +1,22 @@ <?xml version="1.0"?> <!-- -/* - * 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. - */ +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. --> <document> @@ -40,24 +40,28 @@ process.</p> <p> - <img src="images/maven-deps.png" width="784" height="595" border="0" usemap="#Maven_dependencies" /> + <img src="images/maven-deps.png" width="784" height="578" border="0" usemap="#Maven_dependencies" /> <map name="Maven_dependencies"> <area shape="rect" coords="228,1,361,36" alt="apache-maven" href="apache-maven/" /> <area shape="rect" coords="228,58,361,95" alt="maven-embedder" href="maven-embedder/" /> <area shape="rect" coords="228,116,361,152" alt="maven-compat" href="maven-compat/" /> <area shape="rect" coords="228,175,361,211" alt="maven-core" href="maven-core/" /> - <area shape="rect" coords="118,233,275,269" alt="maven-aether-provider" href="maven-aether-provider/" /> + <area shape="rect" coords="118,233,275,269" alt="maven-resolver-provider" href="maven-resolver-provider/" /> <area shape="rect" coords="0,287,192,323" alt="maven-repository-metadata" href="maven-repository-metadata/" /> <area shape="rect" coords="245,342,343,378" alt="maven-plugin-api" href="maven-plugin-api/" /> <area shape="rect" coords="253,401,336,436" alt="maven-artifact" href="maven-artifact/" /> - <area shape="rect" coords="296,234,442,270" alt="maven-builder-support" href="maven-builder-support/" /> + <area shape="rect" coords="299,230,446,265" alt="maven-builder-support" href="maven-builder-support/" /> <area shape="rect" coords="382,176,528,211" alt="maven-settings-builder" href="maven-settings-builder/" /> - <area shape="rect" coords="446,234,537,269" alt="maven-settings" href="maven-settings/" /> + <area shape="rect" coords="449,229,532,266" alt="maven-settings" href="maven-settings/" /> <area shape="rect" coords="388,284,521,319" alt="maven-model-builder" href="maven-model-builder/" /> <area shape="rect" coords="409,342,500,378" alt="maven-model" href="maven-model/" /> - <area shape="rect" coords="TODO" alt="maven-slf4j-provider" href="maven-slf4j-provider/" /> - <area shape="rect" coords="88,59,192,94" alt="slf4j-api" href="http://www.slf4j.org/manual.html" /> + <area shape="rect" coords="42,0,198,35" alt="maven-slf4j-provider" href="maven-slf4j-provider/" /> + <area shape="rect" coords="68,338,240,482" alt="maven-resolver" href="https://maven.apache.org/resolver/" /> + <area shape="rect" coords="70,57,171,93" alt="slf4j-api" href="http://www.slf4j.org/manual.html" /> <area shape="rect" coords="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/" /> + <area shape="rect" coords="88,175,205,211" alt="maven-shared-utils" href="https://maven.apache.org/shared/maven-shared-utils/" /> + <area shape="rect" coords="0,176,70,211" alt="jansi" href="http://fusesource.github.io/jansi/" /> + <area shape="rect" coords="0,229,71,266" alt="jansi-native" href="https://github.com/fusesource/jansi-native" /> <area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="https://maven.apache.org/wagon/wagon-provider-api/" /> <area shape="rect" coords="550,175,690,211" alt="plexus-sec-dispatcher" href="https://github.com/codehaus-plexus/plexus-sec-dispatcher" /> <area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="https://github.com/codehaus-plexus/plexus-cipher" /> @@ -66,9 +70,9 @@ <area shape="rect" coords="550,401,682,437" alt="plexus-classworlds" href="https://codehaus-plexus.github.io/plexus-classworlds" /> <area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://codehaus-plexus.github.io/plexus-utils" /> <area shape="rect" coords="542,167,783,502" alt="plexus" href="https://codehaus-plexus.github.io/" /> - <area shape="rect" coords="68,338,240,482" alt="aether" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.aether" /> - <area shape="rect" coords="388,393,520,594" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu" /> - <area shape="rect" coords="519,518,621,554" alt="guice" href="http://code.google.com/p/google-guice/" /> + <area shape="rect" coords="401,393,509,524" alt="sisu" href="http://www.eclipse.org/projects/project_summary.php?projectid=technology.sisu" /> + <area shape="rect" coords="416,543,493,577" alt="guice" href="http://code.google.com/p/google-guice/" /> + <area shape="rect" coords="550,543,673,577" alt="javax.inject" href="http://docs.oracle.com/javaee/6/api/javax/inject/package-summary.html" /> </map> </p> </section> http://git-wip-us.apache.org/repos/asf/maven/blob/1cb2e92b/src/site/xdoc/maven-deps.odg ---------------------------------------------------------------------- diff --git a/src/site/xdoc/maven-deps.odg b/src/site/xdoc/maven-deps.odg index 9d4193a..f95b83f 100644 Binary files a/src/site/xdoc/maven-deps.odg and b/src/site/xdoc/maven-deps.odg differ