[maven-site] branch elharo-patch-5 deleted (was f132e13)
This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a change to branch elharo-patch-5 in repository https://gitbox.apache.org/repos/asf/maven-site.git. was f132e13 docs: git migration is complete The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[maven-site] branch master updated: docs: git migration is complete
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new 1d1d45c docs: git migration is complete
1d1d45c is described below
commit 1d1d45c351e1d496b71713c0fc76f8d3000703e2
Author: Elliotte Rusty Harold
AuthorDate: Mon May 11 19:46:14 2020 -0400
docs: git migration is complete
Closes #165
---
content/apt/developers/conventions/git.apt | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/content/apt/developers/conventions/git.apt
b/content/apt/developers/conventions/git.apt
index 0acf81f..c31e1da 100644
--- a/content/apt/developers/conventions/git.apt
+++ b/content/apt/developers/conventions/git.apt
@@ -28,13 +28,8 @@
Maven Git Convention
- This document describes how developers should use Git. The Maven project
- is in the process of migrating some of its components from svn to git.
-
-* Git migration
-
- Information on the migration is here:
{{https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration}}
-
+ This document describes how developers should use Git.
+
* Git Configuration
** For contributors who are not committers
[maven-apache-parent] branch dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.2.0 created (now fd55c24)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-resources-plugin-3.2.0 in repository https://gitbox.apache.org/repos/asf/maven-apache-parent.git. at fd55c24 Bump maven-resources-plugin from 3.1.0 to 3.2.0 No new revisions were added by this update.
svn commit: r1880791 [1/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Wed Aug 12 01:11:32 2020 New Revision: 1880791 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/3.6.3/release-notes.html maven/website/content/docs/history.html
svn commit: r1880791 [3/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Eric Redmond" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Documentation https://github.com/apache/maven-site/tree/master/content/apt/guides/index.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Archetypes https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-archetypes.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html == --- maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html (original) +++ maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to the Dependency Mechanism https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download @@ -160,7 +160,8 @@ Karl Heinz Marbaise" /> Dependency Scope Dependency Management -Importing Dependencies +Importing Dependencies +Bill of Materials (BOM) POMs System Dependencies Transitive Dependencies Maven avoids the need to discover and specify the libraries that your own dependencies require by including transitive dependencies automatically. @@ -328,7 +329,7 @@ Karl Heinz Marbaise" /> /dependencyManagement /project -Then the two child poms become much simpler: +Then the two child POMs become much simpler: project ... @@ -446,14 +447,14 @@ Karl Heinz Marbaise" /> /dependencies /project -When maven is run on project B, version 1.0 of artifacts a, b, c, and d will be used regardless of the version specified in their pom. +When maven is run on project B, version 1.0 of artifacts a, b, c, and d will be used regardless of the version specified in their POM. a and c both are declared as dependencies of the project so version 1.0 is used due to dependency mediation. Both also have runtime scope since it is directly specified. -b is defined in B's parent's dependency management section and since dependency management takes precedence over dependency mediation for transitive dependencies, version 1.0 will be selected should it be referenced in a or c's pom. b will also have compile scope. -Finally, since d is specified in B's dependency management section, should d be a dependency (or transitive dependency) of a or c, version 1.0 will be chosen - again because dependency management takes precedence over dependency mediation and also because the current pom's declaration takes precedence over its parent's declaration. +b is defined in B's parent's dependency management section and since dependency management takes precedence over dependency mediation for transitive dependencies, version 1.0 will be selected should it be
svn commit: r1880791 [2/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-6/release-notes.html == --- maven/website/content/docs/3.0-alpha-6/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-6/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-6 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-6/release-notes.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-7/release-notes.html == --- maven/website/content/docs/3.0-alpha-7/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-7/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-7 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-7/release-notes.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/docs/3.0-beta-1/release-notes.html == --- maven/website/content/docs/3.0-beta-1/release-notes.html (original) +++ maven/website/content/docs/3.0-beta-1/release-notes.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-beta-1 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-beta-1/release-notes.apt.vm;>
svn commit: r1880791 [4/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/mini/guide-using-toolchains.html == --- maven/website/content/guides/mini/guide-using-toolchains.html (original) +++ maven/website/content/guides/mini/guide-using-toolchains.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Using Toolchains https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-using-toolchains.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/mini/guide-wagon-providers.html == --- maven/website/content/guides/mini/guide-wagon-providers.html (original) +++ maven/website/content/guides/mini/guide-wagon-providers.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Selecting Alternative Wagon Providers https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/guide-wagon-providers.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/mini/index.html == --- maven/website/content/guides/mini/index.html (original) +++ maven/website/content/guides/mini/index.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Mini Guides https://github.com/apache/maven-site/tree/master/content/apt/guides/mini/index.apt.vm;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-plugin-development.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -43,7 +43,7 @@ Olivier Lamy" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-plugin-development.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/guides/plugin/guide-java-report-plugin-development.html == --- maven/website/content/guides/plugin/guide-java-report-plugin-development.html (original) +++ maven/website/content/guides/plugin/guide-java-report-plugin-development.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Bertrand Martin" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Guide to Developing Java Report Plugins https://github.com/apache/maven-site/tree/master/content/apt/guides/plugin/guide-java-report-plugin-development.apt;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/ide.html == --- maven/website/content/ide.html (original) +++ maven/website/content/ide.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Apache Maven IDE Integration https://github.com/apache/maven-site/tree/master/content/markdown/ide.md;> -| Last Published: 2020-08-11 +| Last Published: 2020-08-12 | Get Sources Download Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Wed Aug 12 01:11:32 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm;> -| Last Published:
[maven-site] branch master updated: On branch edburns-section-heading-for-bom Introduce section heading for BOM pattern modified: content/apt/guides/introduction/introduction-to-dependency-mechanism.a
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new 477ed1a On branch edburns-section-heading-for-bom Introduce section
heading for BOM pattern modified:
content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
new fb022a8 Merge pull request #188 from
edburns/edburns-section-heading-for-bom
477ed1a is described below
commit 477ed1a771780f40eccb96552d1166678abaaedb
Author: Ed Burns
AuthorDate: Fri Jul 31 18:00:40 2020 -0400
On branch edburns-section-heading-for-bom Introduce section heading for BOM
pattern
modified:
content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
- TOC:* {{{bill-of-materials-bom-poms}Bill of Materials (BOM) poms}}
- ** {Bill of Materials (BOM) poms}
On branch edburns-section-heading-for-bom Apply suggestions from @michael-o.
modified:
content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
- poms > POMs
---
.../introduction-to-dependency-mechanism.apt | 38 --
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git
a/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
b/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
index 1c0167a..4b57524 100644
--- a/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
+++ b/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt
@@ -48,6 +48,8 @@ Introduction to the Dependency Mechanism
* {{{Importing_Dependencies}Importing Dependencies}}
+ * {{{bill-of-materials-bom-poms}Bill of Materials (BOM) POMs}}
+
* {{{System_Dependencies}System Dependencies}}
[]
@@ -314,7 +316,7 @@ Introduction to the Dependency Mechanism
++
- Then the two child poms become much simpler:
+ Then the two child POMs become much simpler:
++
@@ -457,18 +459,18 @@ Introduction to the Dependency Mechanism
++
When maven is run on project B, version 1.0 of artifacts a, b, c, and d will
be used regardless of
- the version specified in their pom.
+ the version specified in their POM.
* a and c both are declared as dependencies of the project so version 1.0 is
used due to
dependency mediation. Both also have runtime scope since it is directly
specified.
* b is defined in B's parent's dependency management section and since
dependency management
takes precedence over dependency mediation for transitive dependencies,
version 1.0 will be
- selected should it be referenced in a or c's pom. b will also have compile
scope.
+ selected should it be referenced in a or c's POM. b will also have compile
scope.
* Finally, since d is specified in B's dependency management section, should
d be a dependency
(or transitive dependency) of a or c, version 1.0 will be chosen - again
because dependency
- management takes precedence over dependency mediation and also because the
current pom's
+ management takes precedence over dependency mediation and also because the
current POM's
declaration takes precedence over its parent's declaration.
[]
@@ -481,7 +483,7 @@ Introduction to the Dependency Mechanism
The examples in the previous section describe how to specify managed
dependencies through inheritance. However,
in larger projects it may be impossible to accomplish this since a project
can only inherit from a single parent.
To accommodate this, projects can import managed dependencies from other
projects. This is accomplished by declaring a
- pom artifact as a dependency with a scope of "import".
+ POM artifact as a dependency with a scope of "import".
Project B:
@@ -529,8 +531,8 @@ Introduction to the Dependency Mechanism
++
- Assuming A is the pom defined in the preceding example, the end result would
be the same. All of A's managed dependencies
- would be incorporated into B except for d since it is defined in this pom.
+ Assuming A is the POM defined in the preceding example, the end result would
be the same. All of A's managed dependencies
+ would be incorporated into B except for d since it is defined in this POM.
Project X:
@@ -631,18 +633,20 @@ Introduction to the Dependency Mechanism
In the example above Z imports the managed dependencies from both X and Y.
However, both X and Y contain dependency a. Here,
version 1.1 of a would be used since X is declared first and a is not
declared in Z's dependencyManagement.
- This process is recursive. For example, if X imports another pom, Q, when Z
is processed it will simply appear that all
+ This process is recursive. For example, if X imports another POM, Q, when Z
is processed it will simply appear that all
of Q's managed dependencies are defined in X.
+** {Bill of Materials (BOM) POMs}
+
svn commit: r1880769 - in /maven/website/content: maven-site-1.0-site.jar plugins/index.html shared/index.html
Author: svn-site-role Date: Tue Aug 11 11:28:35 2020 New Revision: 1880769 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/maven-site-1.0-site.jar maven/website/content/plugins/index.html maven/website/content/shared/index.html Modified: maven/website/content/maven-site-1.0-site.jar == Binary files - no diff available. Modified: maven/website/content/plugins/index.html == --- maven/website/content/plugins/index.html (original) +++ maven/website/content/plugins/index.html Tue Aug 11 11:28:35 2020 @@ -195,8 +195,8 @@ Karl-Heinz Marbaise" /> resources B -3.1.0 -2018-04-23 +3.2.0 +2020-08-11 Copy the resources to the output directory for including in the JAR. https://gitbox.apache.org/repos/asf/maven-resources-plugin.git;>Git / https://github.com/apache/maven-resources-plugin/;>GitHub https://issues.apache.org/jira/browse/MRESOURCES;>Jira MRESOURCES Modified: maven/website/content/shared/index.html == --- maven/website/content/shared/index.html (original) +++ maven/website/content/shared/index.html Tue Aug 11 11:28:35 2020 @@ -186,8 +186,8 @@ Karl Heinz Marbaise" /> maven-filtering -3.1.1 -2016-06-02 +3.2.0 +2020-08-11 Components for filtering resources. https://gitbox.apache.org/repos/asf/maven-filtering.git;>Git / https://github.com/apache/maven-filtering/;>GitHub https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-filtering">JIRA
svn commit: r1880768 - in /maven/website/content: maven-site-1.0-site.jar shared/index.html
Author: svn-site-role Date: Tue Aug 11 11:27:50 2020 New Revision: 1880768 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/maven-site-1.0-site.jar maven/website/content/shared/index.html Modified: maven/website/content/maven-site-1.0-site.jar == Binary files - no diff available. Modified: maven/website/content/shared/index.html == --- maven/website/content/shared/index.html (original) +++ maven/website/content/shared/index.html Tue Aug 11 11:27:50 2020 @@ -263,8 +263,8 @@ Karl Heinz Marbaise" /> https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-shared-resources">JIRA maven-shared-utils -3.2.1 -2018-02-10 +3.3.3 +2020-08-04 Utilities functions for use within Maven. https://gitbox.apache.org/repos/asf/maven-shared-utils.git;>Git / https://github.com/apache/maven-shared-utils/;>GitHub https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status != Closed AND component = maven-shared-utils">JIRA
[maven-site] branch master updated: Maven Shared Utils 3.3.3
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new b968791 Maven Shared Utils 3.3.3
new ed0007a Merge pull request #189 from dennisl/patch-1
b968791 is described below
commit b96879132bb5b44c69c62ac0d0c46929a8934ecf
Author: Dennis Lundberg
AuthorDate: Tue Aug 4 14:09:15 2020 +0200
Maven Shared Utils 3.3.3
---
content/apt/shared/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/shared/index.apt b/content/apt/shared/index.apt
index 160570f..c3defa0 100644
--- a/content/apt/shared/index.apt
+++ b/content/apt/shared/index.apt
@@ -71,7 +71,7 @@ Shared Components
*+--+---+--++-+
| {{{/shared/maven-shared-resources/} <<>>}} |
2| 2015-02-05| This is a collection of templates that are
specific to the Maven project. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-resources.git}Git}} /
{{{https://github.com/apache/maven-shared-resources/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-resources}JIRA}}
*+--+---+--++-+
-| {{{/shared/maven-shared-utils/} <<>>}} |
3.2.1| 2018-02-10| Utilities functions for use within Maven. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-utils.git}Git}} /
{{{https://github.com/apache/maven-shared-utils/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-utils}JIRA}}
+| {{{/shared/maven-shared-utils/} <<>>}} |
3.3.3| 2020-08-04| Utilities functions for use within Maven. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-utils.git}Git}} /
{{{https://github.com/apache/maven-shared-utils/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-utils}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-shared-io/} <<>>}} |
3.0.0| 2015-12-23| API for I/O support like logging, download
or file scanning. |
{{{https://gitbox.apache.org/repos/asf/maven-shared-io.git}Git}} /
{{{https://github.com/apache/maven-shared-io/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-shared-io}JIRA}}
*+--+---+--++-+
[maven-site] branch master updated: maven-filtering-3.2.0
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new 8ef3eb0 maven-filtering-3.2.0
new 29dda8c Merge pull request #193 from dennisl/patch-2
8ef3eb0 is described below
commit 8ef3eb032df8fe15fadcc09c8492b73a05fce05a
Author: Dennis Lundberg
AuthorDate: Tue Aug 11 10:26:28 2020 +0200
maven-filtering-3.2.0
---
content/apt/shared/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/shared/index.apt b/content/apt/shared/index.apt
index 160570f..8ecc4da 100644
--- a/content/apt/shared/index.apt
+++ b/content/apt/shared/index.apt
@@ -49,7 +49,7 @@ Shared Components
*+--+---+--++-+
| {{{/doxia/doxia-sitetools/doxia-integration-tools/}
<<>>}} | | | moved to
{{{/doxia/doxia-sitetools/doxia-integration-tools/}
<<>>}} | |
*+--+---+--++-+
-| {{{/shared/maven-filtering/} <<>>}} |
3.1.1| 2016-06-02| Components for filtering resources. |
{{{https://gitbox.apache.org/repos/asf/maven-filtering.git}Git}} /
{{{https://github.com/apache/maven-filtering/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-filtering}JIRA}}
+| {{{/shared/maven-filtering/} <<>>}} |
3.2.0| 2020-08-11| Components for filtering resources. |
{{{https://gitbox.apache.org/repos/asf/maven-filtering.git}Git}} /
{{{https://github.com/apache/maven-filtering/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-filtering}JIRA}}
*+--+---+--++-+
| {{{/shared/maven-invoker/} <<>>}} |
3.0.1| 2018-05-29| Fires up a Maven build in a new JVM. |
{{{https://gitbox.apache.org/repos/asf/maven-invoker.git}Git}} /
{{{https://github.com/apache/maven-invoker/}GitHub}} |
{{{https://issues.apache.org/jira/issues/?jql=project = MSHARED AND status !=
Closed AND component = maven-invoker}JIRA}}
*+--+---+--++-+
[maven-site] branch master updated: Update index.apt
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-site.git
The following commit(s) were added to refs/heads/master by this push:
new c97271c Update index.apt
new ea01b9f Merge pull request #192 from dennisl/patch-3
c97271c is described below
commit c97271c89d896b08e177889b145f21a01a6561a8
Author: Dennis Lundberg
AuthorDate: Tue Aug 11 10:27:20 2020 +0200
Update index.apt
---
content/apt/plugins/index.apt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/content/apt/plugins/index.apt b/content/apt/plugins/index.apt
index 8e9423b..03245bd 100644
--- a/content/apt/plugins/index.apt
+++ b/content/apt/plugins/index.apt
@@ -77,7 +77,7 @@ Available Plugins
*--++--++--+++
| {{{/plugins/maven-install-plugin/} <<>>}} | B |
3.0.0-M1 | 2018-09-23 | Install the built artifact into the local
repository. |
{{{https://gitbox.apache.org/repos/asf/maven-install-plugin.git}Git}} /
{{{https://github.com/apache/maven-install-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MINSTALL}Jira MINSTALL}}
*--++--++--+++
-| {{{/plugins/maven-resources-plugin/} <<>>}} | B |
3.1.0| 2018-04-23 | Copy the resources to the output directory for
including in the JAR. |
{{{https://gitbox.apache.org/repos/asf/maven-resources-plugin.git}Git}} /
{{{https://github.com/apache/maven-resources-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MRESOURCES}Jira MRESOURCES}}
+| {{{/plugins/maven-resources-plugin/} <<>>}} | B |
3.2.0| 2020-08-11 | Copy the resources to the output directory for
including in the JAR. |
{{{https://gitbox.apache.org/repos/asf/maven-resources-plugin.git}Git}} /
{{{https://github.com/apache/maven-resources-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MRESOURCES}Jira MRESOURCES}}
*--++--++--+++
| {{{/plugins/maven-site-plugin/} <<>>}} | B |
3.9.1| 2020-06-24 | Generate a site for the current project. |
{{{https://gitbox.apache.org/repos/asf/maven-site-plugin.git}Git}} /
{{{https://github.com/apache/maven-site-plugin/}GitHub}} |
{{{https://issues.apache.org/jira/browse/MSITE}Jira MSITE}}
*--++--++--+++
svn commit: r1880766 [1/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Author: svn-site-role Date: Tue Aug 11 11:10:40 2020 New Revision: 1880766 Log: Site checkin for project Apache Maven Site Modified: maven/website/content/about.html maven/website/content/aether.html maven/website/content/apache-resource-bundles/index.html maven/website/content/archives/maven-2.x/index.html maven/website/content/archives/maven-2.x/maven-2.1-architectural-goals.html maven/website/content/articles.html maven/website/content/background/history-of-maven.html maven/website/content/background/philosophy-of-maven.html maven/website/content/ci-management.html maven/website/content/code-quality-management.html maven/website/content/community.html maven/website/content/configure.html maven/website/content/developers/committer-environment.html maven/website/content/developers/committer-settings.html maven/website/content/developers/compatibility-plan.html maven/website/content/developers/conventions/code.html maven/website/content/developers/conventions/git.html maven/website/content/developers/conventions/jira.html maven/website/content/developers/dependency-policies.html maven/website/content/developers/index.html maven/website/content/developers/mojo-api-specification.html maven/website/content/developers/release/index.html maven/website/content/developers/release/maven-core-release.html maven/website/content/developers/release/maven-project-release-procedure.html maven/website/content/developers/release/parent-pom-release.html maven/website/content/developers/release/pmc-gpg-keys.html maven/website/content/developers/retirement-plan-plugins.html maven/website/content/developers/website/component-reference-documentation-helper.html maven/website/content/developers/website/deploy-component-reference-documentation.html maven/website/content/developers/website/deploy-maven-website.html maven/website/content/developers/website/index.html maven/website/content/developers/website/website-overview.html maven/website/content/developers/welcome-to-new-committers.html maven/website/content/docs/2.0.1/release-notes.html maven/website/content/docs/2.0.10/release-notes.html maven/website/content/docs/2.0.11/release-notes.html maven/website/content/docs/2.0.2/release-notes.html maven/website/content/docs/2.0.3/release-notes.html maven/website/content/docs/2.0.4/release-notes.html maven/website/content/docs/2.0.5/release-notes.html maven/website/content/docs/2.0.6/release-notes.html maven/website/content/docs/2.0.7/release-notes.html maven/website/content/docs/2.0.8/release-notes.html maven/website/content/docs/2.0.9/release-notes.html maven/website/content/docs/2.0/release-notes.html maven/website/content/docs/2.1.0/release-notes.html maven/website/content/docs/2.2.0/release-notes.html maven/website/content/docs/2.2.1/release-notes.html maven/website/content/docs/3.0-alpha-3/release-notes.html maven/website/content/docs/3.0-alpha-4/release-notes.html maven/website/content/docs/3.0-alpha-5/release-notes.html maven/website/content/docs/3.0-alpha-6/release-notes.html maven/website/content/docs/3.0-alpha-7/release-notes.html maven/website/content/docs/3.0-beta-1/release-notes.html maven/website/content/docs/3.0-beta-2/release-notes.html maven/website/content/docs/3.0-beta-3/release-notes.html maven/website/content/docs/3.0.1/release-notes.html maven/website/content/docs/3.0.2/release-notes.html maven/website/content/docs/3.0.3/release-notes.html maven/website/content/docs/3.0.4/release-notes.html maven/website/content/docs/3.0.5/release-notes.html maven/website/content/docs/3.0/release-notes.html maven/website/content/docs/3.1.0-alpha-1/release-notes.html maven/website/content/docs/3.1.0/release-notes.html maven/website/content/docs/3.1.1/release-notes.html maven/website/content/docs/3.2.1/release-notes.html maven/website/content/docs/3.2.2/release-notes.html maven/website/content/docs/3.2.3/release-notes.html maven/website/content/docs/3.2.5/release-notes.html maven/website/content/docs/3.3.1/release-notes.html maven/website/content/docs/3.3.3/release-notes.html maven/website/content/docs/3.3.9/release-notes.html maven/website/content/docs/3.5.0-alpha-1/release-notes.html maven/website/content/docs/3.5.0-beta-1/release-notes.html maven/website/content/docs/3.5.0/release-notes.html maven/website/content/docs/3.5.2/release-notes.html maven/website/content/docs/3.5.3/release-notes.html maven/website/content/docs/3.5.4/release-notes.html maven/website/content/docs/3.6.0/release-notes.html maven/website/content/docs/3.6.1/release-notes.html maven/website/content/docs/3.6.2/release-notes.html maven/website/content/docs/3.6.3/release-notes.html maven/website/content/docs/history.html
svn commit: r1880766 [2/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/docs/2.2.1/release-notes.html == --- maven/website/content/docs/2.2.1/release-notes.html (original) +++ maven/website/content/docs/2.2.1/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 2.2.1 https://github.com/apache/maven-site/tree/master/content/apt/docs/2.2.1/release-notes.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-3/release-notes.html == --- maven/website/content/docs/3.0-alpha-3/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-3/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-3 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-3/release-notes.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-4/release-notes.html == --- maven/website/content/docs/3.0-alpha-4/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-4/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-4 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-4/release-notes.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-5/release-notes.html == --- maven/website/content/docs/3.0-alpha-5/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-5/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-5 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-5/release-notes.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-6/release-notes.html == --- maven/website/content/docs/3.0-alpha-6/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-6/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-6 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-6/release-notes.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/docs/3.0-alpha-7/release-notes.html == --- maven/website/content/docs/3.0-alpha-7/release-notes.html (original) +++ maven/website/content/docs/3.0-alpha-7/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-alpha-7 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-alpha-7/release-notes.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/docs/3.0-beta-1/release-notes.html == --- maven/website/content/docs/3.0-beta-1/release-notes.html (original) +++ maven/website/content/docs/3.0-beta-1/release-notes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Release Notes - Maven 3.0-beta-1 https://github.com/apache/maven-site/tree/master/content/apt/docs/3.0-beta-1/release-notes.apt.vm;>
svn commit: r1880766 [4/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/index.html == --- maven/website/content/index.html (original) +++ maven/website/content/index.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Welcome to Apache Maven https://github.com/apache/maven-site/tree/master/content/xdoc/index.xml.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/install.html == --- maven/website/content/install.html (original) +++ maven/website/content/install.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Installing Apache Maven https://github.com/apache/maven-site/tree/master/content/markdown/install.md.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/issue-management.html == --- maven/website/content/issue-management.html (original) +++ maven/website/content/issue-management.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Overview https://github.com/apache/maven-site/tree/master/content/markdown/issue-management.md;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/mailing-lists.html == --- maven/website/content/mailing-lists.html (original) +++ maven/website/content/mailing-lists.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Project Mailing Lists -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/maven-1.x-eol.html == --- maven/website/content/maven-1.x-eol.html (original) +++ maven/website/content/maven-1.x-eol.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 1.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-1.x-eol.md;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/maven-2.x-eol.html == --- maven/website/content/maven-2.x-eol.html (original) +++ maven/website/content/maven-2.x-eol.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ End Of Life Apache Maven 2.x https://github.com/apache/maven-site/tree/master/content/markdown/maven-2.x-eol.md;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/maven-ci-friendly.html == --- maven/website/content/maven-ci-friendly.html (original) +++ maven/website/content/maven-ci-friendly.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven CI Friendly Versions https://github.com/apache/maven-site/tree/master/content/markdown/maven-ci-friendly.md;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/maven-conventions.html == --- maven/website/content/maven-conventions.html (original) +++ maven/website/content/maven-conventions.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -39,7 +39,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Conventions
svn commit: r1880766 [3/4] - in /maven/website/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ do
Modified: maven/website/content/guides/getting-started/windows-prerequisites.html == --- maven/website/content/guides/getting-started/windows-prerequisites.html (original) +++ maven/website/content/guides/getting-started/windows-prerequisites.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven on Windows https://github.com/apache/maven-site/tree/master/content/apt/guides/getting-started/windows-prerequisites.apt;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/guides/index.html == --- maven/website/content/guides/index.html (original) +++ maven/website/content/guides/index.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -42,7 +42,7 @@ Eric Redmond" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Maven Documentation https://github.com/apache/maven-site/tree/master/content/apt/guides/index.apt.vm;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-archetypes.html == --- maven/website/content/guides/introduction/introduction-to-archetypes.html (original) +++ maven/website/content/guides/introduction/introduction-to-archetypes.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Archetypes https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-archetypes.apt;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html == --- maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html (original) +++ maven/website/content/guides/introduction/introduction-to-dependency-mechanism.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -44,7 +44,7 @@ Karl Heinz Marbaise" /> https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to the Dependency Mechanism https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-dependency-mechanism.apt;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html == --- maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html (original) +++ maven/website/content/guides/introduction/introduction-to-optional-and-excludes-dependencies.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Optional Dependencies and Dependency Exclusions https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-optional-and-excludes-dependencies.apt;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html == --- maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html (original) +++ maven/website/content/guides/introduction/introduction-to-plugin-prefix-mapping.html Tue Aug 11 11:10:40 2020 @@ -1,6 +1,6 @@ http://www.w3.org/1999/xhtml; lang="en"> @@ -41,7 +41,7 @@ https://www.apache.org/; class="externalLink" title="Apache">Apache/ Maven/ Introduction to Plugin Prefix Resolution https://github.com/apache/maven-site/tree/master/content/apt/guides/introduction/introduction-to-plugin-prefix-mapping.apt;> -| Last Published: 2020-08-10 +| Last Published: 2020-08-11 | Get Sources Download Modified: maven/website/content/guides/introduction/introduction-to-plugins.html
svn commit: r1880761 - in /maven/website/components: plugins-archives/maven-resources-plugin-3.2.0/ plugins/maven-resources-plugin/
Author: dennisl Date: Tue Aug 11 08:24:02 2020 New Revision: 1880761 Log: Publish maven-resources-plugin 3.2.0 documentation Added: maven/website/components/plugins-archives/maven-resources-plugin-3.2.0/ - copied from r1880760, maven/website/components/plugins-archives/maven-resources-plugin-LATEST/ maven/website/components/plugins/maven-resources-plugin/ - copied from r1880760, maven/website/components/plugins-archives/maven-resources-plugin-LATEST/
svn commit: r1880760 - in /maven/website/components: shared-archives/maven-filtering-3.2.0/ shared/maven-filtering/
Author: dennisl Date: Tue Aug 11 08:22:42 2020 New Revision: 1880760 Log: Publish maven-filtering 3.2.0 documentation Added: maven/website/components/shared-archives/maven-filtering-3.2.0/ - copied from r1880759, maven/website/components/shared-archives/maven-filtering-LATEST/ maven/website/components/shared/maven-filtering/ - copied from r1880759, maven/website/components/shared-archives/maven-filtering-LATEST/
svn commit: r40945 - /release/maven/plugins/
Author: dennisl Date: Tue Aug 11 08:16:07 2020 New Revision: 40945 Log: maven-resources-plugin-3.2.0. Added: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip (with props) release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.asc (with props) release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.sha512 (with props) Removed: release/maven/plugins/maven-resources-plugin-3.1.0-source-release.zip release/maven/plugins/maven-resources-plugin-3.1.0-source-release.zip.asc release/maven/plugins/maven-resources-plugin-3.1.0-source-release.zip.sha512 Added: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip == Binary file - no diff available. Propchange: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip -- svn:mime-type = application/zip Added: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.asc == --- release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.asc (added) +++ release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.asc Tue Aug 11 08:16:07 2020 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iEYEABEKAAYFAl8qz9cACgkQM81nM69exFIOsgCglYZTLW9JZCGV13q7+P/C+uba +UaIAoJU+GkMtnqLTQlijODLIdpy+3B/+ +=dPtW +-END PGP SIGNATURE- Propchange: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.asc -- svn:eol-style = native Added: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.sha512 == --- release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.sha512 (added) +++ release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.sha512 Tue Aug 11 08:16:07 2020 @@ -0,0 +1 @@ +ca920a510de6195d563c49617920823562aaa9be56cc8ca8f87fa9473d65814a6f4ce33f32ccdb7c9115162f8a560cded3deb2cc32bd4b8649a8e57ccc4fb020 \ No newline at end of file Propchange: release/maven/plugins/maven-resources-plugin-3.2.0-source-release.zip.sha512 -- svn:eol-style = native
[maven-resolver] branch redisson updated: Reformat
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch redisson
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/redisson by this push:
new f35a408 Reformat
f35a408 is described below
commit f35a408c660ca78501bea2bdff228a5f57972cbf
Author: Michael Osipov
AuthorDate: Tue Aug 11 10:15:19 2020 +0200
Reformat
---
.../synccontext/RedissonSyncContextFactory.java| 227 +
1 file changed, 137 insertions(+), 90 deletions(-)
diff --git
a/maven-resolver-synccontext-redisson/src/main/java/org/eclipse/aether/synccontext/RedissonSyncContextFactory.java
b/maven-resolver-synccontext-redisson/src/main/java/org/eclipse/aether/synccontext/RedissonSyncContextFactory.java
index b06e83e..067d600 100644
---
a/maven-resolver-synccontext-redisson/src/main/java/org/eclipse/aether/synccontext/RedissonSyncContextFactory.java
+++
b/maven-resolver-synccontext-redisson/src/main/java/org/eclipse/aether/synccontext/RedissonSyncContextFactory.java
@@ -58,7 +58,8 @@ import org.slf4j.LoggerFactory;
* if required.
* This factory is considered experimental and is intended to be used as a
singleton.
*/
-public class RedissonSyncContextFactory implements SyncContextFactory {
+public class RedissonSyncContextFactory implements SyncContextFactory
+{
private static final String DEFAULT_CONFIG_FILE_NAME =
"maven-resolver-redisson.yaml";
private static final String DEFAULT_REDIS_ADDRESS =
"redis://localhost:6379";
@@ -68,27 +69,34 @@ public class RedissonSyncContextFactory implements
SyncContextFactory {
private static final String CONFIG_PROP_CONFIG_FILE =
"aether.syncContext.redisson.configFile";
-private static final Logger LOGGER =
LoggerFactory.getLogger(RedissonSyncContextFactory.class);
+private static final Logger LOGGER = LoggerFactory.getLogger(
RedissonSyncContextFactory.class );
-private static final RedissonClient redissonClient =
createRedissonClient();
-private static final String localhostDiscriminator =
createLocalhostDiscriminator();
+private static RedissonClient redissonClient = createRedissonClient();
+private static String localhostDiscriminator =
createLocalhostDiscriminator();
-private static RedissonClient createRedissonClient() {
+private static RedissonClient createRedissonClient()
+{
Path configFilePath = null;
-String configFile = ConfigUtils.getString(System.getProperties(),
null, CONFIG_PROP_CONFIG_FILE);
-if (configFile != null && !configFile.isEmpty()) {
-configFilePath = Paths.get(configFile);
-if (Files.notExists(configFilePath)) {
-throw new IllegalArgumentException("The specified Redisson
config file does not exist: " + configFilePath);
+String configFile = ConfigUtils.getString( System.getProperties(),
null, CONFIG_PROP_CONFIG_FILE );
+if ( configFile != null && !configFile.isEmpty() )
+{
+configFilePath = Paths.get( configFile );
+if ( Files.notExists( configFilePath ) )
+{
+throw new IllegalArgumentException( "The specified Redisson
config file does not exist: "
++ configFilePath );
}
}
-if (configFilePath == null) {
-String mavenConf = ConfigUtils.getString(System.getProperties(),
null, "maven.conf");
-if (mavenConf != null && !mavenConf.isEmpty()) {
-configFilePath = Paths.get(mavenConf,
DEFAULT_CONFIG_FILE_NAME);
-if (Files.notExists(configFilePath)) {
+if ( configFilePath == null )
+{
+String mavenConf = ConfigUtils.getString( System.getProperties(),
null, "maven.conf" );
+if ( mavenConf != null && !mavenConf.isEmpty() )
+{
+configFilePath = Paths.get( mavenConf,
DEFAULT_CONFIG_FILE_NAME );
+if ( Files.notExists( configFilePath ) )
+{
configFilePath = null;
}
}
@@ -96,46 +104,59 @@ public class RedissonSyncContextFactory implements
SyncContextFactory {
Config config = null;
-if (configFilePath != null) {
-LOGGER.trace("Reading Redisson config file from '{}'",
configFilePath);
-try (InputStream is = Files.newInputStream(configFilePath)) {
-config = Config.fromYAML(is);
-} catch (IOException e) {
-throw new IllegalStateException("Failed to read Redisson
config file: " + configFilePath, e);
+if ( configFilePath != null )
+{
+LOGGER.trace( "Reading Redisson config file from '{}'",
configFilePath );
+try ( InputStream is = Files.newInputStream( configFilePath ) )
+{
+config =
svn commit: r40944 - /release/maven/shared/
Author: dennisl Date: Tue Aug 11 08:15:12 2020 New Revision: 40944 Log: maven-filtering-3.2.0 Added: release/maven/shared/maven-filtering-3.2.0-source-release.zip (with props) release/maven/shared/maven-filtering-3.2.0-source-release.zip.asc (with props) release/maven/shared/maven-filtering-3.2.0-source-release.zip.sha512 (with props) Removed: release/maven/shared/maven-filtering-3.1.1-source-release.zip release/maven/shared/maven-filtering-3.1.1-source-release.zip.asc release/maven/shared/maven-filtering-3.1.1-source-release.zip.sha512 Added: release/maven/shared/maven-filtering-3.2.0-source-release.zip == Binary file - no diff available. Propchange: release/maven/shared/maven-filtering-3.2.0-source-release.zip -- svn:mime-type = application/zip Added: release/maven/shared/maven-filtering-3.2.0-source-release.zip.asc == --- release/maven/shared/maven-filtering-3.2.0-source-release.zip.asc (added) +++ release/maven/shared/maven-filtering-3.2.0-source-release.zip.asc Tue Aug 11 08:15:12 2020 @@ -0,0 +1,7 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iEYEABEKAAYFAl8qzggACgkQM81nM69exFIBvwCfa+4+uUeZPCoKFTjj4S/9nXJo +Wd0AoNEO93Q6iBe/Hxdiu/REmzX1KpFV +=VmLs +-END PGP SIGNATURE- Propchange: release/maven/shared/maven-filtering-3.2.0-source-release.zip.asc -- svn:eol-style = native Added: release/maven/shared/maven-filtering-3.2.0-source-release.zip.sha512 == --- release/maven/shared/maven-filtering-3.2.0-source-release.zip.sha512 (added) +++ release/maven/shared/maven-filtering-3.2.0-source-release.zip.sha512 Tue Aug 11 08:15:12 2020 @@ -0,0 +1 @@ +6cb730fbf9d5a2f3dbf951547d3b2720989906001a1844cfd38367a579f7a11d073807d68d4a907d083daa4295154fa135205dabba94f21ab73afca3022fbe7b \ No newline at end of file Propchange: release/maven/shared/maven-filtering-3.2.0-source-release.zip.sha512 -- svn:eol-style = native
