Skip to content

Commit 3b7b6bb

Browse files
authored
Add module descriptor
This closes #14
1 parent 444e0a2 commit 3b7b6bb

File tree

5 files changed

+59
-6
lines changed

5 files changed

+59
-6
lines changed

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ jdk:
66
- openjdk10
77
- openjdk11
88
- openjdk-ea
9-
- oraclejdk-ea
109

1110
dist: trusty
1211

plexus-java/pom.xml

+2-3
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dependency>
6767
<groupId>org.ow2.asm</groupId>
6868
<artifactId>asm</artifactId>
69-
<version>6.2</version>
69+
<version>6.2.1</version>
7070
</dependency>
7171
<dependency>
7272
<groupId>com.thoughtworks.qdox</groupId>
@@ -119,7 +119,6 @@
119119
<plugin>
120120
<groupId>org.apache.maven.plugins</groupId>
121121
<artifactId>maven-compiler-plugin</artifactId>
122-
<version>3.7.0</version>
123122
<executions>
124123
<execution>
125124
<id>jdk9</id>
@@ -128,10 +127,10 @@
128127
</goals>
129128
<configuration>
130129
<release>9</release>
130+
<multiReleaseOutput>true</multiReleaseOutput>
131131
<compileSourceRoots>
132132
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
133133
</compileSourceRoots>
134-
<outputDirectory>${project.build.outputDirectory}/META-INF/versions/9</outputDirectory>
135134
</configuration>
136135
</execution>
137136
</executions>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
module org.codehaus.plexus.languages.java
20+
{
21+
requires com.thoughtworks.qdox;
22+
requires org.objectweb.asm;
23+
24+
exports org.codehaus.plexus.languages.java.jpms;
25+
exports org.codehaus.plexus.languages.java.version;
26+
}

plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java

+26-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,32 @@
11
package org.codehaus.plexus.languages.java.jpms;
22

3+
/*
4+
* Licensed to the Apache Software Foundation (ASF) under one
5+
* or more contributor license agreements. See the NOTICE file
6+
* distributed with this work for additional information
7+
* regarding copyright ownership. The ASF licenses this file
8+
* to you under the Apache License, Version 2.0 (the
9+
* "License"); you may not use this file except in compliance
10+
* with the License. You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing,
15+
* software distributed under the License is distributed on an
16+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
* KIND, either express or implied. See the License for the
18+
* specific language governing permissions and limitations
19+
* under the License.
20+
*/
21+
322
import static org.hamcrest.CoreMatchers.is;
423
import static org.hamcrest.CoreMatchers.not;
524
import static org.hamcrest.CoreMatchers.startsWith;
6-
import static org.junit.Assert.*;
25+
import static org.junit.Assert.assertThat;
726
import static org.junit.Assume.assumeThat;
827
import static org.mockito.ArgumentMatchers.any;
928
import static org.mockito.Mockito.when;
1029

11-
import java.io.IOException;
1230
import java.nio.file.Path;
1331
import java.nio.file.Paths;
1432
import java.util.Arrays;
@@ -20,6 +38,12 @@
2038
import org.junit.runner.RunWith;
2139
import org.mockito.Mock;
2240

41+
/**
42+
* <strong>NOTE</strong> Eclipse users must disable the <code>Build automatically</code> option,
43+
* otherwise it'll continually rebuild the project, causing compilations or tests to fail.
44+
*
45+
* @author Robert Scholte
46+
*/
2347
@RunWith( org.mockito.junit.MockitoJUnitRunner.class )
2448
public class LocationManagerIT
2549
{

pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
<build>
4848
<pluginManagement>
4949
<plugins>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-compiler-plugin</artifactId>
53+
<version>3.8.0</version>
54+
</plugin>
5055
<plugin>
5156
<groupId>org.apache.maven.plugins</groupId>
5257
<artifactId>maven-release-plugin</artifactId>

0 commit comments

Comments
 (0)