Skip to content

Commit 405b16d

Browse files
olamyolamy
authored
[MJAVADOC-639] include requires static from external dependencies for all modules (#38)
* [MJAVADOC-639] include requires static from external dependencies for all modules Signed-off-by: olivier lamy <[email protected]> * [MJAVADOC-639] update plexus-java method name Signed-off-by: olivier lamy <[email protected]> * add plexus snapshots repository Signed-off-by: olivier lamy <[email protected]> * [MJAVADOC-639] plexus-java 1.0.5 Signed-off-by: olivier lamy <[email protected]>
1 parent aaa2007 commit 405b16d

File tree

23 files changed

+731
-1
lines changed

23 files changed

+731
-1
lines changed

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ under the License.
7272
<doxia-sitetoolsVersion>1.7.4</doxia-sitetoolsVersion>
7373
<wagonVersion>2.4</wagonVersion>
7474
<sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
75-
<plexus-java.version>1.0.4</plexus-java.version>
75+
<plexus-java.version>1.0.5</plexus-java.version>
7676
<!-- for ITs -->
7777
<sitePluginVersion>3.3</sitePluginVersion>
7878
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/invoker.properties

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
invoker.java.version = 9+
18+
invoker.goals=javadoc:aggregate
19+

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/pom.xml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
2+
contributor license agreements. See the NOTICE file ~ distributed with this
3+
work for additional information ~ regarding copyright ownership. The ASF
4+
licenses this file ~ to you under the Apache License, Version 2.0 (the ~
5+
"License"); you may not use this file except in compliance ~ with the License.
6+
You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
7+
~ ~ Unless required by applicable law or agreed to in writing, ~ software
8+
distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
9+
WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
10+
License for the ~ specific language governing permissions and limitations
11+
~ under the License. -->
12+
13+
<project xmlns="http://maven.apache.org/POM/4.0.0"
14+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<modelVersion>4.0.0</modelVersion>
17+
<groupId>modulea</groupId>
18+
<artifactId>modulea</artifactId>
19+
<version>1.0.0-SNAPSHOT</version>
20+
21+
<build>
22+
<plugins>
23+
<plugin>
24+
<artifactId>maven-compiler-plugin</artifactId>
25+
<version>3.8.0</version>
26+
<configuration>
27+
<release>9</release>
28+
</configuration>
29+
</plugin>
30+
</plugins>
31+
</build>
32+
</project>

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/com/javamodularity/modulea/HelloWorld.java

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package com.javamodularity.modulea;
2+
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+
22+
/**
23+
* <p>Javadoc aggregation from module a.</p>
24+
*/
25+
public class HelloWorld {
26+
27+
/**
28+
* <p>method f does something</p>
29+
*/
30+
public void f() {
31+
}
32+
33+
public static void main(String... args) {
34+
System.out.println("Hello Modular World!");
35+
}
36+
37+
}

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulea/src/main/java/module-info.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
20+
/**
21+
* <p>modulea does something</p>
22+
*/
23+
module modulea {
24+
exports com.javamodularity.modulea;
25+
}

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/pom.xml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
2+
contributor license agreements. See the NOTICE file ~ distributed with this
3+
work for additional information ~ regarding copyright ownership. The ASF
4+
licenses this file ~ to you under the Apache License, Version 2.0 (the ~
5+
"License"); you may not use this file except in compliance ~ with the License.
6+
You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
7+
~ ~ Unless required by applicable law or agreed to in writing, ~ software
8+
distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
9+
WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
10+
License for the ~ specific language governing permissions and limitations
11+
~ under the License. -->
12+
13+
<project xmlns="http://maven.apache.org/POM/4.0.0"
14+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<modelVersion>4.0.0</modelVersion>
17+
<groupId>moduleb</groupId>
18+
<artifactId>moduleb</artifactId>
19+
<version>1.0.0-SNAPSHOT</version>
20+
21+
<build>
22+
<plugins>
23+
<plugin>
24+
<artifactId>maven-compiler-plugin</artifactId>
25+
<version>3.8.0</version>
26+
<configuration>
27+
<release>9</release>
28+
</configuration>
29+
</plugin>
30+
</plugins>
31+
</build>
32+
</project>

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/com/javamodularity/moduleb/HelloWorld.java

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package com.javamodularity.moduleb;
2+
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+
22+
/**
23+
* <p>Javadoc aggregation from module a.</p>
24+
*/
25+
public class HelloWorld {
26+
27+
/**
28+
* <p>method f does something</p>
29+
*/
30+
public void f() {
31+
}
32+
33+
public static void main(String... args) {
34+
System.out.println("Hello Modular World!");
35+
}
36+
37+
}

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/moduleb/src/main/java/module-info.java

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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+
20+
/**
21+
* <p>moduleb does something</p>
22+
*/
23+
module moduleb {
24+
exports com.javamodularity.moduleb;
25+
}

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/pom.xml

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
2+
contributor license agreements. See the NOTICE file ~ distributed with this
3+
work for additional information ~ regarding copyright ownership. The ASF
4+
licenses this file ~ to you under the Apache License, Version 2.0 (the ~
5+
"License"); you may not use this file except in compliance ~ with the License.
6+
You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
7+
~ ~ Unless required by applicable law or agreed to in writing, ~ software
8+
distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
9+
WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
10+
License for the ~ specific language governing permissions and limitations
11+
~ under the License. -->
12+
13+
<project xmlns="http://maven.apache.org/POM/4.0.0"
14+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
15+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<modelVersion>4.0.0</modelVersion>
17+
<groupId>modulec</groupId>
18+
<artifactId>modulec</artifactId>
19+
<version>1.0.0-SNAPSHOT</version>
20+
21+
<build>
22+
<plugins>
23+
<plugin>
24+
<artifactId>maven-compiler-plugin</artifactId>
25+
<version>3.8.0</version>
26+
<configuration>
27+
<release>9</release>
28+
</configuration>
29+
</plugin>
30+
</plugins>
31+
</build>
32+
33+
<dependencies>
34+
<dependency>
35+
<groupId>modulea</groupId>
36+
<artifactId>modulea</artifactId>
37+
<version>1.0.0-SNAPSHOT</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>moduleb</groupId>
41+
<artifactId>moduleb</artifactId>
42+
<version>1.0.0-SNAPSHOT</version>
43+
<optional>true</optional>
44+
</dependency>
45+
</dependencies>
46+
</project>

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/com/javamodularity/modulec/WorldCollector.java

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package com.javamodularity.modulec;
2+
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+
22+
/**
23+
* <strong>WorldCollector</strong>
24+
*/
25+
public class WorldCollector {
26+
27+
public void collect()
28+
{
29+
getA().main();
30+
31+
try
32+
{
33+
getB().main();
34+
}
35+
catch ( Exception e )
36+
{
37+
// noop
38+
}
39+
}
40+
41+
public com.javamodularity.modulea.HelloWorld getA()
42+
{
43+
return new com.javamodularity.modulea.HelloWorld();
44+
}
45+
46+
public com.javamodularity.moduleb.HelloWorld getB()
47+
{
48+
return new com.javamodularity.moduleb.HelloWorld();
49+
}
50+
}

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/modulec/src/main/java/module-info.java

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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+
20+
/**
21+
* <p>modulec does something</p>
22+
*/
23+
module modulec {
24+
requires modulea;
25+
requires static moduleb;
26+
27+
exports com.javamodularity.modulec;
28+
}

‎src/it/projects/MJAVADOC-639_aggr_static_modulepath/pom.xml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more
3+
contributor license agreements. See the NOTICE file ~ distributed with this
4+
work for additional information ~ regarding copyright ownership. The ASF
5+
licenses this file ~ to you under the Apache License, Version 2.0 (the ~
6+
"License"); you may not use this file except in compliance ~ with the License.
7+
You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
8+
~ ~ Unless required by applicable law or agreed to in writing, ~ software
9+
distributed under the License is distributed on an ~ "AS IS" BASIS, WITHOUT
10+
WARRANTIES OR CONDITIONS OF ANY ~ KIND, either express or implied. See the
11+
License for the ~ specific language governing permissions and limitations
12+
~ under the License. -->
13+
14+
<project xmlns="http://maven.apache.org/POM/4.0.0"
15+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
16+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
17+
<modelVersion>4.0.0</modelVersion>
18+
<groupId>parent</groupId>
19+
<artifactId>parent</artifactId>
20+
<version>1.0.0-SNAPSHOT</version>
21+
<packaging>pom</packaging>
22+
<modules>
23+
<module>modulea</module>
24+
<module>moduleb</module>
25+
<module>modulec</module>
26+
</modules>
27+
<build>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-javadoc-plugin</artifactId>
32+
<version>@project.version@</version>
33+
</plugin>
34+
</plugins>
35+
</build>
36+
</project>

0 commit comments

Comments
 (0)