Skip to content

Commit 006ad92

Browse files
authored
[MNG-8590] Make sure maven-resolver-provider does not depend on maven-impl (#2123)
1 parent 62e6ce7 commit 006ad92

File tree

124 files changed

+757
-999
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+757
-999
lines changed

compat/maven-embedder/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ under the License.
6767
<groupId>org.apache.maven</groupId>
6868
<artifactId>maven-di</artifactId>
6969
</dependency>
70-
<dependency>
71-
<groupId>org.apache.maven</groupId>
72-
<artifactId>maven-impl</artifactId>
73-
</dependency>
7470
<dependency>
7571
<groupId>org.apache.maven</groupId>
7672
<artifactId>maven-jline</artifactId>

compat/maven-model-builder/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ under the License.
4545
<groupId>org.apache.maven</groupId>
4646
<artifactId>maven-api-model</artifactId>
4747
</dependency>
48-
<dependency>
49-
<groupId>org.apache.maven</groupId>
50-
<artifactId>maven-impl</artifactId>
51-
</dependency>
5248
<dependency>
5349
<groupId>org.apache.maven</groupId>
5450
<artifactId>maven-model</artifactId>

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/AbstractModelBuildingListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Provides a skeleton implementation for model building listeners. The methods of this class are empty.
2323
*
24-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
24+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
2525
*/
2626
@Deprecated(since = "4.0.0")
2727
public class AbstractModelBuildingListener implements ModelBuildingListener {

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Represents a model pulled from a repository
2929
*
3030
* @since 4.0.0
31-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
31+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
3232
*/
3333
@Deprecated(since = "4.0.0")
3434
public class ArtifactModelSource extends FileSource implements ModelSource {

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
import static org.apache.maven.model.building.Result.newResult;
9292

9393
/**
94-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
94+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
9595
*/
9696
@SuppressWarnings("UnusedReturnValue")
9797
@Named

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
* plugins should always acquire model builder instances via dependency injection. Developers might want to subclass
7474
* this factory to provide custom implementations for some of the components used by the model builder.
7575
*
76-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
76+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
7777
*/
7878
@Deprecated(since = "4.0.0")
7979
public class DefaultModelBuilderFactory {

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Holds data relevant for a model building event.
2525
*
26-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
26+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
2727
*/
2828
@Deprecated(since = "4.0.0")
2929
class DefaultModelBuildingEvent implements ModelBuildingEvent {

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
/**
3333
* Collects settings that control building of effective models.
3434
*
35-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
35+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
3636
*/
3737
@Deprecated(since = "4.0.0")
3838
public class DefaultModelBuildingRequest implements ModelBuildingRequest {

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuildingResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/**
3131
* Collects the output of the model builder.
3232
*
33-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
33+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
3434
*/
3535
@Deprecated(since = "4.0.0")
3636
class DefaultModelBuildingResult implements ModelBuildingResult {

compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* or a simple string message. In addition, a problem carries a hint about its source, e.g. the POM file that exhibits
2626
* the problem.
2727
*
28-
* @deprecated use {@link org.apache.maven.api.services.ModelBuilder} instead
28+
* @deprecated use {@code org.apache.maven.api.services.ModelBuilder} instead
2929
*/
3030
@Deprecated(since = "4.0.0")
3131
public class DefaultModelProblem implements ModelProblem {

0 commit comments

Comments
 (0)