Skip to content

[MNG-11642] Add JPMS module support to Maven 4 #12135

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

Draft
gnodet wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[MNG-11642] Add JPMS module support to Maven 4 #12135

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
4 changes: 4 additions & 0 deletions api/maven-api-annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@
<name>Maven 4 API :: Meta annotations</name>
<description>Maven 4 API - Java meta annotations.</description>

<properties>
<javaModuleName>org.apache.maven.api.annotations</javaModuleName>
</properties>

</project>
22 changes: 22 additions & 0 deletions api/maven-api-annotations/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* 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.
*/

module org.apache.maven.api.annotations {
exports org.apache.maven.api.annotations;
}
4 changes: 4 additions & 0 deletions api/maven-api-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<name>Maven 4 API :: CLI</name>
<description>Maven 4 API - CLI.</description>

<properties>
<javaModuleName>org.apache.maven.api.cli</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
33 changes: 33 additions & 0 deletions api/maven-api-cli/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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.
*/

module org.apache.maven.api.cli {
requires transitive org.apache.maven.api;
requires transitive org.apache.maven.api.annotations;
requires transitive org.apache.maven.api.xml;

exports org.apache.maven.api.cli;
exports org.apache.maven.api.cli.cisupport;
exports org.apache.maven.api.cli.extensions;
exports org.apache.maven.api.cli.logging;
exports org.apache.maven.api.cli.mvn;
exports org.apache.maven.api.cli.mvnenc;
exports org.apache.maven.api.cli.mvnsh;
exports org.apache.maven.api.cli.mvnup;
}
4 changes: 4 additions & 0 deletions api/maven-api-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<name>Maven 4 API :: Core</name>
<description>Maven 4 API - Maven Core API</description>

<properties>
<javaModuleName>org.apache.maven.api</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
37 changes: 37 additions & 0 deletions api/maven-api-core/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* 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.
*/

module org.apache.maven.api {
requires transitive org.apache.maven.api.annotations;
requires transitive org.apache.maven.api.di;
requires transitive org.apache.maven.api.model;
requires transitive org.apache.maven.api.settings;
requires transitive org.apache.maven.api.toolchain;
requires transitive org.apache.maven.api.plugin.descriptor;
requires transitive org.apache.maven.api.xml;
requires java.compiler;

exports org.apache.maven.api;
exports org.apache.maven.api.cache;
exports org.apache.maven.api.feature;
exports org.apache.maven.api.plugin;
exports org.apache.maven.api.plugin.annotations;
exports org.apache.maven.api.services;
exports org.apache.maven.api.services.xml;
}
1 change: 1 addition & 0 deletions api/maven-api-di/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<description>Maven 4 API - Dependency Injection</description>

<properties>
<javaModuleName>org.apache.maven.api.di</javaModuleName>
<maven.compiler.proc>none</maven.compiler.proc>
</properties>
</project>
28 changes: 28 additions & 0 deletions api/maven-api-di/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/*
* 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.
*/

module org.apache.maven.api.di {
exports org.apache.maven.api.di;
exports org.apache.maven.di.tool;

requires java.compiler;

provides javax.annotation.processing.Processor with
org.apache.maven.di.tool.DiIndexProcessor;
}
4 changes: 4 additions & 0 deletions api/maven-api-metadata/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ under the License.
<name>Maven 4 API :: Repository Metadata</name>
<description>Maven 4 API - Immutable Repository Metadata model.</description>

<properties>
<javaModuleName>org.apache.maven.api.metadata</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
24 changes: 24 additions & 0 deletions api/maven-api-metadata/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* 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.
*/

module org.apache.maven.api.metadata {
requires transitive org.apache.maven.api.annotations;

exports org.apache.maven.api.metadata;
}
4 changes: 4 additions & 0 deletions api/maven-api-model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ under the License.
<name>Maven 4 API :: Model</name>
<description>Maven 4 API - Immutable Model for Maven POM (Project Object Model).</description>

<properties>
<javaModuleName>org.apache.maven.api.model</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
27 changes: 27 additions & 0 deletions api/maven-api-model/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* 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.
*/

module org.apache.maven.api.model {
requires transitive org.apache.maven.api.annotations;
requires transitive org.apache.maven.api.xml;

exports org.apache.maven.api.model;

uses org.apache.maven.api.model.ModelObjectProcessor;
}
4 changes: 4 additions & 0 deletions api/maven-api-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ under the License.
<name>Maven 4 API :: Plugin</name>
<description>Maven 4 API - Immutable Plugin model.</description>

<properties>
<javaModuleName>org.apache.maven.api.plugin.descriptor</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
26 changes: 26 additions & 0 deletions api/maven-api-plugin/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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.
*/

module org.apache.maven.api.plugin.descriptor {
requires transitive org.apache.maven.api.annotations;
requires transitive org.apache.maven.api.xml;

exports org.apache.maven.api.plugin.descriptor;
exports org.apache.maven.api.plugin.descriptor.lifecycle;
}
4 changes: 4 additions & 0 deletions api/maven-api-settings/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ under the License.
<name>Maven 4 API :: Settings</name>
<description>Maven 4 API - Immutable Settings model.</description>

<properties>
<javaModuleName>org.apache.maven.api.settings</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
25 changes: 25 additions & 0 deletions api/maven-api-settings/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* 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.
*/

module org.apache.maven.api.settings {
requires transitive org.apache.maven.api.annotations;
requires transitive org.apache.maven.api.xml;

exports org.apache.maven.api.settings;
}
4 changes: 4 additions & 0 deletions api/maven-api-spi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<name>Maven 4 API :: SPI</name>
<description>Maven 4 API - Maven SPI.</description>

<properties>
<javaModuleName>org.apache.maven.api.spi</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
26 changes: 26 additions & 0 deletions api/maven-api-spi/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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.
*/

module org.apache.maven.api.spi {
requires transitive org.apache.maven.api;
requires transitive org.apache.maven.api.di;
requires transitive org.apache.maven.api.model;

exports org.apache.maven.api.spi;
}
4 changes: 4 additions & 0 deletions api/maven-api-toolchain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ under the License.
<name>Maven 4 API :: Toolchain</name>
<description>Maven 4 API - Immutable Toolchain model.</description>

<properties>
<javaModuleName>org.apache.maven.api.toolchain</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
25 changes: 25 additions & 0 deletions api/maven-api-toolchain/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* 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.
*/

module org.apache.maven.api.toolchain {
requires transitive org.apache.maven.api.annotations;
requires transitive org.apache.maven.api.xml;

exports org.apache.maven.api.toolchain;
}
4 changes: 4 additions & 0 deletions api/maven-api-xml/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<name>Maven 4 API :: XML</name>
<description>Maven 4 API - Immutable XML.</description>

<properties>
<javaModuleName>org.apache.maven.api.xml</javaModuleName>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Expand Down
Loading
Loading