You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/04/05 22:22:52 UTC
maven git commit: Add examples of module-info for some Maven modules.
Repository: maven
Updated Branches:
refs/heads/jigsaw [created] 1468f2dec
Add examples of module-info for some Maven modules.
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/1468f2de
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/1468f2de
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/1468f2de
Branch: refs/heads/jigsaw
Commit: 1468f2dec4aa10cc08aaf24bc6b73d22cbb26383
Parents: 3533599
Author: rfscholte <rf...@apache.org>
Authored: Tue Apr 5 22:22:33 2016 +0200
Committer: rfscholte <rf...@apache.org>
Committed: Tue Apr 5 22:22:33 2016 +0200
----------------------------------------------------------------------
.../src/main/java/module-info.java | 25 +++++++++++++
.../src/main/java/module-info.java | 34 +++++++++++++++++
maven-settings/src/main/java/module-info.java | 25 +++++++++++++
pom.xml | 39 ++++++++++++++++++--
4 files changed, 119 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/1468f2de/maven-builder-support/src/main/java/module-info.java
----------------------------------------------------------------------
diff --git a/maven-builder-support/src/main/java/module-info.java b/maven-builder-support/src/main/java/module-info.java
new file mode 100644
index 0000000..52eaa8a
--- /dev/null
+++ b/maven-builder-support/src/main/java/module-info.java
@@ -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 maven.builder.support
+{
+ requires plexus.utils;
+ requires commons.lang3;
+
+ exports org.apache.maven.building;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/1468f2de/maven-settings-builder/src/main/java/module-info.java
----------------------------------------------------------------------
diff --git a/maven-settings-builder/src/main/java/module-info.java b/maven-settings-builder/src/main/java/module-info.java
new file mode 100644
index 0000000..7027878
--- /dev/null
+++ b/maven-settings-builder/src/main/java/module-info.java
@@ -0,0 +1,34 @@
+/*
+ * 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 maven.settings.builder
+{
+ requires maven.builder.support;
+ requires maven.settings;
+ requires plexus.cipher;
+ requires plexus.interpolation;
+ requires plexus.component.annotations;
+ requires plexus.sec.dispatcher;
+ requires plexus.utils;
+
+ exports org.apache.maven.settings.building;
+ exports org.apache.maven.settings.crypto;
+ exports org.apache.maven.settings.io;
+ exports org.apache.maven.settings.merge;
+ exports org.apache.maven.settings.validation;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/1468f2de/maven-settings/src/main/java/module-info.java
----------------------------------------------------------------------
diff --git a/maven-settings/src/main/java/module-info.java b/maven-settings/src/main/java/module-info.java
new file mode 100644
index 0000000..db29f6b
--- /dev/null
+++ b/maven-settings/src/main/java/module-info.java
@@ -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 maven.settings
+{
+ requires plexus.utils;
+
+ exports org.apache.maven.settings;
+ exports org.apache.maven.settings.io.xpp3;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven/blob/1468f2de/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cf30034..f2a9914 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,13 +43,13 @@
<properties>
<maven.version>3.0.5</maven.version>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.9</maven.compiler.source>
+ <maven.compiler.target>1.9</maven.compiler.target>
<classWorldsVersion>2.5.2</classWorldsVersion>
<commonsCliVersion>1.3.1</commonsCliVersion>
<commonsLangVersion>3.4</commonsLangVersion>
<junitVersion>4.12</junitVersion>
- <plexusVersion>1.6</plexusVersion>
+ <plexusVersion>1.7-SNAPSHOT</plexusVersion>
<plexusInterpolationVersion>1.22</plexusInterpolationVersion>
<plexusUtilsVersion>3.0.22</plexusUtilsVersion>
<guavaVersion>19.0</guavaVersion>
@@ -402,6 +402,11 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <extractors>
+ <extractor>class</extractor>
+ </extractors>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.sisu</groupId>
@@ -418,6 +423,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.6-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -522,7 +532,7 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
+ <artifactId>java18</artifactId>
<version>1.0</version>
</signature>
</configuration>
@@ -672,5 +682,26 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>jigsaw</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-bytecode-version</id>
+ <configuration>
+ <skip>true</skip> <!-- no bytecode available for jdk9 -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>