Skip to content

[MNG-8410] API cleanup #1957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2024
Merged

[MNG-8410] API cleanup #1957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/maven-api-meta/pom.xml → api/maven-api-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<version>4.0.0-rc-2-SNAPSHOT</version>
</parent>

<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
<name>Maven 4 API :: Meta annotations</name>
<description>Maven 4 API - Java meta annotations.</description>

Expand Down
0 .../apache/maven/api/annotations/Config.java → .../apache/maven/api/annotations/Config.java
View file
Open in desktop
File renamed without changes.
0 ...pache/maven/api/annotations/Consumer.java → ...pache/maven/api/annotations/Consumer.java
View file
Open in desktop
File renamed without changes.
0 ...e/maven/api/annotations/Experimental.java → ...e/maven/api/annotations/Experimental.java
View file
Open in desktop
File renamed without changes.
0 ...ache/maven/api/annotations/Generated.java → ...ache/maven/api/annotations/Generated.java
View file
Open in desktop
File renamed without changes.
0 ...ache/maven/api/annotations/Immutable.java → ...ache/maven/api/annotations/Immutable.java
View file
Open in desktop
File renamed without changes.
0 ...apache/maven/api/annotations/Nonnull.java → ...apache/maven/api/annotations/Nonnull.java
View file
Open in desktop
File renamed without changes.
0 .../maven/api/annotations/NotThreadSafe.java → .../maven/api/annotations/NotThreadSafe.java
View file
Open in desktop
File renamed without changes.
0 ...pache/maven/api/annotations/Nullable.java → ...pache/maven/api/annotations/Nullable.java
View file
Open in desktop
File renamed without changes.
0 ...pache/maven/api/annotations/Provider.java → ...pache/maven/api/annotations/Provider.java
View file
Open in desktop
File renamed without changes.
0 ...che/maven/api/annotations/ThreadSafe.java → ...che/maven/api/annotations/ThreadSafe.java
View file
Open in desktop
File renamed without changes.
0 ...e/maven/api/annotations/package-info.java → ...e/maven/api/annotations/package-info.java
View file
Open in desktop
File renamed without changes.
0 api/maven-api-meta/src/site/site.xml → api/maven-api-annotations/src/site/site.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion api/maven-api-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-metadata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-settings/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-toolchain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion api/maven-api-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<description>A new immutable API for Maven 4 to better manage what plugins and extensions can influence.</description>

<modules>
<module>maven-api-meta</module>
<module>maven-api-annotations</module>
<module>maven-api-di</module>
<module>maven-api-xml</module>
<module>maven-api-model</module>
Expand Down
2 changes: 1 addition & 1 deletion compat/maven-model-builder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compat/maven-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compat/maven-plugin-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compat/maven-repository-metadata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compat/maven-settings/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion compat/maven-toolchain-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion impl/maven-core/src/main/resources/META-INF/maven/extension.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ under the License.

<exportedArtifacts>
<!-- maven 4 api -->
<exportedArtifact>org.apache.maven:maven-api-annotations</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-core</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-di</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-meta</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-metadata</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-model</exportedArtifact>
<exportedArtifact>org.apache.maven:maven-api-plugin</exportedArtifact>
Expand Down
2 changes: 1 addition & 1 deletion impl/maven-di/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion impl/maven-executor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
<scope>provided</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion impl/maven-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion impl/maven-jline/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
2 changes: 1 addition & 1 deletion its/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
<version>${maven-version}</version>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-api-meta</artifactId>
<artifactId>maven-api-annotations</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
Loading