You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/01/25 19:48:21 UTC
[01/11] maven git commit: point to our documentation on plugins
dependencies upgrade [Forced Update!]
Repository: maven
Updated Branches:
refs/heads/MNG-6014 1bdc4abe7 -> d75dbc37b (forced update)
point to our documentation on plugins dependencies upgrade
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/cfbad56f
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/cfbad56f
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/cfbad56f
Branch: refs/heads/MNG-6014
Commit: cfbad56f65b9d664c7967122b76a5389931080f8
Parents: 84085c0
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun May 29 09:55:54 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Jan 24 23:50:10 2017 +0100
----------------------------------------------------------------------
maven-compat/src/site/apt/index.apt | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/cfbad56f/maven-compat/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-compat/src/site/apt/index.apt b/maven-compat/src/site/apt/index.apt
new file mode 100644
index 0000000..a288cdc
--- /dev/null
+++ b/maven-compat/src/site/apt/index.apt
@@ -0,0 +1,32 @@
+~~ 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.
+
+ -----
+ Introduction
+ -----
+ Herv� Boutemy
+ -----
+ 2016-05-29
+ -----
+
+Maven Compat
+
+ Maven2 classes maintained as compatibility layer for plugins that need to keep Maven2 compatibility.
+
+ Plugins should avoid these classes and be updated to use only Maven3 dependencies (and require Maven3): see
+ {{{https://cwiki.apache.org/confluence/display/MAVEN/Plugin+migration+to+Maven3+dependencies} Plugin migration to Maven3 dependencies}}
+ documentation to get hints on how to make the update.
[09/11] maven git commit: added core its to projects' sources
Posted by kh...@apache.org.
added core its to projects' sources
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/311fc62b
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/311fc62b
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/311fc62b
Branch: refs/heads/MNG-6014
Commit: 311fc62b7daca1d63596e2202598a0fd3e4d77e2
Parents: 4547ff7
Author: Herv� Boutemy <hb...@apache.org>
Authored: Wed Nov 16 14:41:06 2016 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:09:42 2017 +0100
----------------------------------------------------------------------
doap_Maven.rdf | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/311fc62b/doap_Maven.rdf
----------------------------------------------------------------------
diff --git a/doap_Maven.rdf b/doap_Maven.rdf
index a50b68f..9a043ce 100644
--- a/doap_Maven.rdf
+++ b/doap_Maven.rdf
@@ -190,6 +190,12 @@ under the License.
<browse rdf:resource="https://git-wip-us.apache.org/repos/asf/maven.git"/>
</GitRepository>
</repository>
+ <repository>
+ <GitRepository>
+ <location rdf:resource="https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+ <browse rdf:resource="https://git-wip-us.apache.org/repos/asf/maven-integration-testing.git"/>
+ </GitRepository>
+ </repository>
<maintainer>
<foaf:Person>
<foaf:name>Apache Maven PMC</foaf:name>
[07/11] maven git commit: removed now unused checkstyle suppress
warnings
Posted by kh...@apache.org.
removed now unused checkstyle suppress warnings
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/8a8f7cd5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/8a8f7cd5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/8a8f7cd5
Branch: refs/heads/MNG-6014
Commit: 8a8f7cd53f08bd0847e6263f79894d18881dcd9d
Parents: 60e4fa6
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Oct 16 23:16:52 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:09:01 2017 +0100
----------------------------------------------------------------------
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/8a8f7cd5/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
----------------------------------------------------------------------
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 8455848..c0b0dcf 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -1056,7 +1056,6 @@ public class MavenCli
private static final String ANSI_RESET = "\u001B\u005Bm";
- @SuppressWarnings( "checkstyle:methodlength" )
private void configure( CliRequest cliRequest )
throws Exception
{
@@ -1122,7 +1121,6 @@ public class MavenCli
}
}
- @SuppressWarnings( "checkstyle:methodlength" )
private void toolchains( CliRequest cliRequest )
throws Exception
{
[05/11] maven git commit: improved documentation
Posted by kh...@apache.org.
improved documentation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/512fa6a4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/512fa6a4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/512fa6a4
Branch: refs/heads/MNG-6014
Commit: 512fa6a45b73663ed5b5e0e896539d1084da36f3
Parents: 0b684af
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sun Oct 2 10:02:21 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:07:55 2017 +0100
----------------------------------------------------------------------
maven-core/project-builder.txt | 1 -
.../src/main/java/org/apache/maven/Maven.java | 3 +
.../java/org/apache/maven/SessionScoped.java | 4 +-
.../apache/maven/execution/MavenSession.java | 2 +
.../maven/execution/ProjectDependencyGraph.java | 1 +
.../org/apache/maven/graph/GraphBuilder.java | 5 +
maven-core/src/site/apt/index.apt | 23 ++-
.../apt/scripting-support/marmalade-support.apt | 196 -------------------
8 files changed, 26 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/project-builder.txt
----------------------------------------------------------------------
diff --git a/maven-core/project-builder.txt b/maven-core/project-builder.txt
deleted file mode 100644
index a9aab65..0000000
--- a/maven-core/project-builder.txt
+++ /dev/null
@@ -1 +0,0 @@
-Maven Project Builder and Maven Model Builder
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/Maven.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java
index 8563847..69f9fca 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -23,7 +23,10 @@ import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
/**
+ * The main Maven execution entry point, which will execute a full Maven execution session.
+ *
* @author Jason van Zyl
+ * @see org.apache.maven.execution.MavenSession
*/
public interface Maven
{
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/SessionScoped.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/SessionScoped.java b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
index 63b1eb7..7738938 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionScoped.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionScoped.java
@@ -28,8 +28,8 @@ import java.lang.annotation.Target;
import com.google.inject.ScopeAnnotation;
/**
- * Indicates that annotated component should be instantiated before session starts and discarded after session execution
- * completes.
+ * Indicates that annotated component should be instantiated before session execution starts
+ * and discarded after session execution completes.
*
* @author Jason van Zyl
* @since 3.2.0
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
index 864c49ad..d69bbba 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
@@ -39,6 +39,8 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.eclipse.aether.RepositorySystemSession;
/**
+ * A Maven execution session.
+ *
* @author Jason van Zyl
*/
public class MavenSession
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
index 1db277d..0d5584b 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProjectDependencyGraph.java
@@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProject;
* Describes the inter-dependencies between projects in the reactor.
*
* @author Benjamin Bentmann
+ * @since 3.0-alpha
*/
public interface ProjectDependencyGraph
{
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java b/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java
index fb7c4f2..0f584d9 100644
--- a/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/graph/GraphBuilder.java
@@ -23,6 +23,11 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ProjectDependencyGraph;
import org.apache.maven.model.building.Result;
+/**
+ * Builds the {@link ProjectDependencyGraph inter-dependencies graph} between projects in the reactor.
+ *
+ * @since 3.0-alpha
+ */
public interface GraphBuilder
{
String HINT = "graphBuilder";
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index 966b57c..1e7a68e 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -27,14 +27,25 @@ Maven Core
Maven Core classes managing the whole build process.
-* Useful entry points
+* Reference Documentation
* {{{./lifecycles.html}lifecycles}} and {{{./default-bindings.html}plugin bindings to <<<default>>> lifecycle}},
* {{{./artifact-handlers.html}default artifact handlers}},
+ * {{{./extension.html}extension descriptor}} and {{{./core-extensions.html}core extensions}},
+
+ * {{{/guides/mini/guide-maven-classloading.html}classloader hierarchy}} done by <<<ClassRealmManager>>> component
+ ({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
+ with its <<<DefaultClassRealmManager>>> implementation
+ ({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
+ {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
+
+* Useful entry points
+
* <<<Maven>>> component ({{{./apidocs/org/apache/maven/Maven.html}javadoc}}),
- with its <<<DefaultMaven>>> implementation ({{{./xref/org/apache/maven/DefaultMaven.html}source}}),
+ with its <<<DefaultMaven>>> implementation ({{{./xref/org/apache/maven/DefaultMaven.html}source}}), to drive
+ a full <<<MavenSession>>> execution ({{{./apidocs/org/apache/maven/execution/MavenSession.html}javadoc}}
* <<<ProjectBuilder>>> component ({{{./apidocs/org/apache/maven/project/ProjectBuilder.html}javadoc}}),
with its <<<DefaultProjectBuilder>>> implementation
@@ -47,14 +58,6 @@ Maven Core
* {{{./apidocs/org/apache/maven/plugin/PluginParameterExpressionEvaluator.html}PluginParameterExpressionEvaluator}}, used to
evaluate plugin parameters values during Mojo configuration,
- * {{{/guides/mini/guide-maven-classloading.html}classloader hierarchy}} done by <<<ClassRealmManager>>> component
- ({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
- with its <<<DefaultClassRealmManager>>> implementation
- ({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
- {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
-
- * {{{./extension.html}extension descriptor}} and {{{./core-extensions.html}core extensions}},
-
* <<<ExceptionHandler>>> component ({{{./apidocs/org/apache/maven/exception/ExceptionHandler.html}javadoc}}),
with its <<<DefaultExceptionHandler>>> implementation
({{{./xref/org/apache/maven/exception/DefaultExceptionHandler.html}source}}), use to transform exception into useful end-user messages.
http://git-wip-us.apache.org/repos/asf/maven/blob/512fa6a4/maven-core/src/site/apt/scripting-support/marmalade-support.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/scripting-support/marmalade-support.apt b/maven-core/src/site/apt/scripting-support/marmalade-support.apt
deleted file mode 100644
index 7a80966..0000000
--- a/maven-core/src/site/apt/scripting-support/marmalade-support.apt
+++ /dev/null
@@ -1,196 +0,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.
-
- ---
- Marmalade Mojo Support - Notes
- ---
- John Casey
- ---
- 07-Feb-2005
- ---
-
-Marmalade Support
-
-*Abstract
-
- This document will track the design and implementation issues involved in
- adding support to m2 for marmalade-based mojos.
-
-*Design Notes
-
- [[1]] <<Marmalade mojo descriptor specification.>>
-
- As in all mojo specifications, it is ideal that the descriptor for
- a marmalade-based mojo be inline with the source code. This centralizes
- all maintenance related to a single mojo to a single point of maintenance.
-
- The following is what I'm thinking as of now:
-
- - a marmalade-based mojo should look something like:
-
-+---+
- <mojo xmlns="m2:mojo" xmlns:marmalade-control="marmalade:marmalade-control" marmalade-control:el="none">
-
- <metadata>
- <id>mmld</id>
- <name>mmldCompile</name>
- <lifecyclePhase>compile</lifecyclePhase>
- <description>Used to compile marmalade scripts into java beans.</description>
-
- <requiresDependencyResolution/>
- <instantiationStrategy/>
- <executionStrategy/>
-
- <parameters>
-
- <parameter>
- <name>classpath</name>
- <description>The compilation classpath</description>
- <type>java.util.List</type>
- <expression>#pom.artifacts</expression>
-
- <required/>
- <validator/>
- <default/>
-
- </parameter>
-
- </parameters>
-
- </metadata>
-
- <execute>
- <!-- Do some stuff. -->
- </execute>
-
- </mojo>
-+---+
-[NOTE] All empty elements above signify optional elements, usage specification.
-
- [[2]] <<Marmalade mojo packager.>>
-
- The marmalade mojo packager will:
-
- [[a]] Locate all *.mmld files within the scripts directory of the project.
-
- The scripts directory should be tied to the script language within
- the POM. Until we have multiple language support in the POM, we'll
- use something like: <<<xpath(build/marmaladeSourceDirectory)>>>.
-
- [[b]] For each script found:
-
- [[i]] Execute the script with "gatherMetadata=true" in the context.
-
- [[ii]] Retrieve the mojo descriptor from the resulting "metadata"
- variable in the context.
-
- [[iii]] Cache the mojo descriptor in aggregator for subsequent
- output to plugin descriptor file.
-
- [[c]] Copy all scripts to the target directory. Preserve relative paths.
-
- [[d]] <<Process Disjoint:>> <Allow other mojo-descriptor collectors to
- run, aggregating their descriptors in similar fashion to [b.iii]
- above.>
-
- [[e]] Use the project's dependencies and other info to form the plugin
- descriptor's header (non-mojo-specific info).
-
- [[f]] Use the PluginGenerator from maven-plugin-tools to generate a
- META-INF/plexus/plugin.xml to the target directory.
-
- [[g]] Continue with lifecycle.
-
- This may include compilation of java helper classes, etc. and
- plugin-artifact packaging, presumably via 'jar:jar' or similar.
-
- [[3]] <<Marmalade mojo loader.>>
-
- The marmalade mojo loader will:
-
- [[a]] Retrieve the implementation spec (this is the path of the script,
- relative to the root of the plugin filesystem...jar, etc.) to
- $path.
-
- [[b]] Use the context classloader to retrieve a reader to $path.
-
- [[c]] Build the ScriptBuilder corresponding to the script.
-
- [[d]] Create a new MarmaladeMojo instance which adapts the mojo calling
- semantics to the creation/execution of a marmalade script.
-
- Execution involves:
-
- [[i]] Creating a new MarmaladeScript instance.
-
- [[ii]] Creating an execution context which references all I/O
- from the main Maven execution thread, and embeds:
-
- - #request == MavenExecutionRequest
-
- - #response == MavenExecutionResponse
-
- - Any globally configured environmental constraints, such
- as a global preserve-whitespace setting
-
- [[iii]] Execution of the script using the execution context.
-
- [[iv]] Export of the resulting context, minus any surviving input
- variables, to the MavenExecutionResponse's out-params.
-
-*Implementation Issues
-
- [[1]] How do we make Maven smart enough to switch loader implementations based
- on some sub-type of maven-plugin?
-
- This is important, since the default mojo loader will not be smart
- enough to do the job, and embedding this behavior in that loader is not
- scalable or extensible enough to accommodate future expansion into the
- realms of jython, groovy, etc...
-
- <<UPDATE:07-FEB-2005>>
-
- We'll plan on using some sort of language specification in the mojo
- descriptor to determine which mojo loader to use, then we'll populate
- the PluginLoader/PluginManager with a map of known languages->loaders.
-
- [[2]] How do we make the plugin:install process smart enough to switch
- generator implementations based on some sub-type of maven-plugin?
-
- This is closely related to [1] above.
-
- <<UPDATE:07-FEB-2005>>
-
- See update in [3].
-
- [[3]] Do we want to allow mixed-bag plugin implementations?
-
- These might include a mix of standard-java and marmalade mojos. It
- strikes me that many marmalade-based mojos may use beans/tags that are
- actually adapter classes for other third-party APIs (why they wouldn't
- implement everything as java mojos in this cases is beyond me). If they
- have java source inside the plugin source directory, we should probably
- compile it and bundle it with the plugin scripts; but what if this source
- also has mojo annotations? This will have implications for [1] and [2]
- above.
-
- <<UPDATE:07-FEB-2005>>
-
- We will plan on allowing this sort of implementation, and simply start
- by applying all known generators which have a source directory set in
- the POM (or later, have a <language/> section, maybe). At any rate,
- helper classes will be allowed for script-based mojos.
[02/11] maven git commit: updated urls (https,
plexus) and license header formatting
Posted by kh...@apache.org.
updated urls (https, plexus) and license header formatting
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/84085c0a
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/84085c0a
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/84085c0a
Branch: refs/heads/MNG-6014
Commit: 84085c0a9ce4febee8be124fe61f02cd40185d20
Parents: bc07e74
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat May 28 13:28:23 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Tue Jan 24 23:50:10 2017 +0100
----------------------------------------------------------------------
README.md | 6 ++--
apache-maven/README.txt | 6 ++--
apache-maven/pom.xml | 32 ++++++++++--------
apache-maven/src/conf/toolchains.xml | 2 +-
maven-artifact/pom.xml | 27 ++++++++++-----
maven-compat/pom.xml | 27 ++++++++++-----
.../maven/artifact/manager/WagonManager.java | 2 +-
maven-core/pom.xml | 27 ++++++++++-----
.../AbstractMavenLifecycleParticipant.java | 2 +-
maven-core/src/main/mdo/toolchains.mdo | 4 +--
maven-core/src/site/apt/index.apt | 2 +-
maven-embedder/pom.xml | 27 ++++++++++-----
maven-embedder/src/site/apt/logging.apt | 6 ++--
maven-model-builder/pom.xml | 27 ++++++++++-----
.../maven/model/io/xpp3/package-info.java | 6 ++--
maven-model/src/main/mdo/maven.mdo | 20 +++++------
maven-model/src/site/xdoc/navigation.xml | 35 --------------------
.../org/apache/maven/plugin/AbstractMojo.java | 8 ++---
.../maven/plugin/descriptor/MojoDescriptor.java | 4 +--
maven-settings/src/main/mdo/settings.mdo | 2 +-
maven-settings/src/site/apt/index.apt | 2 +-
pom.xml | 34 ++++++++++---------
src/site/site.xml | 6 ++--
src/site/xdoc/index.xml | 16 ++++-----
24 files changed, 174 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 7a5ed4d..33a4be4 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
# Maven
-Maven is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.txt)
+Maven is available under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.txt)
- [Maven Issue Tracker](https://issues.apache.org/jira/browse/MNG)
- [Maven Wiki](https://cwiki.apache.org/confluence/display/MAVEN/Index)
-- [Building Maven](http://maven.apache.org/guides/development/guide-building-maven.html)
-- [Running Core ITs](http://maven.apache.org/core-its/core-it-suite/)
+- [Building Maven](https://maven.apache.org/guides/development/guide-building-maven.html)
+- [Running Core ITs](https://maven.apache.org/core-its/core-it-suite/)
## Bootstrapping Basics
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/README.txt
----------------------------------------------------------------------
diff --git a/apache-maven/README.txt b/apache-maven/README.txt
index cbaa7d4..6a1bafd 100644
--- a/apache-maven/README.txt
+++ b/apache-maven/README.txt
@@ -11,12 +11,12 @@
Documentation
-------------
- The most up-to-date documentation can be found at http://maven.apache.org/.
+ The most up-to-date documentation can be found at https://maven.apache.org/.
Release Notes
-------------
- The full list of changes can be found at http://maven.apache.org/docs/history.html.
+ The full list of changes can be found at https://maven.apache.org/docs/history.html.
System Requirements
-------------------
@@ -59,7 +59,7 @@
5) Run "mvn --version" to verify that it is correctly installed.
- For complete documentation, see http://maven.apache.org/download.html#Installation
+ For complete documentation, see https://maven.apache.org/download.html#Installation
Licensing
---------
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index b2fa989..ba7fda3 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -1,19 +1,23 @@
<?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.
- -->
+<!--
+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.
+-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/apache-maven/src/conf/toolchains.xml
----------------------------------------------------------------------
diff --git a/apache-maven/src/conf/toolchains.xml b/apache-maven/src/conf/toolchains.xml
index b737c17..b263072 100644
--- a/apache-maven/src/conf/toolchains.xml
+++ b/apache-maven/src/conf/toolchains.xml
@@ -63,7 +63,7 @@ under the License.
| Look for documentation of the toolchains-aware plugin which configuration elements
| can be used.
|
- | See also http://maven.apache.org/guides/mini/guide-using-toolchains.html
+ | See also https://maven.apache.org/guides/mini/guide-using-toolchains.html
|
| General example
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-artifact/pom.xml
----------------------------------------------------------------------
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index e024c65..e3943c9 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -1,14 +1,23 @@
<?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.
- -->
+<!--
+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.
+-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-compat/pom.xml
----------------------------------------------------------------------
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 138f013..3a0a45c 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -1,14 +1,23 @@
<?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.
- -->
+<!--
+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.
+-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
index fb7ca8b..4337bb6 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
@@ -29,7 +29,7 @@ import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.proxy.ProxyInfo;
/**
- * Manages <a href="http://maven.apache.org/wagon">Wagon</a> related operations in Maven.
+ * Manages <a href="https://maven.apache.org/wagon">Wagon</a> related operations in Maven.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index efff5c1..d147dd8 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -1,14 +1,23 @@
<?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.
- -->
+<!--
+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.
+-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
----------------------------------------------------------------------
diff --git a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
index 26c4667..01247ae 100644
--- a/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
+++ b/maven-core/src/main/java/org/apache/maven/AbstractMavenLifecycleParticipant.java
@@ -27,7 +27,7 @@ import org.apache.maven.execution.MavenSession;
* All callback methods (will) follow beforeXXX/afterXXX naming pattern to
* indicate at what lifecycle point it is being called.
*
- * @see <a href="http://maven.apache.org/examples/maven-3-lifecycle-extensions.html">example</a>
+ * @see <a href="https://maven.apache.org/examples/maven-3-lifecycle-extensions.html">example</a>
* @see <a href="https://issues.apache.org/jira/browse/MNG-4224">MNG-4224</a>
* @since 3.0-alpha-3
*/
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-core/src/main/mdo/toolchains.mdo
----------------------------------------------------------------------
diff --git a/maven-core/src/main/mdo/toolchains.mdo b/maven-core/src/main/mdo/toolchains.mdo
index 9b2aa90..4740d1b 100644
--- a/maven-core/src/main/mdo/toolchains.mdo
+++ b/maven-core/src/main/mdo/toolchains.mdo
@@ -124,9 +124,9 @@
<description>
<![CDATA[Type of toolchain:<ul>
<li><code>jdk</code> for
- <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html">JDK Standard Toolchain</a>,</li>
+ <a href="https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/jdk.html">JDK Standard Toolchain</a>,</li>
<li>other value for
- <a href="http://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/custom.html">Custom Toolchain</a></li>
+ <a href="https://maven.apache.org/plugins/maven-toolchains-plugin/toolchains/custom.html">Custom Toolchain</a></li>
</ul>
]]></description>
<type>String</type>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-core/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index f6c26fd..61d1772 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -51,7 +51,7 @@ Maven Core
({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
with its <<<DefaultClassRealmManager>>> implementation
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
- {{{http://plexus.codehaus.org/plexus-classworlds/}Plexus Classworlds}},
+ {{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
* {{{./extension.html}extension descriptor}},
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-embedder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 04b8da6..75b92c9 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -1,14 +1,23 @@
<?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.
- -->
+<!--
+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.
+-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-embedder/src/site/apt/logging.apt
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/logging.apt b/maven-embedder/src/site/apt/logging.apt
index d1eb53a..800857c 100644
--- a/maven-embedder/src/site/apt/logging.apt
+++ b/maven-embedder/src/site/apt/logging.apt
@@ -31,10 +31,10 @@ Maven Logging
* Logging API
Maven uses
- {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus
+ {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/package-summary.html}Plexus
Container logging API}}, like any other Plexus components, ie
- {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}}
- / {{{http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}.
+ {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/LoggerManager.html}LoggerManager}}
+ / {{{https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/org/codehaus/plexus/logging/Logger.html}Logger}}.
Starting with Maven 3.1.0:
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 0586648..fbfd417 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -1,14 +1,23 @@
<?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.
- -->
+<!--
+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.
+-->
<project xmlns="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">
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
----------------------------------------------------------------------
diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
index 648607c..299193d 100644
--- a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
+++ b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/package-info.java
@@ -2,10 +2,10 @@
/**
* XML reader and writer classes for Maven POM, generated from <code>maven.mdo</code> model.
* These classes use
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/pull/package-summary.html">plexus-utils'
* XML Pull Parser API</a> for their internal XML handling and
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> +
- * <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomBuilder.html">Xpp3DomBuilder</a> +
+ * <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3Dom.html">Xpp3Dom</a> for
* DOM content representation (see <code><configuration></code> elements).
*/
package org.apache.maven.model.io.xpp3;
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-model/src/main/mdo/maven.mdo
----------------------------------------------------------------------
diff --git a/maven-model/src/main/mdo/maven.mdo b/maven-model/src/main/mdo/maven.mdo
index 3f6b6d6..5eba3ea 100644
--- a/maven-model/src/main/mdo/maven.mdo
+++ b/maven-model/src/main/mdo/maven.mdo
@@ -54,8 +54,8 @@
<p>This is a reference for the Maven project descriptor used in Maven.</p>
<p>An XSD is available at:</p>
<ul>
- <li><a href="http://maven.apache.org/xsd/maven-v3_0_0.xsd">http://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
- <li><a href="http://maven.apache.org/xsd/maven-4.0.0.xsd">http://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li>
+ <li><a href="https://maven.apache.org/xsd/maven-v3_0_0.xsd">https://maven.apache.org/xsd/maven-v3_0_0.xsd</a> for Maven 1.1.</li>
+ <li><a href="https://maven.apache.org/xsd/maven-4.0.0.xsd">https://maven.apache.org/xsd/maven-4.0.0.xsd</a> for Maven 2.0.</li>
</ul>
]]>
</description>
@@ -701,7 +701,7 @@
These dependencies are used to construct a classpath for your
project during the build process. They are automatically downloaded from the
repositories defined in this project.
- See <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
+ See <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
dependency mechanism</a> for more information.
]]>
</description>
@@ -1397,7 +1397,7 @@
calculate the various classpaths used for compilation, testing, and so on.
It also assists in determining which artifacts to include in a distribution of
this project. For more information, see
- <a href="http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
+ <a href="https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html">the
dependency mechanism</a>.
]]>
</description>
@@ -2095,8 +2095,8 @@
The source control management system URL
that describes the repository and how to connect to the
repository. For more information, see the
- <a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a>
- and <a href="http://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
+ <a href="https://maven.apache.org/scm/scm-url-format.html">URL format</a>
+ and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
This connection is read-only.
]]>
</description>
@@ -2139,8 +2139,8 @@
The source control management system URL
that describes the repository and how to connect to the
repository. For more information, see the
- <a href="http://maven.apache.org/scm/scm-url-format.html">URL format</a>
- and <a href="http://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
+ <a href="https://maven.apache.org/scm/scm-url-format.html">URL format</a>
+ and <a href="https://maven.apache.org/scm/scms-overview.html">list of supported SCMs</a>.
This connection is read-only.
<br /><b>Default value is</b>: parent value [+ path adjustment] + artifactId
]]>
@@ -2642,8 +2642,8 @@
<li><code>combine.children</code>: available values are <code>merge</code> (default) and <code>append</code>,</li>
<li><code>combine.self</code>: available values are <code>merge</code> (default) and <code>override</code>.</li>
</ul>
- <p>See <a href="http://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
- <a href="http://plexus.codehaus.org/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
+ <p>See <a href="https://maven.apache.org/pom.html#Plugins">POM Reference documentation</a> and
+ <a href="https://codehaus-plexus.github.io/plexus-utils/apidocs/org/codehaus/plexus/util/xml/Xpp3DomUtils.html">Xpp3DomUtils</a>
for more information.</p>
]]>
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-model/src/site/xdoc/navigation.xml
----------------------------------------------------------------------
diff --git a/maven-model/src/site/xdoc/navigation.xml b/maven-model/src/site/xdoc/navigation.xml
deleted file mode 100644
index 110a953..0000000
--- a/maven-model/src/site/xdoc/navigation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-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.
--->
-<project name="Project Descriptor">
- <title>Project Descriptor</title>
- <body>
- <breadcrumbs>
- <item name="Apache" href="http://www.apache.org" />
- <item name="Maven" href="http://maven.apache.org/" />
- <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x/" />
- <item name="Reference" href="http://maven.apache.org/maven-1.x/reference/index.html" />
- </breadcrumbs>
- <menu name="Maven Project Descriptor">
- <item name="About" href="/index.html" />
- <item name="Model Documentation" href="/maven.html" />
- <item name="API Docs" href="/apidocs/" target="_blank" />
- </menu>
- </body>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
index d33e9bf..43fffb5 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/AbstractMojo.java
@@ -96,7 +96,7 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* The execution of either will not affect the current project, but instead make available the
* <code>${executedProject}</code> expression if required. An alternate lifecycle can also be provided:
* for more information see the documentation on the
- * <a href="http://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"
+ * <a href="https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html"
* target="_blank">build lifecycle</a>.
* </td>
* </tr>
@@ -133,9 +133,9 @@ import org.apache.maven.plugin.logging.SystemStreamLog;
* </tr>
* </table>
*
- * @see <a href="http://maven.apache.org/guides/plugin/guide-java-plugin-development.html" target="_blank">Guide to Developing Java Plugins</a>
- * @see <a href="http://maven.apache.org/guides/mini/guide-configuring-plugins.html" target="_blank">Guide to Configuring Plug-ins</a>
- * @see <a href="http://maven.apache.org/developers/mojo-api-specification.html" target="_blank">Mojo API Specification</a>
+ * @see <a href="https://maven.apache.org/guides/plugin/guide-java-plugin-development.html" target="_blank">Guide to Developing Java Plugins</a>
+ * @see <a href="https://maven.apache.org/guides/mini/guide-configuring-plugins.html" target="_blank">Guide to Configuring Plug-ins</a>
+ * @see <a href="https://maven.apache.org/developers/mojo-api-specification.html" target="_blank">Mojo API Specification</a>
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author jdcasey
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
----------------------------------------------------------------------
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
index 697d95a..515b110 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/MojoDescriptor.java
@@ -33,8 +33,8 @@ import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
* The bean containing the Mojo descriptor.
* <br/>
* For more information about the usage tag, have a look to:
- * <a href="http://maven.apache.org/developers/mojo-api-specification.html">
- * http://maven.apache.org/developers/mojo-api-specification.html</a>
+ * <a href="https://maven.apache.org/developers/mojo-api-specification.html">
+ * https://maven.apache.org/developers/mojo-api-specification.html</a>
*
* @todo is there a need for the delegation of MavenMojoDescriptor to this?
* Why not just extend ComponentDescriptor here?
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-settings/src/main/mdo/settings.mdo
----------------------------------------------------------------------
diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo
index 6d560cc..7fa00de 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -33,7 +33,7 @@
<p>The default location for the settings file is <i>~/.m2/settings.xml</i></p>
<p>An XSD is available at:</p>
<ul>
- <li><a href="http://maven.apache.org/xsd/settings-1.0.0.xsd">http://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li>
+ <li><a href="https://maven.apache.org/xsd/settings-1.0.0.xsd">https://maven.apache.org/xsd/settings-1.0.0.xsd</a>.</li>
</ul>
]]>
</description>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/maven-settings/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-settings/src/site/apt/index.apt b/maven-settings/src/site/apt/index.apt
index 6e404e8..17eaf8c 100644
--- a/maven-settings/src/site/apt/index.apt
+++ b/maven-settings/src/site/apt/index.apt
@@ -33,4 +33,4 @@ Maven Settings Model
* A {{{./settings.html}Descriptor Reference}}
- * An {{{http://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}}
+ * An {{{https://maven.apache.org/xsd/settings-1.0.0.xsd}XSD}}
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fba262b..3f9ce4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,18 +1,22 @@
<?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.
+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.
-->
<project xmlns="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">
@@ -38,7 +42,7 @@
number of other development tools for reporting or the build
process.
</description>
- <url>http://maven.apache.org/ref/${project.version}/</url>
+ <url>https://maven.apache.org/ref/${project.version}/</url>
<inceptionYear>2001</inceptionYear>
<properties>
@@ -105,7 +109,7 @@
<url>https://builds.apache.org/job/maven-3.x/</url>
</ciManagement>
<distributionManagement>
- <downloadUrl>http://maven.apache.org/download.html</downloadUrl>
+ <downloadUrl>https://maven.apache.org/download.html</downloadUrl>
<site>
<id>apache.website</id>
<url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/components/${maven.site.path}</url>
@@ -635,7 +639,7 @@
<quiet>true</quiet>
<links combine.children="append">
<link>http://download.eclipse.org/aether/aether-core/${aetherVersion}/apidocs/</link>
- <link>http://plexus.codehaus.org/plexus-containers/plexus-container-default/apidocs/</link>
+ <link>https://codehaus-plexus.github.io/plexus-containers/plexus-container-default/apidocs/</link>
</links>
</configuration>
<reportSets>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 86d5ecb..6dd30a6 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -25,11 +25,11 @@ under the License.
<bannerLeft>
<name>${project.name}</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+ <src>https://maven.apache.org/images/apache-maven-project.png</src>
+ <href>https://maven.apache.org/</href>
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maventxt_logo_200.gif</src>
+ <src>https://maven.apache.org/images/maventxt_logo_200.gif</src>
</bannerRight>
<skin>
http://git-wip-us.apache.org/repos/asf/maven/blob/84085c0a/src/site/xdoc/index.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 11fa0de..4cd2f66 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -35,7 +35,7 @@
builds, dependency management, documentation creation, site
publication, and distribution publication are all controlled from
<a href="./maven-model/maven.html">the <code>pom.xml</code> declarative file</a>. Maven can be extended by
- <a href="http://maven.apache.org/plugins/">plugins</a> to utilise a
+ <a href="https://maven.apache.org/plugins/">plugins</a> to utilise a
number of other development tools for reporting or the build
process.</p>
@@ -58,14 +58,14 @@
<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="551,58,707,94" alt="commons-cli" href="http://commons.apache.org/cli/" />
- <area shape="rect" coords="551,116,739,152" alt="wagon-provider-api" href="http://maven.apache.org/wagon/wagon-provider-api/" />
+ <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="hhttps://github.com/codehaus-plexus/plexus-cipher" />
- <area shape="rect" coords="551,284,707,320" alt="plexus-interpolation" href="https://github.com/codehaus-plexus/plexus-interpolation" />
- <area shape="rect" coords="551,359,776,395" alt="plexus-component-annotations" href="https://github.com/codehaus-plexus/plexus-containers" />
- <area shape="rect" coords="550,401,682,437" alt="plexus-classworlds" href="https://github.com/codehaus-plexus/plexus-classworlds" />
- <area shape="rect" coords="685,455,775,491" alt="plexus-utils" href="https://github.com/codehaus-plexus/plexus-utils" />
- <area shape="rect" coords="542,167,783,502" alt="plexus" href="https://github.com/codehaus-plexus" />
+ <area shape="rect" coords="581,230,660,265" alt="plexus-cipher" href="https://github.com/codehaus-plexus/plexus-cipher" />
+ <area shape="rect" coords="551,284,707,320" alt="plexus-interpolation" href="https://codehaus-plexus.github.io/plexus-interpolation" />
+ <area shape="rect" coords="551,359,776,395" alt="plexus-component-annotations" href="https://codehaus-plexus.github.io/plexus-containers" />
+ <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/" />
[10/11] maven git commit: o Updated to remove errors reported by
Checkstyle.
Posted by kh...@apache.org.
o Updated to remove errors reported by Checkstyle.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/a99a7898
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/a99a7898
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/a99a7898
Branch: refs/heads/MNG-6014
Commit: a99a78984c1f20394abf6e76b6167b9e61e6163c
Parents: 311fc62
Author: Christian Schulte <sc...@apache.org>
Authored: Tue Jun 14 21:26:56 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 08:09:30 2017 +0100
----------------------------------------------------------------------
.../UnknownRepositoryLayoutException.java | 2 +-
.../DefaultArtifactRepositoryFactory.java | 4 +-
.../repository/layout/FlatRepositoryLayout.java | 6 +-
.../artifact/resolver/ArtifactResolver.java | 62 +++++++-------
.../resolver/DefaultArtifactResolver.java | 12 ++-
.../profiles/activation/ProfileActivator.java | 4 +-
.../org/apache/maven/project/ProjectUtils.java | 15 ++--
.../AbstractStringBasedModelInterpolator.java | 22 +++--
.../StringSearchModelInterpolator.java | 14 ++--
.../project/path/DefaultPathTranslator.java | 10 +--
.../repository/MetadataResolutionResult.java | 8 +-
.../repository/legacy/DefaultWagonManager.java | 85 +++++++++++++-------
.../legacy/LegacyRepositorySystem.java | 31 ++++---
.../maven/repository/legacy/WagonManager.java | 6 +-
.../repository/ArtifactRepositoryFactory.java | 6 +-
.../DefaultLegacyArtifactCollector.java | 84 +++++++++++--------
.../resolver/LegacyArtifactCollector.java | 9 ++-
.../repository/metadata/MetadataGraph.java | 3 +-
.../repository/metadata/MetadataGraphEdge.java | 3 +-
.../MetadataGraphTransformationException.java | 4 +-
.../usability/plugin/ExpressionDocumenter.java | 18 +++--
21 files changed, 236 insertions(+), 172 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
index 5abe110..e23bea9 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/UnknownRepositoryLayoutException.java
@@ -23,7 +23,7 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
/**
* Exception which is meant to occur when a layout specified for a particular
- * repository doesn't have a corresponding {@link ArtifactRepositoryLayout}
+ * repository doesn't have a corresponding {@link org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout}
* component in the current container.
*
* @author jdcasey
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
index 658dbda..0f69835 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java
@@ -81,7 +81,9 @@ public class DefaultArtifactRepositoryFactory
ArtifactRepositoryPolicy snapshots,
ArtifactRepositoryPolicy releases )
{
- return injectSession( factory.createArtifactRepository( id, url, repositoryLayout, snapshots, releases ), true );
+ return injectSession( factory.createArtifactRepository( id, url, repositoryLayout, snapshots, releases ),
+ true );
+
}
public void setGlobalUpdatePolicy( String updatePolicy )
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
index 8553a31..58143e0 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/FlatRepositoryLayout.java
@@ -25,15 +25,11 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.codehaus.plexus.component.annotations.Component;
-/**
- * The code in this class is taken from DefaultRepositorylayout, located at:
- * http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/DefaultRepositoryLayout.java
- *
- */
@Component( role = ArtifactRepositoryLayout.class, hint = "flat" )
public class FlatRepositoryLayout
implements ArtifactRepositoryLayout
{
+
private static final char ARTIFACT_SEPARATOR = '-';
private static final char GROUP_SEPARATOR = '.';
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
index 7b5faa1..d36ebde 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolver.java
@@ -39,61 +39,60 @@ public interface ArtifactResolver
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
// The rest is deprecated
-
// USED BY MAVEN ASSEMBLY PLUGIN 2.2-beta-2
@Deprecated
String ROLE = ArtifactResolver.class.getName();
// USED BY SUREFIRE, DEPENDENCY PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY MAVEN ASSEMBLY PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY MAVEN ASSEMBLY PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY INVOKER PLUGIN
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- List<ArtifactRepository> remoteRepositories,
- ArtifactRepository localRepository, ArtifactMetadataSource source )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository, ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException;
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String,Artifact> managedVersions, ArtifactRepository localRepository,
- List<ArtifactRepository> remoteRepositories,
- ArtifactMetadataSource source, ArtifactFilter filter,
- List<ResolutionListener> listeners )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactMetadataSource source, ArtifactFilter filter,
+ List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
@Deprecated
- ArtifactResolutionResult resolveTransitively(
- Set<Artifact> artifacts, Artifact originatingArtifact,
- List<ArtifactRepository> remoteRepositories,
- ArtifactRepository localRepository, ArtifactMetadataSource source,
- List<ResolutionListener> listeners )
+ ArtifactResolutionResult resolveTransitively(
+ Set<Artifact> artifacts, Artifact originatingArtifact,
+ List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository, ArtifactMetadataSource source,
+ List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException;
// USED BY REMOTE RESOURCES PLUGIN, DEPENDENCY PLUGIN, SHADE PLUGIN
@@ -112,4 +111,5 @@ public interface ArtifactResolver
void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException;
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
index 5e281c1..6a5f330 100644
--- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
+++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
@@ -332,10 +332,16 @@ public class DefaultArtifactResolver
throws ArtifactResolutionException,
ArtifactNotFoundException
{
- ArtifactResolutionRequest request =
- new ArtifactResolutionRequest().setArtifact( originatingArtifact ).setResolveRoot( false )
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest().
+ setArtifact( originatingArtifact ).
+ setResolveRoot( false ).
// This is required by the surefire plugin
- .setArtifactDependencies( artifacts ).setManagedVersionMap( managedVersions ).setLocalRepository( localRepository ).setRemoteRepositories( remoteRepositories ).setCollectionFilter( filter ).setListeners( listeners );
+ setArtifactDependencies( artifacts ).
+ setManagedVersionMap( managedVersions ).
+ setLocalRepository( localRepository ).
+ setRemoteRepositories( remoteRepositories ).
+ setCollectionFilter( filter ).
+ setListeners( listeners );
injectSession2( request, legacySupport.getSession() );
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
index d0a9ecb..2688785 100644
--- a/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
+++ b/maven-compat/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
@@ -24,10 +24,12 @@ import org.apache.maven.model.Profile;
@Deprecated
public interface ProfileActivator
{
- final String ROLE = ProfileActivator.class.getName();
+
+ String ROLE = ProfileActivator.class.getName();
boolean canDetermineActivation( Profile profile );
boolean isActive( Profile profile )
throws ProfileActivationException;
+
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
index d15a892..72ea6d1 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java
@@ -45,9 +45,8 @@ public final class ProjectUtils
{
}
- public static List<ArtifactRepository> buildArtifactRepositories( List<Repository> repositories,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer c )
+ public static List<ArtifactRepository> buildArtifactRepositories(
+ List<Repository> repositories, ArtifactRepositoryFactory artifactRepositoryFactory, PlexusContainer c )
throws InvalidRepositoryException
{
@@ -61,17 +60,15 @@ public final class ProjectUtils
return remoteRepositories;
}
- public static ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository repo,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer c )
+ public static ArtifactRepository buildDeploymentArtifactRepository(
+ DeploymentRepository repo, ArtifactRepositoryFactory artifactRepositoryFactory, PlexusContainer c )
throws InvalidRepositoryException
{
return buildArtifactRepository( repo, artifactRepositoryFactory, c );
}
- public static ArtifactRepository buildArtifactRepository( Repository repo,
- ArtifactRepositoryFactory artifactRepositoryFactory,
- PlexusContainer c )
+ public static ArtifactRepository buildArtifactRepository(
+ Repository repo, ArtifactRepositoryFactory artifactRepositoryFactory, PlexusContainer c )
throws InvalidRepositoryException
{
RepositorySystem repositorySystem = rs( c );
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
index 568196c..c40b164 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
@@ -65,6 +65,7 @@ public abstract class AbstractStringBasedModelInterpolator
extends AbstractLogEnabled
implements ModelInterpolator, Initializable
{
+
private static final List<String> PROJECT_PREFIXES = Arrays.asList( "pom.", "project." );
private static final List<String> TRANSLATED_PATH_EXPRESSIONS;
@@ -122,8 +123,9 @@ public abstract class AbstractStringBasedModelInterpolator
* <br/>
* <b>NOTE:</b> This will result in a different instance of Model being returned!!!
*
- * @param model The inbound Model instance, to serialize and reference for expression resolution
+ * @param model The inbound Model instance, to serialize and reference for expression resolution
* @param context The other context map to be used during resolution
+ *
* @return The resolved instance of the inbound Model. This is a different instance!
*
* @deprecated Use {@link ModelInterpolator#interpolate(Model, File, ProjectBuilderConfiguration, boolean)} instead.
@@ -227,6 +229,7 @@ public abstract class AbstractStringBasedModelInterpolator
ValueSource basedirValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false )
{
+
public Object getValue( String expression )
{
if ( projectDir != null && "basedir".equals( expression ) )
@@ -235,9 +238,11 @@ public abstract class AbstractStringBasedModelInterpolator
}
return null;
}
+
}, PROJECT_PREFIXES, true );
ValueSource baseUriValueSource = new PrefixedValueSourceWrapper( new AbstractValueSource( false )
{
+
public Object getValue( String expression )
{
if ( projectDir != null && "baseUri".equals( expression ) )
@@ -246,6 +251,7 @@ public abstract class AbstractStringBasedModelInterpolator
}
return null;
}
+
}, PROJECT_PREFIXES, false );
List<ValueSource> valueSources = new ArrayList<>( 9 );
@@ -260,10 +266,12 @@ public abstract class AbstractStringBasedModelInterpolator
valueSources.add( new MapBasedValueSource( config.getExecutionProperties() ) );
valueSources.add( new AbstractValueSource( false )
{
+
public Object getValue( String expression )
{
return config.getExecutionProperties().getProperty( "env." + expression );
}
+
} );
valueSources.add( modelValueSource2 );
@@ -273,11 +281,13 @@ public abstract class AbstractStringBasedModelInterpolator
protected List<InterpolationPostProcessor> createPostProcessors( final Model model, final File projectDir,
final ProjectBuilderConfiguration config )
{
- return Collections.singletonList( (InterpolationPostProcessor) new PathTranslatingPostProcessor(
- PROJECT_PREFIXES,
- TRANSLATED_PATH_EXPRESSIONS,
- projectDir,
- pathTranslator ) );
+ return Collections.singletonList(
+ (InterpolationPostProcessor) new PathTranslatingPostProcessor(
+ PROJECT_PREFIXES,
+ TRANSLATED_PATH_EXPRESSIONS,
+ projectDir,
+ pathTranslator ) );
+
}
@SuppressWarnings( "unchecked" )
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
index 13ceaf7..ecde27f 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
@@ -47,8 +47,8 @@ public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
- private static final Map<Class<?>, Field[]> fieldsByClass = new WeakHashMap<>();
- private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = new WeakHashMap<>();
+ private static final Map<Class<?>, Field[]> FIELDS_BY_CLASS = new WeakHashMap<>();
+ private static final Map<Class<?>, Boolean> PRIMITIVE_BY_CLASS = new WeakHashMap<>();
public StringSearchModelInterpolator()
{
@@ -161,11 +161,11 @@ public class StringSearchModelInterpolator
}
else if ( isQualifiedForInterpolation( cls ) )
{
- Field[] fields = fieldsByClass.get( cls );
+ Field[] fields = FIELDS_BY_CLASS.get( cls );
if ( fields == null )
{
fields = cls.getDeclaredFields();
- fieldsByClass.put( cls, fields );
+ FIELDS_BY_CLASS.put( cls, fields );
}
for ( Field field : fields )
@@ -350,12 +350,12 @@ public class StringSearchModelInterpolator
private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType )
{
- if ( !fieldIsPrimitiveByClass.containsKey( fieldType ) )
+ if ( !PRIMITIVE_BY_CLASS.containsKey( fieldType ) )
{
- fieldIsPrimitiveByClass.put( fieldType, fieldType.isPrimitive() );
+ PRIMITIVE_BY_CLASS.put( fieldType, fieldType.isPrimitive() );
}
- if ( fieldIsPrimitiveByClass.get( fieldType ) )
+ if ( PRIMITIVE_BY_CLASS.get( fieldType ) )
{
return false;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
index b4061ec..eb3f24d 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
@@ -125,17 +125,13 @@ public class DefaultPathTranslator
if ( s != null )
{
String basedirExpr = null;
- for ( String BASEDIR_EXPRESSION : BASEDIR_EXPRESSIONS )
+ for ( String expression : BASEDIR_EXPRESSIONS )
{
- basedirExpr = BASEDIR_EXPRESSION;
- if ( s.startsWith( basedirExpr ) )
+ if ( s.startsWith( expression ) )
{
+ basedirExpr = expression;
break;
}
- else
- {
- basedirExpr = null;
- }
}
if ( basedirExpr != null )
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
index cfdd7f9..bd5436c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java
@@ -118,7 +118,7 @@ public class MetadataResolutionResult
public List<Artifact> getMissingArtifacts()
{
- return missingArtifacts == null ? Collections.<Artifact> emptyList() : missingArtifacts;
+ return missingArtifacts == null ? Collections.<Artifact>emptyList() : missingArtifacts;
}
public MetadataResolutionResult addMissingArtifact( Artifact artifact )
@@ -148,7 +148,7 @@ public class MetadataResolutionResult
public List<Exception> getExceptions()
{
- return exceptions == null ? Collections.<Exception> emptyList() : exceptions;
+ return exceptions == null ? Collections.<Exception>emptyList() : exceptions;
}
// ------------------------------------------------------------------------
@@ -185,7 +185,7 @@ public class MetadataResolutionResult
public List<Exception> getVersionRangeViolations()
{
- return versionRangeViolations == null ? Collections.<Exception> emptyList() : versionRangeViolations;
+ return versionRangeViolations == null ? Collections.<Exception>emptyList() : versionRangeViolations;
}
// ------------------------------------------------------------------------
@@ -217,7 +217,7 @@ public class MetadataResolutionResult
public List<ArtifactResolutionException> getMetadataResolutionExceptions()
{
- return metadataResolutionExceptions == null ? Collections.<ArtifactResolutionException> emptyList()
+ return metadataResolutionExceptions == null ? Collections.<ArtifactResolutionException>emptyList()
: metadataResolutionExceptions;
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 6fa72ce..b8835b5 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -63,10 +63,19 @@ import org.eclipse.aether.util.ConfigUtils;
public class DefaultWagonManager
implements WagonManager
{
- private static final String[] CHECKSUM_IDS = { "md5", "sha1" };
- /** have to match the CHECKSUM_IDS */
- private static final String[] CHECKSUM_ALGORITHMS = { "MD5", "SHA-1" };
+ private static final String[] CHECKSUM_IDS =
+ {
+ "md5", "sha1"
+ };
+
+ /**
+ * have to match the CHECKSUM_IDS
+ */
+ private static final String[] CHECKSUM_ALGORITHMS =
+ {
+ "MD5", "SHA-1"
+ };
@Requirement
private Logger logger;
@@ -80,7 +89,6 @@ public class DefaultWagonManager
@Requirement
private LegacySupport legacySupport;
-
//
// Retriever
//
@@ -96,14 +104,15 @@ public class DefaultWagonManager
if ( !policy.isEnabled() )
{
logger.debug( "Skipping disabled repository " + repository.getId() + " for resolution of "
- + artifact.getId() );
+ + artifact.getId() );
+
}
else if ( artifact.isSnapshot() || !artifact.getFile().exists() )
{
if ( force || updateCheckManager.isUpdateRequired( artifact, repository ) )
{
logger.debug( "Trying repository " + repository.getId() + " for resolution of " + artifact.getId()
- + " from " + remotePath );
+ + " from " + remotePath );
try
{
@@ -133,17 +142,21 @@ public class DefaultWagonManager
String error = updateCheckManager.getError( artifact, repository );
if ( error != null )
{
- throw new TransferFailedException( "Failure to resolve " + remotePath + " from "
- + repository.getUrl() + " was cached in the local repository. "
- + "Resolution will not be reattempted until the update interval of " + repository.getId()
- + " has elapsed or updates are forced. Original error: " + error );
+ throw new TransferFailedException(
+ "Failure to resolve " + remotePath + " from " + repository.getUrl()
+ + " was cached in the local repository. "
+ + "Resolution will not be reattempted until the update interval of "
+ + repository.getId() + " has elapsed or updates are forced. Original error: " + error );
+
}
else
{
- throw new ResourceDoesNotExistException( "Failure to resolve " + remotePath + " from "
- + repository.getUrl() + " was cached in the local repository. "
- + "Resolution will not be reattempted until the update interval of " + repository.getId()
- + " has elapsed or updates are forced." );
+ throw new ResourceDoesNotExistException(
+ "Failure to resolve " + remotePath + " from " + repository.getUrl()
+ + " was cached in the local repository. "
+ + "Resolution will not be reattempted until the update interval of "
+ + repository.getId() + " has elapsed or updates are forced." );
+
}
}
}
@@ -174,7 +187,8 @@ public class DefaultWagonManager
// because we want to cycle through them all before squawking.
logger.debug( "Unable to find artifact " + artifact.getId() + " in repository " + repository.getId()
- + " (" + repository.getUrl() + ")", e );
+ + " (" + repository.getUrl() + ")", e );
+
}
catch ( TransferFailedException e )
{
@@ -183,6 +197,7 @@ public class DefaultWagonManager
String msg =
"Unable to get artifact " + artifact.getId() + " from repository " + repository.getId() + " ("
+ repository.getUrl() + "): " + e.getMessage();
+
if ( logger.isDebugEnabled() )
{
logger.warn( msg, e );
@@ -233,6 +248,7 @@ public class DefaultWagonManager
*
* @param wagon
* @param repository
+ *
* @throws ConnectionException
* @throws AuthenticationException
*/
@@ -241,13 +257,15 @@ public class DefaultWagonManager
{
// MNG-5509
// See org.eclipse.aether.connector.wagon.WagonRepositoryConnector.connectWagon(Wagon)
- if( legacySupport.getRepositorySession() != null )
+ if ( legacySupport.getRepositorySession() != null )
{
- String userAgent = ConfigUtils.getString( legacySupport.getRepositorySession(), null, ConfigurationProperties.USER_AGENT );
- if( userAgent == null)
+ String userAgent = ConfigUtils.getString( legacySupport.getRepositorySession(), null,
+ ConfigurationProperties.USER_AGENT );
+
+ if ( userAgent == null )
{
Properties headers = new Properties();
-
+
headers.put( "User-Agent", ConfigUtils.getString( legacySupport.getRepositorySession(), "Maven",
ConfigurationProperties.USER_AGENT ) );
try
@@ -269,18 +287,21 @@ public class DefaultWagonManager
if ( repository.getProxy() != null && logger.isDebugEnabled() )
{
logger.debug( "Using proxy " + repository.getProxy().getHost() + ":" + repository.getProxy().getPort()
- + " for " + repository.getUrl() );
+ + " for " + repository.getUrl() );
+
}
if ( repository.getAuthentication() != null && repository.getProxy() != null )
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ), authenticationInfo( repository ),
proxyInfo( repository ) );
+
}
else if ( repository.getAuthentication() != null )
{
wagon.connect( new Repository( repository.getId(), repository.getUrl() ),
authenticationInfo( repository ) );
+
}
else if ( repository.getProxy() != null )
{
@@ -414,10 +435,10 @@ public class DefaultWagonManager
}
catch ( ChecksumFailedException e )
{
- // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the checksum
- // doesn't match. This could be a problem with the server (ibiblio HTTP-200 error page), so we'll
- // try this up to two times. On the second try, we'll handle it as a bona-fide error, based on the
- // repository's checksum checking policy.
+ // if we catch a ChecksumFailedException, it means the transfer/read succeeded, but the
+ // checksum doesn't match. This could be a problem with the server (ibiblio HTTP-200 error
+ // page), so we'll try this up to two times. On the second try, we'll handle it as a bona-fide
+ // error, based on the repository's checksum checking policy.
if ( firstRun )
{
logger.warn( "*** CHECKSUM FAILED - " + e.getMessage() + " - RETRYING" );
@@ -507,7 +528,6 @@ public class DefaultWagonManager
// File.renameTo operation doesn't really work across file systems.
// So we will attempt to do a File.renameTo for efficiency and atomicity, if this fails
// then we will use a brute force copy and delete the temporary file.
-
if ( !temp.renameTo( destination ) )
{
try
@@ -522,7 +542,8 @@ public class DefaultWagonManager
catch ( IOException e )
{
throw new TransferFailedException( "Error copying temporary file to the final destination: "
- + e.getMessage(), e );
+ + e.getMessage(), e );
+
}
}
}
@@ -642,9 +663,9 @@ public class DefaultWagonManager
cleanupTemporaryFiles( temporaryFiles );
// Remove every checksum listener
- for ( String aCHECKSUM_IDS : CHECKSUM_IDS )
+ for ( String id : CHECKSUM_IDS )
{
- TransferListener checksumListener = checksums.get( aCHECKSUM_IDS );
+ TransferListener checksumListener = checksums.get( id );
if ( checksumListener != null )
{
wagon.removeTransferListener( checksumListener );
@@ -721,7 +742,7 @@ public class DefaultWagonManager
// check for 'ALGO (name) = CHECKSUM' like used by openssl
if ( expectedChecksum.regionMatches( true, 0, "MD", 0, 2 )
- || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
+ || expectedChecksum.regionMatches( true, 0, "SHA", 0, 3 ) )
{
int lastSpacePos = expectedChecksum.lastIndexOf( ' ' );
expectedChecksum = expectedChecksum.substring( lastSpacePos + 1 );
@@ -752,7 +773,8 @@ public class DefaultWagonManager
else
{
throw new ChecksumFailedException( "Checksum failed on download: local = '" + actualChecksum
- + "'; remote = '" + expectedChecksum + "'" );
+ + "'; remote = '" + expectedChecksum + "'" );
+
}
}
catch ( IOException e )
@@ -814,7 +836,8 @@ public class DefaultWagonManager
catch ( ComponentLookupException e )
{
throw new UnsupportedProtocolException( "Cannot find wagon which supports the requested protocol: "
- + protocol, e );
+ + protocol, e );
+
}
return wagon;
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index 866968b..f8d4531 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -353,22 +353,21 @@ public class LegacyRepositorySystem
return artifactResolver.resolve( request );
}
- /*
- public void addProxy( String protocol, String host, int port, String username, String password, String nonProxyHosts )
- {
- ProxyInfo proxyInfo = new ProxyInfo();
- proxyInfo.setHost( host );
- proxyInfo.setType( protocol );
- proxyInfo.setPort( port );
- proxyInfo.setNonProxyHosts( nonProxyHosts );
- proxyInfo.setUserName( username );
- proxyInfo.setPassword( password );
-
- proxies.put( protocol, proxyInfo );
-
- wagonManager.addProxy( protocol, host, port, username, password, nonProxyHosts );
- }
- */
+// public void addProxy( String protocol, String host, int port, String username, String password,
+// String nonProxyHosts )
+// {
+// ProxyInfo proxyInfo = new ProxyInfo();
+// proxyInfo.setHost( host );
+// proxyInfo.setType( protocol );
+// proxyInfo.setPort( port );
+// proxyInfo.setNonProxyHosts( nonProxyHosts );
+// proxyInfo.setUserName( username );
+// proxyInfo.setPassword( password );
+//
+// proxies.put( protocol, proxyInfo );
+//
+// wagonManager.addProxy( protocol, host, port, username, password, nonProxyHosts );
+// }
public List<ArtifactRepository> getEffectiveRepositories( List<ArtifactRepository> repositories )
{
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
index 73ead26..35fcf42 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/WagonManager.java
@@ -45,7 +45,8 @@ public interface WagonManager
//
// Retriever
//
- void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener transferListener, boolean force )
+ void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener transferListener,
+ boolean force )
throws TransferFailedException, ResourceDoesNotExistException;
void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories,
@@ -71,7 +72,8 @@ public interface WagonManager
TransferListener downloadMonitor )
throws TransferFailedException;
- void putRemoteFile( ArtifactRepository repository, File source, String remotePath, TransferListener downloadMonitor )
+ void putRemoteFile( ArtifactRepository repository, File source, String remotePath,
+ TransferListener downloadMonitor )
throws TransferFailedException;
void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
index b982f91..aeb5739 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/ArtifactRepositoryFactory.java
@@ -37,7 +37,8 @@ public interface ArtifactRepositoryFactory
throws UnknownRepositoryLayoutException;
@Deprecated
- ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId, boolean uniqueVersion )
+ ArtifactRepository createDeploymentArtifactRepository( String id, String url, String layoutId,
+ boolean uniqueVersion )
throws UnknownRepositoryLayoutException;
ArtifactRepository createDeploymentArtifactRepository( String id, String url, ArtifactRepositoryLayout layout,
@@ -48,7 +49,8 @@ public interface ArtifactRepositoryFactory
throws UnknownRepositoryLayoutException;
ArtifactRepository createArtifactRepository( String id, String url, ArtifactRepositoryLayout repositoryLayout,
- ArtifactRepositoryPolicy snapshots, ArtifactRepositoryPolicy releases );
+ ArtifactRepositoryPolicy snapshots,
+ ArtifactRepositoryPolicy releases );
void setGlobalUpdatePolicy( String snapshotPolicy );
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
index 77fc705..4601eee 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
@@ -63,6 +63,7 @@ import org.codehaus.plexus.logging.Logger;
public class DefaultLegacyArtifactCollector
implements LegacyArtifactCollector
{
+
@Requirement( hint = "nearest" )
private ConflictResolver defaultConflictResolver;
@@ -102,7 +103,8 @@ public class DefaultLegacyArtifactCollector
}
public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
- Map<String, Artifact> managedVersions, ArtifactResolutionRequest repositoryRequest,
+ Map<String, Artifact> managedVersions,
+ ArtifactResolutionRequest repositoryRequest,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
@@ -206,7 +208,8 @@ public class DefaultLegacyArtifactCollector
* @param originatingArtifact artifact we are processing
* @param managedVersions original managed versions
*/
- private ManagedVersionMap getManagedVersionsMap( Artifact originatingArtifact, Map<String,Artifact> managedVersions )
+ private ManagedVersionMap getManagedVersionsMap( Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions )
{
ManagedVersionMap versionMap;
if ( ( managedVersions != null ) && ( managedVersions instanceof ManagedVersionMap ) )
@@ -218,7 +221,7 @@ public class DefaultLegacyArtifactCollector
versionMap = new ManagedVersionMap( managedVersions );
}
- /* remove the originating artifact if it is also in managed versions to avoid being modified during resolution */
+ // remove the originating artifact if it is also in managed versions to avoid being modified during resolution
Artifact managedOriginatingArtifact = versionMap.get( originatingArtifact.getDependencyConflictId() );
if ( managedOriginatingArtifact != null )
@@ -286,7 +289,10 @@ public class DefaultLegacyArtifactCollector
// Select an appropriate available version from the (now restricted) range
// Note this version was selected before to get the appropriate POM
// But it was reset by the call to setVersionRange on restricting the version
- ResolutionNode[] resetNodes = { previous, node };
+ ResolutionNode[] resetNodes =
+ {
+ previous, node
+ };
for ( int j = 0; j < 2; j++ )
{
Artifact resetArtifact = resetNodes[j].getArtifact();
@@ -306,6 +312,7 @@ public class DefaultLegacyArtifactCollector
{
MetadataResolutionRequest metadataRequest =
new DefaultMetadataResolutionRequest( request );
+
metadataRequest.setArtifact( resetArtifact );
versions = source.retrieveAvailableVersions( metadataRequest );
resetArtifact.setAvailableVersions( versions );
@@ -314,25 +321,29 @@ public class DefaultLegacyArtifactCollector
{
resetArtifact.setDependencyTrail( node.getDependencyTrail() );
throw new ArtifactResolutionException(
- "Unable to get dependency information: "
- + e.getMessage(), resetArtifact,
- request.getRemoteRepositories(), e );
+ "Unable to get dependency information: "
+ + e.getMessage(), resetArtifact, request.getRemoteRepositories(),
+ e );
+
}
}
// end hack
// MNG-2861: match version can return null
- ArtifactVersion selectedVersion =
- resetArtifact.getVersionRange().matchVersion( resetArtifact.getAvailableVersions() );
+ ArtifactVersion selectedVersion = resetArtifact.getVersionRange().
+ matchVersion( resetArtifact.getAvailableVersions() );
+
if ( selectedVersion != null )
{
resetArtifact.selectVersion( selectedVersion.toString() );
}
else
{
- throw new OverConstrainedVersionException( " Unable to find a version in "
- + resetArtifact.getAvailableVersions() + " to match the range "
- + resetArtifact.getVersionRange(), resetArtifact );
+ throw new OverConstrainedVersionException(
+ "Unable to find a version in " + resetArtifact.getAvailableVersions()
+ + " to match the range " + resetArtifact.getVersionRange(),
+ resetArtifact );
+
}
fireEvent( ResolutionListener.SELECT_VERSION_FROM_RANGE, listeners, resetNodes[j] );
@@ -342,7 +353,8 @@ public class DefaultLegacyArtifactCollector
// Conflict Resolution
ResolutionNode resolved = null;
- for ( Iterator<ConflictResolver> j = conflictResolvers.iterator(); ( resolved == null ) && j.hasNext(); )
+ for ( Iterator<ConflictResolver> j = conflictResolvers.iterator();
+ resolved == null && j.hasNext(); )
{
ConflictResolver conflictResolver = j.next();
@@ -354,8 +366,10 @@ public class DefaultLegacyArtifactCollector
// TODO: add better exception that can detail the two conflicting artifacts
ArtifactResolutionException are =
new ArtifactResolutionException( "Cannot resolve artifact version conflict between "
- + previous.getArtifact().getVersion() + " and " + node.getArtifact().getVersion(),
+ + previous.getArtifact().getVersion() + " and "
+ + node.getArtifact().getVersion(),
previous.getArtifact() );
+
result.addVersionRangeViolation( are );
}
@@ -363,8 +377,9 @@ public class DefaultLegacyArtifactCollector
{
// TODO: add better exception
result.addVersionRangeViolation( new ArtifactResolutionException(
- "Conflict resolver returned unknown resolution node: ",
- resolved.getArtifact() ) );
+ "Conflict resolver returned unknown resolution node: ",
+ resolved.getArtifact() ) );
+
}
// TODO: should this be part of mediation?
@@ -509,15 +524,16 @@ public class DefaultLegacyArtifactCollector
if ( versions.isEmpty() )
{
throw new OverConstrainedVersionException(
- "No versions are present in the repository for the artifact with a range "
- + versionRange,
- artifact,
- childRemoteRepositories );
+ "No versions are present in the repository for the artifact"
+ + " with a range " + versionRange, artifact,
+ childRemoteRepositories );
+
}
- throw new OverConstrainedVersionException( "Couldn't find a version in "
- + versions + " to match range " + versionRange, artifact,
- childRemoteRepositories );
+ throw new OverConstrainedVersionException(
+ "Couldn't find a version in " + versions + " to match range "
+ + versionRange, artifact, childRemoteRepositories );
+
}
}
else
@@ -536,10 +552,10 @@ public class DefaultLegacyArtifactCollector
break;
}
}
- while( !childKey.equals( child.getKey() ) );
+ while ( !childKey.equals( child.getKey() ) );
if ( parentArtifact != null && parentArtifact.getDependencyFilter() != null
- && !parentArtifact.getDependencyFilter().include( artifact ) )
+ && !parentArtifact.getDependencyFilter().include( artifact ) )
{
// MNG-3769: the [probably relocated] artifact is excluded.
// We could process exclusions on relocated artifact details in the
@@ -574,7 +590,9 @@ public class DefaultLegacyArtifactCollector
artifact.setDependencyTrail( node.getDependencyTrail() );
throw new ArtifactResolutionException( "Unable to get dependency information for "
- + artifact.getId() + ": " + e.getMessage(), artifact, childRemoteRepositories, e );
+ + artifact.getId() + ": " + e.getMessage(),
+ artifact, childRemoteRepositories, e );
+
}
ArtifactResolutionRequest subRequest = new ArtifactResolutionRequest( metadataRequest );
@@ -583,6 +601,7 @@ public class DefaultLegacyArtifactCollector
subRequest.setProxies( request.getProxies() );
recurse( result, child, resolvedArtifacts, managedVersions, subRequest, source, filter,
listeners, conflictResolvers );
+
}
}
catch ( OverConstrainedVersionException e )
@@ -610,9 +629,8 @@ public class DefaultLegacyArtifactCollector
// explicit child override depMgmt (viz. depMgmt should only
// provide defaults to children, but should override transitives).
// We can do this by calling isChildOfRootNode on the current node.
-
if ( ( artifact.getVersion() != null )
- && ( !node.isChildOfRootNode() || node.getArtifact().getVersion() == null ) )
+ && ( !node.isChildOfRootNode() || node.getArtifact().getVersion() == null ) )
{
fireEvent( ResolutionListener.MANAGE_ARTIFACT_VERSION, listeners, node, artifact );
node.getArtifact().setVersion( artifact.getVersion() );
@@ -625,7 +643,7 @@ public class DefaultLegacyArtifactCollector
}
if ( Artifact.SCOPE_SYSTEM.equals( node.getArtifact().getScope() ) && ( node.getArtifact().getFile() == null )
- && ( artifact.getFile() != null ) )
+ && ( artifact.getFile() != null ) )
{
fireEvent( ResolutionListener.MANAGE_ARTIFACT_SYSTEM_PATH, listeners, node, artifact );
node.getArtifact().setFile( artifact.getFile() );
@@ -648,15 +666,15 @@ public class DefaultLegacyArtifactCollector
/* farthest is runtime and nearest has lower priority, change to runtime */
if ( Artifact.SCOPE_RUNTIME.equals( farthestArtifact.getScope() )
- && ( Artifact.SCOPE_TEST.equals( nearestArtifact.getScope() )
- || Artifact.SCOPE_PROVIDED.equals( nearestArtifact.getScope() ) ) )
+ && ( Artifact.SCOPE_TEST.equals( nearestArtifact.getScope() )
+ || Artifact.SCOPE_PROVIDED.equals( nearestArtifact.getScope() ) ) )
{
updateScope = true;
}
/* farthest is compile and nearest is not (has lower priority), change to compile */
if ( Artifact.SCOPE_COMPILE.equals( farthestArtifact.getScope() )
- && !Artifact.SCOPE_COMPILE.equals( nearestArtifact.getScope() ) )
+ && !Artifact.SCOPE_COMPILE.equals( nearestArtifact.getScope() ) )
{
updateScope = true;
}
@@ -762,7 +780,7 @@ public class DefaultLegacyArtifactCollector
break;
case ResolutionListener.RESTRICT_RANGE:
if ( node.getArtifact().getVersionRange().hasRestrictions()
- || replacement.getVersionRange().hasRestrictions() )
+ || replacement.getVersionRange().hasRestrictions() )
{
listener.restrictRange( node.getArtifact(), replacement, newRange );
}
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
index 133bd58..4045258 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/LegacyArtifactCollector.java
@@ -42,19 +42,22 @@ import org.apache.maven.repository.legacy.resolver.conflict.ConflictResolver;
public interface LegacyArtifactCollector
{
- ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map<String, Artifact> managedVersions,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions,
ArtifactResolutionRequest repositoryRequest, ArtifactMetadataSource source,
ArtifactFilter filter, List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers );
- ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map<String, Artifact> managedVersions,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions,
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners, List<ConflictResolver> conflictResolvers );
// used by maven-dependency-tree and maven-dependency-plugin
@Deprecated
- ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact, Map<String, Artifact> managedVersions,
+ ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact originatingArtifact,
+ Map<String, Artifact> managedVersions,
ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners );
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
index 3f13888..4bcca4c 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
@@ -104,7 +104,8 @@ public class MetadataGraph
*
* @param tree "dirty" tree root
* @param versionedVertices true if graph nodes should be versioned (different versions -> different nodes)
- * @param scopedVertices true if graph nodes should be versioned and scoped (different versions and/or scopes -> different nodes)
+ * @param scopedVertices true if graph nodes should be versioned and scoped
+ * (different versions and/or scopes -> different nodes)
*
*/
public MetadataGraph( MetadataTreeNode tree, boolean versionedVertices, boolean scopedVertices )
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
index 5f16df0..5a4c106 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
@@ -88,7 +88,8 @@ public class MetadataGraphEdge
MetadataGraphEdge e = (MetadataGraphEdge) o;
return objectsEqual( version, e.version )
- && ArtifactScopeEnum.checkScope( scope ).getScope().equals( ArtifactScopeEnum.checkScope( e.scope ).getScope() )
+ && ArtifactScopeEnum.checkScope( scope ).getScope().
+ equals( ArtifactScopeEnum.checkScope( e.scope ).getScope() )
&& depth == e.depth;
}
return false;
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
index 16a34a8..7861b48 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
@@ -21,12 +21,12 @@ package org.apache.maven.repository.metadata;
/**
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
- *
*/
public class MetadataGraphTransformationException
extends Exception
{
- private static final long serialVersionUID = -4029897098314019152L;
+
+ private static final long serialVersionUID = -4029897098314019152L;
public MetadataGraphTransformationException()
{
http://git-wip-us.apache.org/repos/asf/maven/blob/a99a7898/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
index 65bd9cf..b5e606d 100644
--- a/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
+++ b/maven-compat/src/main/java/org/apache/maven/usability/plugin/ExpressionDocumenter.java
@@ -38,7 +38,10 @@ import java.util.Map;
public class ExpressionDocumenter
{
- private static final String[] EXPRESSION_ROOTS = { "project", "settings", "session", "plugin", "rootless" };
+ private static final String[] EXPRESSION_ROOTS =
+ {
+ "project", "settings", "session", "plugin", "rootless"
+ };
private static final String EXPRESSION_DOCO_ROOTPATH = "META-INF/maven/plugin-expressions/";
@@ -53,10 +56,10 @@ public class ExpressionDocumenter
ClassLoader docLoader = initializeDocLoader();
- for ( String EXPRESSION_ROOT : EXPRESSION_ROOTS )
+ for ( String root : EXPRESSION_ROOTS )
{
try ( InputStream docStream = docLoader.getResourceAsStream(
- EXPRESSION_DOCO_ROOTPATH + EXPRESSION_ROOT + ".paramdoc.xml" ) )
+ EXPRESSION_DOCO_ROOTPATH + root + ".paramdoc.xml" ) )
{
if ( docStream != null )
{
@@ -68,12 +71,12 @@ public class ExpressionDocumenter
catch ( IOException e )
{
throw new ExpressionDocumentationException(
- "Failed to read documentation for expression root: " + EXPRESSION_ROOT, e );
+ "Failed to read documentation for expression root: " + root, e );
}
catch ( XmlPullParserException e )
{
throw new ExpressionDocumentationException(
- "Failed to parse documentation for expression root: " + EXPRESSION_ROOT, e );
+ "Failed to parse documentation for expression root: " + root, e );
}
}
@@ -161,7 +164,10 @@ public class ExpressionDocumenter
"Cannot construct expression documentation classpath" + " resource base.", e );
}
- return new URLClassLoader( new URL[]{ docResource } );
+ return new URLClassLoader( new URL[]
+ {
+ docResource
+ } );
}
}
[06/11] maven git commit: updated notice
Posted by kh...@apache.org.
updated notice
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/60e4fa65
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/60e4fa65
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/60e4fa65
Branch: refs/heads/MNG-6014
Commit: 60e4fa650fc2e5b3b646c74f3eeab7d0381b8bcb
Parents: 512fa6a
Author: Herv� Boutemy <hb...@apache.org>
Authored: Wed Oct 5 23:57:03 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:08:12 2017 +0100
----------------------------------------------------------------------
.../main/java/org/apache/maven/project/MavenProjectBuilder.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/60e4fa65/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index c44d8db..816b4a9 100644
--- a/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ b/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -39,7 +39,8 @@ public interface MavenProjectBuilder
MavenProject build( File pom, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
- //TODO maven-site-plugin -- Vincent, Dennis and Lukas are checking but this doesn't appear to be required anymore.
+ //TODO maven-site-plugin -- not used by the plugin directly, but used by Doxia Integration Tool & MPIR
+ // see DOXIASITETOOLS-167 & MPIR-349
MavenProject build( File pom, ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
[04/11] maven git commit: added core extensions documentation
Posted by kh...@apache.org.
added core extensions documentation
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/0b684af4
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/0b684af4
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/0b684af4
Branch: refs/heads/MNG-6014
Commit: 0b684af45ee85381a06a20cbdddb6b3fa0ff3b46
Parents: 9d432fb
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat Jun 25 18:58:01 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:04:31 2017 +0100
----------------------------------------------------------------------
.../main/resources/META-INF/maven/extension.xml | 7 +++--
maven-core/src/site/apt/core-extensions.apt.vm | 30 ++++++++++++++++++++
maven-core/src/site/apt/index.apt | 2 +-
maven-core/src/site/site.xml | 1 +
4 files changed, 36 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/main/resources/META-INF/maven/extension.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/maven/extension.xml b/maven-core/src/main/resources/META-INF/maven/extension.xml
index 07e60aa..f9cf07a 100644
--- a/maven-core/src/main/resources/META-INF/maven/extension.xml
+++ b/maven-core/src/main/resources/META-INF/maven/extension.xml
@@ -18,7 +18,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
+<!-- START SNIPPET: core-extension -->
<extension>
<exportedPackages>
<!-- maven-* -->
@@ -161,7 +161,7 @@ under the License.
<exportedArtifact>org.fusesource.jansi:jansi</exportedArtifact>
<!--
- | We must also filter out the old or NoClassDefFoundErrors will surface
+ | We must also filter out the old Aether or NoClassDefFoundErrors will surface
-->
<exportedArtifact>org.sonatype.aether:aether-api</exportedArtifact>
<exportedArtifact>org.sonatype.aether:aether-spi</exportedArtifact>
@@ -174,4 +174,5 @@ under the License.
| wagon from their plugin realm.
-->
</exportedArtifacts>
-</extension>
\ No newline at end of file
+</extension>
+<!-- END SNIPPET: core-extension -->
http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/core-extensions.apt.vm
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/core-extensions.apt.vm b/maven-core/src/site/apt/core-extensions.apt.vm
new file mode 100644
index 0000000..3d7abca
--- /dev/null
+++ b/maven-core/src/site/apt/core-extensions.apt.vm
@@ -0,0 +1,30 @@
+~~ 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.
+
+ ---
+ Maven Core Extensions Reference
+ ---
+ Herv� Boutemy
+ ---
+ 2016-06-25
+ ---
+
+Maven Core Extensions Reference
+
+ Maven core provides default extensions as defined in <<</META-INF/maven/extension.xml>>>:
+
+%{snippet|id=core-extension|file=${project.basedir}/src/main/resources/META-INF/maven/extension.xml}
http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/apt/index.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/index.apt b/maven-core/src/site/apt/index.apt
index 61d1772..966b57c 100644
--- a/maven-core/src/site/apt/index.apt
+++ b/maven-core/src/site/apt/index.apt
@@ -53,7 +53,7 @@ Maven Core
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
{{{https://codehaus-plexus.github.io/plexus-classworlds/}Plexus Classworlds}},
- * {{{./extension.html}extension descriptor}},
+ * {{{./extension.html}extension descriptor}} and {{{./core-extensions.html}core extensions}},
* <<<ExceptionHandler>>> component ({{{./apidocs/org/apache/maven/exception/ExceptionHandler.html}javadoc}}),
with its <<<DefaultExceptionHandler>>> implementation
http://git-wip-us.apache.org/repos/asf/maven/blob/0b684af4/maven-core/src/site/site.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/site/site.xml b/maven-core/src/site/site.xml
index 2c38d2a..9eb3ad0 100644
--- a/maven-core/src/site/site.xml
+++ b/maven-core/src/site/site.xml
@@ -34,6 +34,7 @@ under the License.
<item name="Lifecycles" href="lifecycles.html"/>
<item name="Plugin Bindings to Default Lifecycle" href="default-bindings.html"/>
<item name="Artifact Handlers" href="artifact-handlers.html"/>
+ <item name="Core Extensions" href="core-extensions.html"/>
</menu>
<menu ref="parent"/>
[08/11] maven git commit: added link to 3.3.1 release notes for
details on .mvn
Posted by kh...@apache.org.
added link to 3.3.1 release notes for details on .mvn
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/4547ff73
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/4547ff73
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/4547ff73
Branch: refs/heads/MNG-6014
Commit: 4547ff73d84f189dea35f60dffafff9cf2f446ba
Parents: 8a8f7cd
Author: Herv� Boutemy <hb...@apache.org>
Authored: Mon Nov 14 12:50:10 2016 +0100
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:09:30 2017 +0100
----------------------------------------------------------------------
maven-embedder/src/site/apt/index.apt.vm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/4547ff73/maven-embedder/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/maven-embedder/src/site/apt/index.apt.vm b/maven-embedder/src/site/apt/index.apt.vm
index 17220c9..e820765 100644
--- a/maven-embedder/src/site/apt/index.apt.vm
+++ b/maven-embedder/src/site/apt/index.apt.vm
@@ -20,7 +20,7 @@
-----
Herv� Boutemy
-----
- 2015-03-12
+ 2016-11-14
-----
${project.name}
@@ -33,13 +33,14 @@ ${project.name}
* {{{./logging.html}logging API}}.
- * since 3.3.0, per project settings can be defined by files in <<<.mvn/>>> directory:
+ * since 3.3.1 (see {{{/docs/3.3.1/release-notes.html#Core_Extensions}3.3.1 release notes}} for more details),
+ per project settings can be defined by files in <<<.mvn/>>> directory:
* <<<.mvn/jvm.config>>> containing jvm options,
* <<<.mvn/maven.config>>> containing Maven command-line parameter,
- * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of extensions}}.
+ * <<<.mvn/extensions.xml>>> containing {{{./core-extensions.html}a list of extensions}},
* since 3.5.0, output is colorized by default, with color disabled in batch mode: see
{{{/shared/maven-shared-utils/apidocs/org/apache/maven/shared/utils/logging/package-summary.html}styled message API}}
[11/11] maven git commit: [MNG-6014] Removing ArtifactHandler for
ejb3 o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin has
been removed from life cycle. o Removed the ArtifactHandler for ejb3 cause
without a bound life cycle it
Posted by kh...@apache.org.
[MNG-6014] Removing ArtifactHandler for ejb3
o Followup to MNG-5894 of Maven 3.3.9 where the maven-ejb3-plugin
has been removed from life cycle.
o Removed the ArtifactHandler for ejb3 cause without
a bound life cycle it does not make sense.
o Removed entry from artifact-handlers.apt site.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d75dbc37
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d75dbc37
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d75dbc37
Branch: refs/heads/MNG-6014
Commit: d75dbc37bc29dbc0db32d713cb2e69b73fdbcabe
Parents: a99a789
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Mon May 2 20:45:01 2016 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Wed Jan 25 20:47:40 2017 +0100
----------------------------------------------------------------------
.../main/resources/META-INF/plexus/artifact-handlers.xml | 11 -----------
maven-core/src/site/apt/artifact-handlers.apt | 2 --
2 files changed, 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d75dbc37/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
----------------------------------------------------------------------
diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
index f467252..2f26ce2 100644
--- a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
+++ b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -80,17 +80,6 @@ Artifact handlers are required by the dependency resolution mechanism.
<addedToClasspath>true</addedToClasspath>
</configuration>
</component>
- <component>
- <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
- <role-hint>ejb3</role-hint>
- <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
- <configuration>
- <type>ejb3</type>
- <includesDependencies>true</includesDependencies>
- <language>java</language>
- <addedToClasspath>false</addedToClasspath>
- </configuration>
- </component>
<!--
| TEST JAR
http://git-wip-us.apache.org/repos/asf/maven/blob/d75dbc37/maven-core/src/site/apt/artifact-handlers.apt
----------------------------------------------------------------------
diff --git a/maven-core/src/site/apt/artifact-handlers.apt b/maven-core/src/site/apt/artifact-handlers.apt
index a7ffade..1a4b344 100644
--- a/maven-core/src/site/apt/artifact-handlers.apt
+++ b/maven-core/src/site/apt/artifact-handlers.apt
@@ -39,8 +39,6 @@ Default Artifact Handlers Reference
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<ejb>>> | <<<jar>>> | <= type> | | java | <<<true>>> | |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
-| <<<ejb3>>> | <= type> | <= type> | | java | | <<<true>>> |
-*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<war>>> | <= type> | <= type> | | java | | <<<true>>> |
*--------------------+------------+------------+---------------+-----------+---------------------+-----------------------+
| <<<ear>>> | <= type> | <= type> | | java | | <<<true>>> |
[03/11] maven git commit: added README.md to rat excludes
Posted by kh...@apache.org.
added README.md to rat excludes
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/9d432fb5
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/9d432fb5
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/9d432fb5
Branch: refs/heads/MNG-6014
Commit: 9d432fb515c390beb593d8c4608775c46cfc03f9
Parents: cfbad56
Author: Herv� Boutemy <hb...@apache.org>
Authored: Sat May 28 21:14:54 2016 +0200
Committer: Herv� Boutemy <hb...@apache.org>
Committed: Wed Jan 25 00:00:43 2017 +0100
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/9d432fb5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f9ce4f..5d1f57f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -581,6 +581,7 @@ under the License.
<exclude>.repository/**</exclude> <!-- jenkins with local maven repository -->
<exclude>.maven/spy.log</exclude> <!-- hudson maven3 integration log -->
<exclude>.java-version</exclude>
+ <exclude>README.md</exclude>
</excludes>
</configuration>
</plugin>