svn commit: r997861 [7/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-core/surefire-report.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/surefire-report.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/surefire-report.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Core Surefire Report @@ -82,7 +82,7 @@ Surefire Report - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT @@ -443,7 +443,7 @@ function toggleDisplay(elementId) { 0 0 100% -14.721 +15.823 Note: failures are anticipated and checked for with assertions while errors are unanticipated. Package List @@ -464,7 +464,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.779 +0.883 org.apache.maven.project.canonical 1 @@ -472,7 +472,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.042 +0.041 org.apache.maven.graph 8 @@ -480,7 +480,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.002 +0.001 org.apache.maven.lifecycle.mapping 2 @@ -496,7 +496,7 @@ function toggleDisplay(elementId) { 0 0 100% -0 +0.001 org.apache.maven.lifecycle.internal.builder.multithreaded 2 @@ -504,7 +504,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.432 +0.636 org.apache.maven.lifecycle.internal 11 @@ -512,7 +512,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.041 +0.045 org.apache.maven.rtinfo.internal 2 @@ -520,7 +520,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.031 +0.038 org.apache.maven.execution 3 @@ -528,7 +528,7 @@ function toggleDisplay(elementId) { 0 0 100% -1.276 +1.664 org.apache.maven.toolchain.building 10 @@ -536,7 +536,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.013 +0.011 org.apache.maven.toolchain.merge 4 @@ -544,7 +544,7 @@ function toggleDisplay(elementId) { 0 0 100% -0 +0.001 org.apache.maven.project 159 @@ -552,7 +552,7 @@ function toggleDisplay(elementId) { 0 0 100% -9.099 +9.164 org.apache.maven.project.artifact 2 @@ -560,7 +560,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.101 +0.069 org.apache.maven.lifecycle.internal.stub 1 @@ -576,7 +576,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.001 +0 org.apache.maven.settings 5 @@ -584,7 +584,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.135 +0.155 org.apache.maven 6 @@ -592,7 +592,7 @@ function toggleDisplay(elementId) { 0 0 100% -1.28 +1.59 org.apache.maven.toolchain 17 @@ -600,7 +600,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.175 +0.196 org.apache.maven.artifact.handler 1 @@ -608,7 +608,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.02 +0.018 org.apache.maven.execution.scope.internal 2 @@ -616,7 +616,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.093 +0.137 org.apache.maven.plugin 32 @@ -624,7 +624,7 @@ function toggleDisplay(elementId) { 0 0 100% -1.139 +1.131 org.apache.maven.configuration 3 @@ -632,7 +632,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.062 +0.042 Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. org.apache.maven.lifecycle @@ -654,7 +654,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.015 +0.014 LifecycleExecutorTest @@ -663,7 +663,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.722 +0.816 LifecycleExecutorSubModulesTest @@ -672,7 +672,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.04 +0.049 MavenExecutionPlanTest @@ -681,7 +681,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.002 +0.004 org.apache.maven.project.canonical @@ -702,7 +702,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.042 +0.041 org.apache.maven.graph @@ -723,7 +723,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.002 +0.001 org.apache.maven.lifecycle.mapping @@ -765,7 +765,7 @@ function toggleDisplay(elementId) { 0 0 100% -0 +0.001 org.apache.maven.lifecycle.internal.builder.multithreaded @@ -786,7 +786,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.432 +0.636 org.apache.maven.lifecycle.internal @@ -807,7 +807,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.04 +0.044 BuildListCalculatorTest @@ -834,7 +834,7 @@ function toggleDisplay(elementId) { 0 0 100% -0 +0.001 ConcurrencyDependencyGraphTest @@ -843,7 +843,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.001 +0 ProjectBuildListTest @@ -882,7 +882,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.031 +0.038 org.apache.maven.execution @@ -903,7 +903,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.007 +0.014 DefaultMavenExecutionRequestPopulatorTest @@
svn commit: r997861 [12/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ ap
Modified: websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/src-html/org/apache/maven/model/Prerequisites.html == --- websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/src-html/org/apache/maven/model/Prerequisites.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-model/apidocs/src-html/org/apache/maven/model/Prerequisites.html Tue Sep 20 21:29:09 2016 @@ -29,124 +29,133 @@ 021 022/** 023 * -024 * For a plugin project, the minimum version of -025 * Maven required to use -026 * the resulting plugin.br / -027 * For specifying the minimum version of Maven -028 * required to build a -029 * project, this element is bdeprecated/b. Use -030 * the Maven Enforcer -031 * Plugin's a -032 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -033 * rule instead. -034 * -035 * -036 */ -037private String maven = "2.0"; -038 -039/** -040 * Field locations. -041 */ -042private java.util.MapObject, InputLocation locations; -043 -044 -045 //---/ -046 //- Methods -/ -047//---/ -048 -049/** -050 * Method clone. -051 * -052 * @return Prerequisites -053 */ -054public Prerequisites clone() -055{ -056try -057{ -058Prerequisites copy = (Prerequisites) super.clone(); -059 -060if ( copy.locations != null ) -061{ -062copy.locations = new java.util.LinkedHashMap( copy.locations ); -063} -064 -065return copy; -066} -067catch ( java.lang.Exception ex ) -068{ -069throw (java.lang.RuntimeException) new java.lang.UnsupportedOperationException( getClass().getName() -070+ " does not support clone()" ).initCause( ex ); -071} -072} //-- Prerequisites clone() -073 -074/** -075 * -076 * -077 * @param key -078 * @return InputLocation -079 */ -080public InputLocation getLocation( Object key ) -081{ -082return ( locations != null ) ? locations.get( key ) : null; -083} //-- InputLocation getLocation( Object ) -084 -085/** -086 * Get for a plugin project, the minimum version of Maven -087 * required to use -088 * the resulting plugin.br / -089 * For specifying the minimum version of Maven -090 * required to build a -091 * project, this element is bdeprecated/b. Use -092 * the Maven Enforcer -093 * Plugin's a -094 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -095 * rule instead. -096 * -097 * @return String -098 */ -099public String getMaven() -100{ -101return this.maven; -102} //-- String getMaven() -103 -104/** -105 * -106 * -107 * @param key -108 * @param location -109 */ -110public void setLocation( Object key, InputLocation location ) -111{ -112if ( location != null ) -113{ -114if ( this.locations == null ) -115{ -116this.locations = new java.util.LinkedHashMapObject, InputLocation(); -117} -118this.locations.put( key, location ); -119} -120} //-- void setLocation( Object, InputLocation ) -121 -122/** -123 * Set for a plugin project, the minimum version of Maven -124 * required to use -125 * the resulting plugin.br / -126 * For specifying the minimum version of Maven -127 * required to build a -128 * project, this element is bdeprecated/b. Use -129 * the Maven Enforcer -130 * Plugin's a -131 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -132 * rule instead. -133 * -134 * @param maven -135 */ -136public void setMaven( String maven ) -137{ -138this.maven = maven; -139} //-- void setMaven( String ) -140 -141} +024 * For a plugin project (packaging is +025 * codemaven-plugin/code), the minimum version of +026 * Maven required to use the resulting plugin.br +027 * / +028 * In Maven 2, this was also specifying the minimum +029 * version of Maven required to build a +030 * project, but this usage is bdeprecated/b in +031 * Maven 3 and not checked any more: use +032 * the a +033 *
svn commit: r997861 [16/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ ap
Modified: websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html == --- websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html (original) +++ websites/production/maven/components/ref/3-LATEST/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html Tue Sep 20 21:29:09 2016 @@ -35,225 +35,239 @@ 27 import org.apache.maven.model.Dependency; 28 import org.apache.maven.model.DependencyManagement; 29 import org.apache.maven.model.Exclusion; -30 import org.apache.maven.model.Model; -31 import org.apache.maven.model.building.ModelBuildingRequest; -32 import org.apache.maven.model.building.ModelProblem; -33 import org.apache.maven.model.building.ModelProblemCollector; -34 import org.apache.maven.model.building.ModelProblemCollectorRequest; -35 import org.codehaus.plexus.component.annotations.Component; -36 -37 /** -38 * Handles the import of dependency management from other models into the target model. -39 * -40 * @author Benjamin Bentmann -41 */ -42 @Component( role = DependencyManagementImporter.class ) -43 public class DefaultDependencyManagementImporter -44 implements DependencyManagementImporter -45 { -46 -47 @Override -48 public void importManagement( final Model target, final List? extends DependencyManagement sources, -49 final ModelBuildingRequest request, final ModelProblemCollector problems ) -50 { -51 if ( sources != null !sources.isEmpty() ) -52 { -53 final MapString, Dependency targetDependencies = new LinkedHashMap(); -54 final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null -55 ? target.getDependencyManagement() -56 : new DependencyManagement(); -57 -58 target.setDependencyManagement( targetDependencyManagement ); +30 import org.apache.maven.model.InputLocation; +31 import org.apache.maven.model.InputSource; +32 import org.apache.maven.model.Model; +33 import org.apache.maven.model.building.ModelBuildingRequest; +34 import org.apache.maven.model.building.ModelProblem; +35 import org.apache.maven.model.building.ModelProblemCollector; +36 import org.apache.maven.model.building.ModelProblemCollectorRequest; +37 import org.codehaus.plexus.component.annotations.Component; +38 +39 /** +40 * Handles the import of dependency management from other models into the target model. +41 * +42 * @author Benjamin Bentmann +43 */ +44 @Component( role = DependencyManagementImporter.class ) +45 public class DefaultDependencyManagementImporter +46 implements DependencyManagementImporter +47 { +48 +49 @Override +50 public void importManagement( final Model target, final List? extends DependencyManagement sources, +51 final ModelBuildingRequest request, final ModelProblemCollector problems ) +52 { +53 if ( sources != null !sources.isEmpty() ) +54 { +55 final MapString, Dependency targetDependencies = new LinkedHashMap(); +56 final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null +57 ? target.getDependencyManagement() +58 : new DependencyManagement(); 59 -60 for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() ) -61 { -62 targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); -63 } -64 -65 final MapString, ListDependency sourceDependencies = new LinkedHashMap(); +60 target.setDependencyManagement( targetDependencyManagement ); +61 +62 for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() ) +63 { +64 targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); +65 } 66 -67 for ( final DependencyManagement source : sources ) -68 { -69 for ( final Dependency sourceDependency : source.getDependencies() ) -70 { -71 if ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) ) -72 { -73 ListDependency conflictCanditates = -74 sourceDependencies.get(
svn commit: r997861 [13/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ ap
Modified: websites/production/maven/components/ref/3-LATEST/maven-model/xref/org/apache/maven/model/Prerequisites.html == --- websites/production/maven/components/ref/3-LATEST/maven-model/xref/org/apache/maven/model/Prerequisites.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-model/xref/org/apache/maven/model/Prerequisites.html Tue Sep 20 21:29:09 2016 @@ -29,124 +29,133 @@ 21 22 /** 23 * -24 * For a plugin project, the minimum version of -25 * Maven required to use -26 * the resulting plugin.br / -27 * For specifying the minimum version of Maven -28 * required to build a -29 * project, this element is bdeprecated/b. Use -30 * the Maven Enforcer -31 * Plugin's a -32 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -33 * rule instead. -34 * -35 * -36 */ -37 private String maven = "2.0"; -38 -39 /** -40 * Field locations. -41 */ -42 private java.util.MapObject, InputLocation locations; -43 -44 -45//---/ -46 //- Methods -/ -47 //---/ -48 -49 /** -50 * Method clone. -51 * -52 * @return Prerequisites -53 */ -54 public Prerequisites clone() -55 { -56 try -57 { -58 Prerequisites copy = (Prerequisites) super.clone(); -59 -60 if ( copy.locations != null ) -61 { -62 copy.locations = new java.util.LinkedHashMap( copy.locations ); -63 } -64 -65 return copy; -66 } -67 catch ( java.lang.Exception ex ) -68 { -69 throw (java.lang.RuntimeException) new java.lang.UnsupportedOperationException( getClass().getName() -70 + " does not support clone()" ).initCause( ex ); -71 } -72 } //-- Prerequisites clone() -73 -74 /** -75 * -76 * -77 * @param key -78 * @return InputLocation -79 */ -80 public InputLocation getLocation( Object key ) -81 { -82 return ( locations != null ) ? locations.get( key ) : null; -83 } //-- InputLocation getLocation( Object ) -84 -85 /** -86 * Get for a plugin project, the minimum version of Maven -87 * required to use -88 * the resulting plugin.br / -89 * For specifying the minimum version of Maven -90 * required to build a -91 * project, this element is bdeprecated/b. Use -92 * the Maven Enforcer -93 * Plugin's a -94 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -95 * rule instead. -96 * -97 * @return String -98 */ -99 public String getMaven() -100 { -101 return this.maven; -102 } //-- String getMaven() -103 -104 /** -105 * -106 * -107 * @param key -108 * @param location -109 */ -110 public void setLocation( Object key, InputLocation location ) -111 { -112 if ( location != null ) -113 { -114 if ( this.locations == null ) -115 { -116 this.locations = new java.util.LinkedHashMapObject, InputLocation(); -117 } -118 this.locations.put( key, location ); -119 } -120 } //-- void setLocation( Object, InputLocation ) -121 -122 /** -123 * Set for a plugin project, the minimum version of Maven -124 * required to use -125 * the resulting plugin.br / -126 * For specifying the minimum version of Maven -127 * required to build a -128 * project, this element is bdeprecated/b. Use -129 * the Maven Enforcer -130 * Plugin's a -131 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -132 * rule instead. -133 * -134 * @param maven -135 */ -136 public void setMaven( String maven ) -137 { -138 this.maven = maven; -139 } //-- void setMaven( String ) -140 -141 } +24 * For a plugin project (packaging is +25 * codemaven-plugin/code), the minimum version of +26 * Maven required to use the resulting plugin.br +27 * / +28 * In Maven 2, this was also specifying the minimum +29 * version of Maven required to build a +30 * project, but this usage is bdeprecated/b in +31 * Maven 3 and not checked any more: use +32 * the a
svn commit: r997861 [1/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Author: hboutemy Date: Tue Sep 20 21:29:09 2016 New Revision: 997861 Log: Site checkin for project Apache Maven Modified: websites/production/maven/components/ref/3-LATEST/apidocs/deprecated-list.html websites/production/maven/components/ref/3-LATEST/apidocs/index-all.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/artifact/class-use/InvalidRepositoryException.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/artifact/repository/class-use/ArtifactRepository.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/bridge/MavenRepositorySystem.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/execution/class-use/MavenExecutionRequest.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/model/Prerequisites.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html websites/production/maven/components/ref/3-LATEST/apidocs/org/apache/maven/repository/RepositorySystem.html websites/production/maven/components/ref/3-LATEST/apidocs/serialized-form.html websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/bridge/MavenRepositorySystem.html websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/Prerequisites.html websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/repository/RepositorySystem.html websites/production/maven/components/ref/3-LATEST/dependencies.html websites/production/maven/components/ref/3-LATEST/dependency-convergence.html websites/production/maven/components/ref/3-LATEST/dependency-info.html websites/production/maven/components/ref/3-LATEST/dependency-management.html websites/production/maven/components/ref/3-LATEST/distribution-management.html websites/production/maven/components/ref/3-LATEST/index.html websites/production/maven/components/ref/3-LATEST/integration.html websites/production/maven/components/ref/3-LATEST/issue-tracking.html websites/production/maven/components/ref/3-LATEST/mail-lists.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/checkstyle.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/cpd.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependencies.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-convergence.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-info.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-management.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/distribution-management.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/findbugs.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/index.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/integration.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/issue-tracking.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/mail-lists.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/plugin-management.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/plugins.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/pmd.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/project-info.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/project-reports.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/project-summary.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/sonar.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/source-repository.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/surefire-report.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/taglist.html websites/production/maven/components/ref/3-LATEST/maven-aether-provider/team-list.html websites/production/maven/components/ref/3-LATEST/maven-artifact/checkstyle.html websites/production/maven/components/ref/3-LATEST/maven-artifact/dependencies.html websites/production/maven/components/ref/3-LATEST/maven-artifact/dependency-convergence.html websites/production/maven/components/ref/3-LATEST/maven-artifact/dependency-info.html
svn commit: r997861 [9/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-model-builder/apidocs/src-html/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html == --- websites/production/maven/components/ref/3-LATEST/maven-model-builder/apidocs/src-html/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-model-builder/apidocs/src-html/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html Tue Sep 20 21:29:09 2016 @@ -35,225 +35,239 @@ 027import org.apache.maven.model.Dependency; 028import org.apache.maven.model.DependencyManagement; 029import org.apache.maven.model.Exclusion; -030import org.apache.maven.model.Model; -031import org.apache.maven.model.building.ModelBuildingRequest; -032import org.apache.maven.model.building.ModelProblem; -033import org.apache.maven.model.building.ModelProblemCollector; -034import org.apache.maven.model.building.ModelProblemCollectorRequest; -035import org.codehaus.plexus.component.annotations.Component; -036 -037/** -038 * Handles the import of dependency management from other models into the target model. -039 * -040 * @author Benjamin Bentmann -041 */ -042@Component( role = DependencyManagementImporter.class ) -043public class DefaultDependencyManagementImporter -044implements DependencyManagementImporter -045{ -046 -047@Override -048public void importManagement( final Model target, final List? extends DependencyManagement sources, -049 final ModelBuildingRequest request, final ModelProblemCollector problems ) -050{ -051if ( sources != null !sources.isEmpty() ) -052{ -053final MapString, Dependency targetDependencies = new LinkedHashMap(); -054final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null -055 ? target.getDependencyManagement() -056 : new DependencyManagement(); -057 -058 target.setDependencyManagement( targetDependencyManagement ); +030import org.apache.maven.model.InputLocation; +031import org.apache.maven.model.InputSource; +032import org.apache.maven.model.Model; +033import org.apache.maven.model.building.ModelBuildingRequest; +034import org.apache.maven.model.building.ModelProblem; +035import org.apache.maven.model.building.ModelProblemCollector; +036import org.apache.maven.model.building.ModelProblemCollectorRequest; +037import org.codehaus.plexus.component.annotations.Component; +038 +039/** +040 * Handles the import of dependency management from other models into the target model. +041 * +042 * @author Benjamin Bentmann +043 */ +044@Component( role = DependencyManagementImporter.class ) +045public class DefaultDependencyManagementImporter +046implements DependencyManagementImporter +047{ +048 +049@Override +050public void importManagement( final Model target, final List? extends DependencyManagement sources, +051 final ModelBuildingRequest request, final ModelProblemCollector problems ) +052{ +053if ( sources != null !sources.isEmpty() ) +054{ +055final MapString, Dependency targetDependencies = new LinkedHashMap(); +056final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null +057 ? target.getDependencyManagement() +058 : new DependencyManagement(); 059 -060for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() ) -061{ -062targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); -063} -064 -065final MapString, ListDependency sourceDependencies = new LinkedHashMap(); +060 target.setDependencyManagement( targetDependencyManagement ); +061 +062for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() ) +063{ +064targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); +065} 066 -067for ( final DependencyManagement source : sources ) -068{ -069for ( final Dependency sourceDependency : source.getDependencies() ) -070{ -071if ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) ) -072{ -073 ListDependency conflictCanditates = -074 sourceDependencies.get(
svn commit: r997861 [2/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/Prerequisites.html == --- websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/Prerequisites.html (original) +++ websites/production/maven/components/ref/3-LATEST/apidocs/src-html/org/apache/maven/model/Prerequisites.html Tue Sep 20 21:29:09 2016 @@ -29,124 +29,133 @@ 021 022/** 023 * -024 * For a plugin project, the minimum version of -025 * Maven required to use -026 * the resulting plugin.br / -027 * For specifying the minimum version of Maven -028 * required to build a -029 * project, this element is bdeprecated/b. Use -030 * the Maven Enforcer -031 * Plugin's a -032 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -033 * rule instead. -034 * -035 * -036 */ -037private String maven = "2.0"; -038 -039/** -040 * Field locations. -041 */ -042private java.util.MapObject, InputLocation locations; -043 -044 -045 //---/ -046 //- Methods -/ -047//---/ -048 -049/** -050 * Method clone. -051 * -052 * @return Prerequisites -053 */ -054public Prerequisites clone() -055{ -056try -057{ -058Prerequisites copy = (Prerequisites) super.clone(); -059 -060if ( copy.locations != null ) -061{ -062copy.locations = new java.util.LinkedHashMap( copy.locations ); -063} -064 -065return copy; -066} -067catch ( java.lang.Exception ex ) -068{ -069throw (java.lang.RuntimeException) new java.lang.UnsupportedOperationException( getClass().getName() -070+ " does not support clone()" ).initCause( ex ); -071} -072} //-- Prerequisites clone() -073 -074/** -075 * -076 * -077 * @param key -078 * @return InputLocation -079 */ -080public InputLocation getLocation( Object key ) -081{ -082return ( locations != null ) ? locations.get( key ) : null; -083} //-- InputLocation getLocation( Object ) -084 -085/** -086 * Get for a plugin project, the minimum version of Maven -087 * required to use -088 * the resulting plugin.br / -089 * For specifying the minimum version of Maven -090 * required to build a -091 * project, this element is bdeprecated/b. Use -092 * the Maven Enforcer -093 * Plugin's a -094 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -095 * rule instead. -096 * -097 * @return String -098 */ -099public String getMaven() -100{ -101return this.maven; -102} //-- String getMaven() -103 -104/** -105 * -106 * -107 * @param key -108 * @param location -109 */ -110public void setLocation( Object key, InputLocation location ) -111{ -112if ( location != null ) -113{ -114if ( this.locations == null ) -115{ -116this.locations = new java.util.LinkedHashMapObject, InputLocation(); -117} -118this.locations.put( key, location ); -119} -120} //-- void setLocation( Object, InputLocation ) -121 -122/** -123 * Set for a plugin project, the minimum version of Maven -124 * required to use -125 * the resulting plugin.br / -126 * For specifying the minimum version of Maven -127 * required to build a -128 * project, this element is bdeprecated/b. Use -129 * the Maven Enforcer -130 * Plugin's a -131 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"coderequireMavenVersion/code/a; -132 * rule instead. -133 * -134 * @param maven -135 */ -136public void setMaven( String maven ) -137{ -138this.maven = maven; -139} //-- void setMaven( String ) -140 -141} +024 * For a plugin project (packaging is +025 * codemaven-plugin/code), the minimum version of +026 * Maven required to use the resulting plugin.br +027 * / +028 * In Maven 2, this was also specifying the minimum +029 * version of Maven required to build a +030 * project, but this usage is bdeprecated/b in +031 * Maven 3 and not checked any more: use +032 * the a +033 * href="https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html"Maven +034 * Enforcer
svn commit: r997861 [6/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/org/apache/maven/repository/RepositorySystem.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/org/apache/maven/repository/RepositorySystem.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/org/apache/maven/repository/RepositorySystem.html Tue Sep 20 21:29:09 2016 @@ -117,13 +117,19 @@ static http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String DEFAULT_REMOTE_REPO_ID -Deprecated. +Deprecated. +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. + static http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String DEFAULT_REMOTE_REPO_URL -Deprecated. +Deprecated. +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. + @@ -195,7 +201,10 @@ https://maven.apache.org/ref/3.4.0-SNAPSHOT/maven-artifact/apidocs/org/apache/maven/artifact/repository/ArtifactRepository.html?is-external=true; title="class or interface in org.apache.maven.artifact.repository">ArtifactRepository createDefaultRemoteRepository() -Deprecated. +Deprecated. +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. + @@ -344,7 +353,8 @@ DEFAULT_REMOTE_REPO_ID http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated static finalhttp://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String DEFAULT_REMOTE_REPO_ID -Deprecated. +Deprecated.As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. See Also:Constant Field Values @@ -356,7 +366,8 @@ static finalhttp://docs.o DEFAULT_REMOTE_REPO_URL http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated static finalhttp://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true; title="class or interface in java.lang">String DEFAULT_REMOTE_REPO_URL -Deprecated. +Deprecated.As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. See Also:Constant Field Values @@ -456,7 +467,8 @@ static finalhttp://docs.o http://docs.oracle.com/javase/7/docs/api/java/lang/Deprecated.html?is-external=true; title="class or interface in java.lang">@Deprecated https://maven.apache.org/ref/3.4.0-SNAPSHOT/maven-artifact/apidocs/org/apache/maven/artifact/repository/ArtifactRepository.html?is-external=true; title="class or interface in org.apache.maven.artifact.repository">ArtifactRepositorycreateDefaultRemoteRepository() throws InvalidRepositoryException -Deprecated. +Deprecated.As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. Throws: InvalidRepositoryException Modified: websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/src-html/org/apache/maven/bridge/MavenRepositorySystem.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/src-html/org/apache/maven/bridge/MavenRepositorySystem.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/src-html/org/apache/maven/bridge/MavenRepositorySystem.html Tue Sep 20 21:29:09 2016 @@ -577,7 +577,7 @@ 569// Code taken from LegacyRepositorySystem 570// 571/** -572 * @deprecation As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier +572 * @deprecated As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier 573 * {@code central} if such a repository is not provided in the settings or the POM. 574 */ 575@Deprecated Modified: websites/production/maven/components/ref/3-LATEST/maven-core/apidocs/src-html/org/apache/maven/repository/RepositorySystem.html == ---
svn commit: r997861 [5/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-compat/surefire-report.html == --- websites/production/maven/components/ref/3-LATEST/maven-compat/surefire-report.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-compat/surefire-report.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Compat Surefire Report @@ -82,7 +82,7 @@ Surefire Report - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT @@ -414,7 +414,7 @@ function toggleDisplay(elementId) { 0 0 100% -7.617 +8.925 Note: failures are anticipated and checked for with assertions while errors are unanticipated. Package List @@ -435,7 +435,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.092 +0.116 org.apache.maven.artifact.installer 1 @@ -443,7 +443,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.051 +0.055 org.apache.maven.artifact.resolver 10 @@ -451,7 +451,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.55 +0.548 org.apache.maven.project.path 3 @@ -459,7 +459,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.046 +0.048 org.apache.maven.repository 11 @@ -467,7 +467,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.555 +0.49 org.apache.maven.project.inheritance.t10 1 @@ -475,7 +475,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.127 +0.158 org.apache.maven.project.inheritance.t12 1 @@ -483,7 +483,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.12 +0.168 org.apache.maven.project.inheritance.t11 1 @@ -491,7 +491,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.186 +0.213 org.apache.maven.repository.legacy.resolver.conflict 16 @@ -499,7 +499,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.548 +0.613 org.apache.maven.artifact.resolver.filter 8 @@ -507,7 +507,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.002 +0.001 org.apache.maven.repository.legacy.resolver 29 @@ -515,7 +515,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.811 +0.949 org.apache.maven.project 16 @@ -523,7 +523,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.219 +0.198 org.apache.maven.artifact.repository 1 @@ -539,7 +539,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.155 +0.22 org.apache.maven.artifact.deployer 1 @@ -547,7 +547,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.081 +0.084 org.apache.maven.artifact.transform 1 @@ -555,7 +555,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.021 +0.02 org.apache.maven.project.inheritance.t09 2 @@ -563,7 +563,7 @@ function toggleDisplay(elementId) { 0 0 100% -1.467 +1.875 org.apache.maven.artifact 14 @@ -579,7 +579,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.215 +0.272 org.apache.maven.project.inheritance.t12scm 2 @@ -587,7 +587,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.297 +0.406 org.apache.maven.artifact.factory 1 @@ -603,7 +603,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.122 +0.165 org.apache.maven.project.inheritance.t06 1 @@ -611,7 +611,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.14 +0.21 org.apache.maven.repository.legacy 16 @@ -619,7 +619,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.612 +0.676 org.apache.maven.project.inheritance.t05 1 @@ -627,7 +627,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.162 +0.205 org.apache.maven.project.inheritance.t04 1 @@ -635,7 +635,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.182 +0.203 org.apache.maven.project.inheritance.t03 1 @@ -643,7 +643,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.14 +0.202 org.apache.maven.project.inheritance.t02 1 @@ -651,7 +651,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.312 +0.377 org.apache.maven.project.inheritance.t01 1 @@ -659,7 +659,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.223 +0.236 org.apache.maven.project.inheritance.t00 1 @@ -667,7 +667,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.154 +0.19 Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. org.apache.maven.profiles.manager @@ -689,7 +689,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.092 +0.116 org.apache.maven.artifact.installer @@ -710,7 +710,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.051 +0.055 org.apache.maven.artifact.resolver @@ -731,7 +731,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.131 +0.126 ArtifactResolutionExceptionTest @@ -749,7 +749,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.419 +0.422 org.apache.maven.project.path @@ -770,7 +770,7 @@ function
svn commit: r997861 [4/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-builder-support/checkstyle.html == --- websites/production/maven/components/ref/3-LATEST/maven-builder-support/checkstyle.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-builder-support/checkstyle.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Builder Support Checkstyle Results @@ -82,7 +82,7 @@ Checkstyle Results - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependencies.html == --- websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependencies.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependencies.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Builder Support Project Dependencies @@ -82,7 +82,7 @@ Project Dependencies - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-convergence.html == --- websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-convergence.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-convergence.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Builder Support Reactor Dependency Convergence @@ -82,7 +82,7 @@ Reactor Dependency Convergence - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-info.html == --- websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-info.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-info.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Builder Support Dependency Information @@ -82,7 +82,7 @@ Dependency Information - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-management.html == --- websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-management.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-builder-support/dependency-management.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Builder Support Project Dependency Management @@ -82,7 +82,7 @@ Project Dependency Management - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-builder-support/distribution-management.html == --- websites/production/maven/components/ref/3-LATEST/maven-builder-support/distribution-management.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-builder-support/distribution-management.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Builder Support Project Distribution Management @@ -82,7 +82,7 @@ Project Distribution Management - | Last Published: 2016-09-14 + | Last Published: 2016-09-20
svn commit: r997861 [3/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-aether-provider/cpd.html == --- websites/production/maven/components/ref/3-LATEST/maven-aether-provider/cpd.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-aether-provider/cpd.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Aether Provider CPD Results @@ -82,7 +82,7 @@ CPD Results - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependencies.html == --- websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependencies.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependencies.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Aether Provider Project Dependencies @@ -82,7 +82,7 @@ Project Dependencies - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT @@ -1087,7 +1087,7 @@ Yes maven-model-builder-3.4.0-SNAPSHOT.jar -187.9 kB +188 kB 160 124 18 Modified: websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-convergence.html == --- websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-convergence.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-convergence.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Aether Provider Reactor Dependency Convergence @@ -82,7 +82,7 @@ Reactor Dependency Convergence - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-info.html == --- websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-info.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-info.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Aether Provider Dependency Information @@ -82,7 +82,7 @@ Dependency Information - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-management.html == --- websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-management.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-aether-provider/dependency-management.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Aether Provider Project Dependency Management @@ -82,7 +82,7 @@ Project Dependency Management - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-aether-provider/distribution-management.html == --- websites/production/maven/components/ref/3-LATEST/maven-aether-provider/distribution-management.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-aether-provider/distribution-management.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Aether Provider Project Distribution Management @@ -82,7 +82,7 @@ Project Distribution Management - | Last Published:
svn commit: r997861 [8/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ api
Modified: websites/production/maven/components/ref/3-LATEST/maven-core/taglist.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/taglist.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/taglist.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Core Tag List report @@ -82,7 +82,7 @@ Tag List report - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT @@ -417,7 +417,7 @@ Tag strings used by tag class Deprecated Work -31 +36 @deprecated FIXME Work @@ -430,7 +430,7 @@ Each tag is detailed below: Deprecated Work -Number of occurrences found in the code: 31 +Number of occurrences found in the code: 36 org.apache.maven.ArtifactFilterManager @@ -466,6 +466,12 @@ use {@link #ArtifactMetadataRetrievalException(String, Throwable, Artifact)} 43 +org.apache.maven.bridge.MavenRepositorySystem +Line + +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier {@code central} if such a repository is not provided in the settings or the POM. +572 + org.apache.maven.classrealm.ClassRealmRequest Line @@ -559,6 +565,24 @@ This got added when implementing MNG-2199 and is no longer used. Commit 6cf9320942c34bc68205425ab696b1712ace9ba4 updated the way 'MavenProject' objects are initialized. 181 +org.apache.maven.repository.RepositorySystem +Line + +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier {@code central} if such a repository is not provided in the settings or the POM. +54 + +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier {@code central} if such a repository is not provided in the settings or the POM. +61 + +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier {@code central} if such a repository is not provided in the settings or the POM. +84 + +org.apache.maven.repository.TestRepositorySystem +Line + +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier {@code central} if such a repository is not provided in the settings or the POM. +110 + org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException Line Modified: websites/production/maven/components/ref/3-LATEST/maven-core/team-list.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/team-list.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/team-list.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Core Project Team @@ -82,7 +82,7 @@ Project Team - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT Modified: websites/production/maven/components/ref/3-LATEST/maven-core/testapidocs/deprecated-list.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/testapidocs/deprecated-list.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/testapidocs/deprecated-list.html Tue Sep 20 21:29:09 2016 @@ -80,7 +80,10 @@ -org.apache.maven.repository.TestRepositorySystem.createDefaultRemoteRepository() +org.apache.maven.repository.TestRepositorySystem.createDefaultRemoteRepository() +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. + Modified: websites/production/maven/components/ref/3-LATEST/maven-core/testapidocs/index-all.html == --- websites/production/maven/components/ref/3-LATEST/maven-core/testapidocs/index-all.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-core/testapidocs/index-all.html Tue Sep 20 21:29:09 2016 @@ -226,7 +226,10 @@ createDefaultRemoteRepository() - Method in class org.apache.maven.repository.TestRepositorySystem -Deprecated. +Deprecated. +As of 3.4, Maven no longer falls back to a hard-coded default repository with identifier + central if such a repository is not provided in the settings or the POM. + createDependencyArtifact(Dependency) - Method in class org.apache.maven.repository.TestRepositorySystem Modified:
svn commit: r997861 [10/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ ap
Modified: websites/production/maven/components/ref/3-LATEST/maven-model-builder/surefire-report.html == --- websites/production/maven/components/ref/3-LATEST/maven-model-builder/surefire-report.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-model-builder/surefire-report.html Tue Sep 20 21:29:09 2016 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml; xml:lang="en" lang="en"> - + Maven Model Builder Surefire Report @@ -82,7 +82,7 @@ Surefire Report - | Last Published: 2016-09-14 + | Last Published: 2016-09-20 Version: 3.4.0-SNAPSHOT @@ -422,7 +422,7 @@ function toggleDisplay(elementId) { 0 0 100% -2.847 +2.96 Note: failures are anticipated and checked for with assertions while errors are unanticipated. Package List @@ -443,7 +443,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.718 +0.736 org.apache.maven.model.validation 44 @@ -451,7 +451,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.605 +0.636 org.apache.maven.model.path 4 @@ -467,7 +467,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.828 +0.887 org.apache.maven.model.merge 4 @@ -475,7 +475,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.021 +0.02 org.apache.maven.model.building 2 @@ -483,7 +483,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.05 +0.049 org.apache.maven.model.interpolation 30 @@ -491,7 +491,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.581 +0.588 Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers. org.apache.maven.model.inheritance @@ -513,7 +513,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.718 +0.736 org.apache.maven.model.validation @@ -534,7 +534,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.605 +0.636 org.apache.maven.model.path @@ -576,7 +576,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.67 +0.72 JdkVersionProfileActivatorTest @@ -585,7 +585,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.158 +0.167 org.apache.maven.model.merge @@ -606,7 +606,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.021 +0.02 org.apache.maven.model.building @@ -636,7 +636,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.005 +0.004 org.apache.maven.model.interpolation @@ -657,7 +657,7 @@ function toggleDisplay(elementId) { 0 0 100% -0.581 +0.588 MavenBuildTimestampTest @@ -676,27 +676,27 @@ function toggleDisplay(elementId) { testWithValue_SystemProperty -0.391 +0.41 testNullSafe -0.043 +0.049 testWithNegatedNameOnly_UserProperty -0.028 +0.041 testWithNegatedValue_UserProperty -0.028 +0.032 testWithValue_UserPropertyDominantOverSystemProperty -0.026 +0.027 testWithNameOnly_UserProperty -0.027 +0.028 testWithNegatedNameOnly_SystemProperty @@ -704,15 +704,15 @@ function toggleDisplay(elementId) { testWithValue_UserProperty -0.025 +0.026 testWithNameOnly_SystemProperty -0.025 +0.026 testWithNegatedValue_SystemProperty -0.024 +0.025 StringSearchModelInterpolatorTest @@ -731,7 +731,7 @@ function toggleDisplay(elementId) { testInterpolateObjectWithStringToStringMapField -0.019 +0.02 testLocationTrackerShouldBeExcludedFromInterpolation @@ -739,11 +739,11 @@ function toggleDisplay(elementId) { testInterpolateStringArray -0.018 +0.019 testInterpolateObjectWithStringArrayListField -0.019 +0.018 testFinalFieldsExcludedFromInterpolation @@ -751,7 +751,7 @@ function toggleDisplay(elementId) { testInterpolateObjectWithStringArrayField -0.018 +0.019 testInterpolateObjectWithUnmodifiableStringToStringMapField @@ -759,11 +759,11 @@ function toggleDisplay(elementId) { testInterpolateObjectWithStringListFieldAndOneLiteralValue -0.017 +0.018 testInterpolateObjectWithStringToStringArrayMapField -0.017 +0.018 testInterpolateObjectWithStringListField @@ -775,19 +775,19 @@ function toggleDisplay(elementId) { testShouldInterpolateSourceDirectoryReferencedFromResourceDirectoryCorrectly -0.017 +0.018 testEnvarExpressionThatEvaluatesToNullReturnsTheLiteralString -0.018 +0.019 testBaseUri -0.018 +0.017 testBasedir -0.016 +0.017 testShouldNotThrowExceptionOnReferenceToNonExistentValue @@ -795,7 +795,7 @@ function toggleDisplay(elementId) { testShouldNotInterpolateDependencyVersionWithInvalidReference -0.016 +0.017 testShouldInterpolateOrganizationNameCorrectly @@ -823,15 +823,15 @@ function toggleDisplay(elementId) { testShouldInterpolateUnprefixedBasedirExpression -0.016 +0.017 testTwoReferences -0.017 +0.016 testExpressionThatEvaluatesToNullReturnsTheLiteralString -0.016 +0.017 DefaultUrlNormalizerTest @@ -850,18 +850,18 @@ function
svn commit: r997861 [11/16] - in /websites/production/maven/components/ref/3-LATEST: ./ apidocs/ apidocs/org/apache/maven/artifact/class-use/ apidocs/org/apache/maven/artifact/repository/class-use/ ap
Modified: websites/production/maven/components/ref/3-LATEST/maven-model-builder/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html == --- websites/production/maven/components/ref/3-LATEST/maven-model-builder/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html (original) +++ websites/production/maven/components/ref/3-LATEST/maven-model-builder/xref/org/apache/maven/model/composition/DefaultDependencyManagementImporter.html Tue Sep 20 21:29:09 2016 @@ -35,225 +35,239 @@ 27 import org.apache.maven.model.Dependency; 28 import org.apache.maven.model.DependencyManagement; 29 import org.apache.maven.model.Exclusion; -30 import org.apache.maven.model.Model; -31 import org.apache.maven.model.building.ModelBuildingRequest; -32 import org.apache.maven.model.building.ModelProblem; -33 import org.apache.maven.model.building.ModelProblemCollector; -34 import org.apache.maven.model.building.ModelProblemCollectorRequest; -35 import org.codehaus.plexus.component.annotations.Component; -36 -37 /** -38 * Handles the import of dependency management from other models into the target model. -39 * -40 * @author Benjamin Bentmann -41 */ -42 @Component( role = DependencyManagementImporter.class ) -43 public class DefaultDependencyManagementImporter -44 implements DependencyManagementImporter -45 { -46 -47 @Override -48 public void importManagement( final Model target, final List? extends DependencyManagement sources, -49 final ModelBuildingRequest request, final ModelProblemCollector problems ) -50 { -51 if ( sources != null !sources.isEmpty() ) -52 { -53 final MapString, Dependency targetDependencies = new LinkedHashMap(); -54 final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null -55 ? target.getDependencyManagement() -56 : new DependencyManagement(); -57 -58 target.setDependencyManagement( targetDependencyManagement ); +30 import org.apache.maven.model.InputLocation; +31 import org.apache.maven.model.InputSource; +32 import org.apache.maven.model.Model; +33 import org.apache.maven.model.building.ModelBuildingRequest; +34 import org.apache.maven.model.building.ModelProblem; +35 import org.apache.maven.model.building.ModelProblemCollector; +36 import org.apache.maven.model.building.ModelProblemCollectorRequest; +37 import org.codehaus.plexus.component.annotations.Component; +38 +39 /** +40 * Handles the import of dependency management from other models into the target model. +41 * +42 * @author Benjamin Bentmann +43 */ +44 @Component( role = DependencyManagementImporter.class ) +45 public class DefaultDependencyManagementImporter +46 implements DependencyManagementImporter +47 { +48 +49 @Override +50 public void importManagement( final Model target, final List? extends DependencyManagement sources, +51 final ModelBuildingRequest request, final ModelProblemCollector problems ) +52 { +53 if ( sources != null !sources.isEmpty() ) +54 { +55 final MapString, Dependency targetDependencies = new LinkedHashMap(); +56 final DependencyManagement targetDependencyManagement = target.getDependencyManagement() != null +57 ? target.getDependencyManagement() +58 : new DependencyManagement(); 59 -60 for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() ) -61 { -62 targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); -63 } -64 -65 final MapString, ListDependency sourceDependencies = new LinkedHashMap(); +60 target.setDependencyManagement( targetDependencyManagement ); +61 +62 for ( final Dependency targetDependency : targetDependencyManagement.getDependencies() ) +63 { +64 targetDependencies.put( targetDependency.getManagementKey(), targetDependency ); +65 } 66 -67 for ( final DependencyManagement source : sources ) -68 { -69 for ( final Dependency sourceDependency : source.getDependencies() ) -70 { -71 if ( !targetDependencies.containsKey( sourceDependency.getManagementKey() ) ) -72 { -73 ListDependency conflictCanditates = -74
svn commit: r1761637 - in /maven/enforcer/trunk: enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/ enforcer-rules/src/site/apt/ enforcer-rules/src/test/java/org/apache/maven/plugins/enfo
Author: gboue Date: Tue Sep 20 20:40:57 2016 New Revision: 1761637 URL: http://svn.apache.org/viewvc?rev=1761637=rev Log: [MENFORCER-204] Add new rule: should be able to make sure that project artifact is a Snapshot Adding a RequireSnapshotVersion rule, which is the opposite of the RequireReleaseVersion rule. Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java (with props) maven/enforcer/trunk/enforcer-rules/src/site/apt/requireSnapshotVersion.apt.vm (with props) maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestRequireSnapshotVersion.java (with props) maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/invoker.properties (with props) maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/pom.xml (with props) maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/ maven/enforcer/trunk/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/pom.xml (with props) Modified: maven/enforcer/trunk/enforcer-rules/src/site/apt/index.apt Added: maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java URL: http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java?rev=1761637=auto == --- maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java (added) +++ maven/enforcer/trunk/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireSnapshotVersion.java Tue Sep 20 20:40:57 2016 @@ -0,0 +1,92 @@ +package org.apache.maven.plugins.enforcer; + +/* + * 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. + */ + +import org.apache.maven.artifact.Artifact; +import org.apache.maven.enforcer.rule.api.EnforcerRuleException; +import org.apache.maven.enforcer.rule.api.EnforcerRuleHelper; +import org.apache.maven.project.MavenProject; +import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException; + +/** + * This rule checks that the current project is not a release. + */ +public class RequireSnapshotVersion +extends AbstractNonCacheableEnforcerRule +{ + +/** + * Allows this rule to fail when the parent is defined as a release. + */ +private boolean failWhenParentIsRelease = true; + +public void execute( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ + +MavenProject project = getProject( helper ); +Artifact artifact = project.getArtifact(); + +if ( !artifact.isSnapshot() ) +{ +String message = getMessage(); +StringBuilder sb = new StringBuilder(); +if ( message != null ) +{ +sb.append( message ).append( '\n' ); +} +sb.append( "This project cannot be a release:" ).append( artifact.getId() ); +throw new EnforcerRuleException( sb.toString() ); +} +if ( failWhenParentIsRelease ) +{ +Artifact parentArtifact = project.getParentArtifact(); +if ( parentArtifact != null && !parentArtifact.isSnapshot() ) +{ +throw new EnforcerRuleException( "Parent cannot be a release: " + parentArtifact.getId() ); +} +} + +} + +private MavenProject getProject( EnforcerRuleHelper helper ) +throws EnforcerRuleException +{ +try +{ +return (MavenProject) helper.evaluate( "${project}" ); +} +catch ( ExpressionEvaluationException eee ) +{ +throw new EnforcerRuleException( "Unable to retrieve the MavenProject: ", eee ); +} +} + +public boolean isFailWhenParentIsRelease() +{ +return failWhenParentIsRelease; +} + +public void
svn commit: r1761604 - /maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
Author: hboutemy Date: Tue Sep 20 17:11:52 2016 New Revision: 1761604 URL: http://svn.apache.org/viewvc?rev=1761604=rev Log: improved message in case of failure Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java?rev=1761604=1761603=1761604=diff == --- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java (original) +++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java Tue Sep 20 17:11:52 2016 @@ -583,7 +583,8 @@ public class TestCopyDependenciesMojo mojo.execute(); -assertTrue( time < copiedFile.lastModified() ); +assertTrue( "time = " + time + " should be < to " + copiedFile.lastModified(), +time < copiedFile.lastModified() ); } public void testDontOverWriteSnap()
maven git commit: fixed typo
Repository: maven Updated Branches: refs/heads/master 950a90ece -> 34aca1a8b fixed typo Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/34aca1a8 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/34aca1a8 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/34aca1a8 Branch: refs/heads/master Commit: 34aca1a8bb6d2a7a6c3c9f44015646fbf50bfe41 Parents: 950a90e Author: Hervé BoutemyAuthored: Tue Sep 20 19:02:51 2016 +0200 Committer: Hervé Boutemy Committed: Tue Sep 20 19:02:51 2016 +0200 -- maven-model/src/main/mdo/maven.mdo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/maven/blob/34aca1a8/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 2ee666b..9822670 100644 --- a/maven-model/src/main/mdo/maven.mdo +++ b/maven-model/src/main/mdo/maven.mdo @@ -3639,9 +3639,9 @@ For a plugin project (packaging is maven-plugin), the minimum version of Maven required to use the resulting plugin. In Maven 2, this was also specifying the minimum version of Maven required to build a -project, but this usage is deprecated in Maven 3 and checked not any more: use -the Maven Enforcer Plugin's -requireMavenVersion rule instead. +project, but this usage is deprecated in Maven 3 and not checked any more: use +the https://maven.apache.org/enforcer/enforcer-rules/requireMavenVersion.html;>Maven Enforcer Plugin's +requireMavenVersion rule instead. ]]> false