Skip to content

Commit 9638a6a

Browse files
michael-omichael-o
committed
[MJAVADOC-785] Align plugin implementation with AbstractMavenReport (maven-reporting-impl)
1 parent 9d33925 commit 9638a6a

File tree

96 files changed

+1293
-1577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1293
-1577
lines changed

Diff for: ‎pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,13 @@ under the License.
202202
<artifactId>maven-reporting-api</artifactId>
203203
<version>4.0.0-M12</version>
204204
</dependency>
205+
<!-- for Javadoc purposes -->
206+
<dependency>
207+
<groupId>org.apache.maven.reporting</groupId>
208+
<artifactId>maven-reporting-impl</artifactId>
209+
<version>4.0.0-M15</version>
210+
<scope>provided</scope>
211+
</dependency>
205212
<dependency>
206213
<groupId>org.apache.maven</groupId>
207214
<artifactId>maven-archiver</artifactId>

Diff for: ‎src/it/projects/MJAVADOC-110/verify.bsh

+54-54
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
2-
/*
3-
* Licensed to the Apache Software Foundation (ASF) under one
4-
* or more contributor license agreements. See the NOTICE file
5-
* distributed with this work for additional information
6-
* regarding copyright ownership. The ASF licenses this file
7-
* to you under the Apache License, Version 2.0 (the
8-
* "License"); you may not use this file except in compliance
9-
* with the License. You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing,
14-
* software distributed under the License is distributed on an
15-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
* KIND, either express or implied. See the License for the
17-
* specific language governing permissions and limitations
18-
* under the License.
19-
*/
20-
21-
import java.io.*;
22-
23-
boolean result = true;
24-
25-
try
26-
{
27-
File target = new File( basedir, "target" );
28-
if ( !target.exists() || !target.isDirectory() )
29-
{
30-
System.err.println( "target file is missing or a directory." );
31-
return false;
32-
}
33-
34-
File apidocs = new File( target, "site/apidocs" );
35-
if ( !apidocs.exists() || !apidocs.isDirectory() )
36-
{
37-
System.err.println( "target/site/apidocs file is missing or a directory." );
38-
return false;
39-
}
40-
41-
File htmlFile = new File( apidocs, "Test.html" );
42-
if ( !htmlFile.isFile() )
43-
{
44-
System.err.println( "target/site/apidocs/Test.html file is missing or a a file." );
45-
return false;
46-
}
47-
}
48-
catch( IOException e )
49-
{
50-
e.printStackTrace();
51-
result = false;
52-
}
53-
54-
return result;
1+
2+
/*
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing,
14+
* software distributed under the License is distributed on an
15+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
* KIND, either express or implied. See the License for the
17+
* specific language governing permissions and limitations
18+
* under the License.
19+
*/
20+
21+
import java.io.*;
22+
23+
boolean result = true;
24+
25+
try
26+
{
27+
File target = new File( basedir, "target" );
28+
if ( !target.exists() || !target.isDirectory() )
29+
{
30+
System.err.println( "target file is missing or a directory." );
31+
return false;
32+
}
33+
34+
File apidocs = new File( target, "reports/apidocs" );
35+
if ( !apidocs.exists() || !apidocs.isDirectory() )
36+
{
37+
System.err.println( "target/reports/apidocs file is missing or a directory." );
38+
return false;
39+
}
40+
41+
File htmlFile = new File( apidocs, "Test.html" );
42+
if ( !htmlFile.isFile() )
43+
{
44+
System.err.println( "target/reports/apidocs/Test.html file is missing or a a file." );
45+
return false;
46+
}
47+
}
48+
catch( IOException e )
49+
{
50+
e.printStackTrace();
51+
result = false;
52+
}
53+
54+
return result;

Diff for: ‎src/it/projects/MJAVADOC-126/verify.bsh

+58-58
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
2-
/*
3-
* Licensed to the Apache Software Foundation (ASF) under one
4-
* or more contributor license agreements. See the NOTICE file
5-
* distributed with this work for additional information
6-
* regarding copyright ownership. The ASF licenses this file
7-
* to you under the Apache License, Version 2.0 (the
8-
* "License"); you may not use this file except in compliance
9-
* with the License. You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing,
14-
* software distributed under the License is distributed on an
15-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
* KIND, either express or implied. See the License for the
17-
* specific language governing permissions and limitations
18-
* under the License.
19-
*/
20-
21-
import java.io.*;
22-
23-
File target = new File( basedir, "test/target" );
24-
if ( !target.isDirectory() )
25-
{
26-
System.err.println( "target is missing or not a directory." );
27-
return false;
28-
}
29-
30-
File apidocs = new File( basedir, "test/target/site/apidocs" );
31-
if ( !apidocs.isDirectory() )
32-
{
33-
System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." );
34-
return false;
35-
}
36-
37-
File file1 = new File( apidocs, "file1.txt" );
38-
if ( !file1.isFile() )
39-
{
40-
System.err.println( file1.getAbsolutePath() + " is missing or a directory." );
41-
return false;
42-
}
43-
44-
File file2 = new File( apidocs, "file2.txt" );
45-
if ( !file2.isFile() )
46-
{
47-
System.err.println( file2.getAbsolutePath() + " is missing or a directory." );
48-
return false;
49-
}
50-
51-
File metainf = new File( apidocs, "META-INF" );
52-
if ( metainf.isDirectory() )
53-
{
54-
System.err.println( metainf.getAbsolutePath() + " exists." );
55-
return false;
56-
}
57-
58-
return true;
1+
2+
/*
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing,
14+
* software distributed under the License is distributed on an
15+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
* KIND, either express or implied. See the License for the
17+
* specific language governing permissions and limitations
18+
* under the License.
19+
*/
20+
21+
import java.io.*;
22+
23+
File target = new File( basedir, "test/target" );
24+
if ( !target.isDirectory() )
25+
{
26+
System.err.println( "target is missing or not a directory." );
27+
return false;
28+
}
29+
30+
File apidocs = new File( basedir, "test/target/reports/apidocs" );
31+
if ( !apidocs.isDirectory() )
32+
{
33+
System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." );
34+
return false;
35+
}
36+
37+
File file1 = new File( apidocs, "file1.txt" );
38+
if ( !file1.isFile() )
39+
{
40+
System.err.println( file1.getAbsolutePath() + " is missing or a directory." );
41+
return false;
42+
}
43+
44+
File file2 = new File( apidocs, "file2.txt" );
45+
if ( !file2.isFile() )
46+
{
47+
System.err.println( file2.getAbsolutePath() + " is missing or a directory." );
48+
return false;
49+
}
50+
51+
File metainf = new File( apidocs, "META-INF" );
52+
if ( metainf.isDirectory() )
53+
{
54+
System.err.println( metainf.getAbsolutePath() + " exists." );
55+
return false;
56+
}
57+
58+
return true;

Diff for: ‎src/it/projects/MJAVADOC-172/verify.bsh

+63-63
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
1-
2-
/*
3-
* Licensed to the Apache Software Foundation (ASF) under one
4-
* or more contributor license agreements. See the NOTICE file
5-
* distributed with this work for additional information
6-
* regarding copyright ownership. The ASF licenses this file
7-
* to you under the Apache License, Version 2.0 (the
8-
* "License"); you may not use this file except in compliance
9-
* with the License. You may obtain a copy of the License at
10-
*
11-
* http://www.apache.org/licenses/LICENSE-2.0
12-
*
13-
* Unless required by applicable law or agreed to in writing,
14-
* software distributed under the License is distributed on an
15-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16-
* KIND, either express or implied. See the License for the
17-
* specific language governing permissions and limitations
18-
* under the License.
19-
*/
20-
21-
import java.io.*;
22-
import org.codehaus.plexus.util.*;
23-
24-
boolean result = true;
25-
26-
try
27-
{
28-
File target = new File( basedir, "target" );
29-
if ( !target.exists() || !target.isDirectory() )
30-
{
31-
System.err.println( "target file is missing or a directory." );
32-
return false;
33-
}
34-
35-
File apidocs = new File( basedir, "target/site/apidocs" );
36-
if ( !apidocs.exists() || !apidocs.isDirectory() )
37-
{
38-
System.err.println( "target/site/apidocs file is missing or a directory." );
39-
return false;
40-
}
41-
42-
File options = new File( apidocs, "options" );
43-
if ( !options.exists() || !options.isFile() )
44-
{
45-
System.err.println( "target/site/apidocs/options file is missing or not a file." );
46-
return false;
47-
}
48-
49-
String str = FileUtils.fileRead( options );
50-
51-
if ( !str.contains( "junit-4.13.1.jar" ) )
52-
{
53-
System.err.println( "Javadoc doesn't used correct artifacts." );
54-
return false;
55-
}
56-
}
57-
catch( IOException e )
58-
{
59-
e.printStackTrace();
60-
result = false;
61-
}
62-
63-
return result;
1+
2+
/*
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing,
14+
* software distributed under the License is distributed on an
15+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
* KIND, either express or implied. See the License for the
17+
* specific language governing permissions and limitations
18+
* under the License.
19+
*/
20+
21+
import java.io.*;
22+
import org.codehaus.plexus.util.*;
23+
24+
boolean result = true;
25+
26+
try
27+
{
28+
File target = new File( basedir, "target" );
29+
if ( !target.exists() || !target.isDirectory() )
30+
{
31+
System.err.println( "target file is missing or a directory." );
32+
return false;
33+
}
34+
35+
File apidocs = new File( basedir, "target/reports/apidocs" );
36+
if ( !apidocs.exists() || !apidocs.isDirectory() )
37+
{
38+
System.err.println( "target/reports/apidocs file is missing or a directory." );
39+
return false;
40+
}
41+
42+
File options = new File( apidocs, "options" );
43+
if ( !options.exists() || !options.isFile() )
44+
{
45+
System.err.println( "target/reports/apidocs/options file is missing or not a file." );
46+
return false;
47+
}
48+
49+
String str = FileUtils.fileRead( options );
50+
51+
if ( !str.contains( "junit-4.13.1.jar" ) )
52+
{
53+
System.err.println( "Javadoc doesn't used correct artifacts." );
54+
return false;
55+
}
56+
}
57+
catch( IOException e )
58+
{
59+
e.printStackTrace();
60+
result = false;
61+
}
62+
63+
return result;

0 commit comments

Comments
 (0)