Skip to content

Commit

Permalink
[MJAVADOC-785] Align plugin implementation with AbstractMavenReport (…
Browse files Browse the repository at this point in the history
…maven-reporting-impl)
  • Loading branch information
michael-o committed May 4, 2024
1 parent 4947bce commit 8345dbc
Show file tree
Hide file tree
Showing 96 changed files with 1,293 additions and 1,577 deletions.
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,13 @@ under the License.
<artifactId>maven-reporting-api</artifactId>
<version>4.0.0-M9</version>
</dependency>
<!-- for Javaodc purposes -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>4.0.0-M13</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
Expand Down
108 changes: 54 additions & 54 deletions src/it/projects/MJAVADOC-110/verify.bsh
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
/*
* 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.
*/
import java.io.*;
boolean result = true;
try
{
File target = new File( basedir, "target" );
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or a directory." );
return false;
}
File apidocs = new File( target, "site/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/site/apidocs file is missing or a directory." );
return false;
}
File htmlFile = new File( apidocs, "Test.html" );
if ( !htmlFile.isFile() )
{
System.err.println( "target/site/apidocs/Test.html file is missing or a a file." );
return false;
}
}
catch( IOException e )
{
e.printStackTrace();
result = false;
}
return result;

/*
* 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.
*/

import java.io.*;

boolean result = true;

try
{
File target = new File( basedir, "target" );
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or a directory." );
return false;
}

File apidocs = new File( target, "reports/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/reports/apidocs file is missing or a directory." );
return false;
}

File htmlFile = new File( apidocs, "Test.html" );
if ( !htmlFile.isFile() )
{
System.err.println( "target/reports/apidocs/Test.html file is missing or a a file." );
return false;
}
}
catch( IOException e )
{
e.printStackTrace();
result = false;
}

return result;
116 changes: 58 additions & 58 deletions src/it/projects/MJAVADOC-126/verify.bsh
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
/*
* 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.
*/
import java.io.*;
File target = new File( basedir, "test/target" );
if ( !target.isDirectory() )
{
System.err.println( "target is missing or not a directory." );
return false;
}
File apidocs = new File( basedir, "test/target/site/apidocs" );
if ( !apidocs.isDirectory() )
{
System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." );
return false;
}
File file1 = new File( apidocs, "file1.txt" );
if ( !file1.isFile() )
{
System.err.println( file1.getAbsolutePath() + " is missing or a directory." );
return false;
}
File file2 = new File( apidocs, "file2.txt" );
if ( !file2.isFile() )
{
System.err.println( file2.getAbsolutePath() + " is missing or a directory." );
return false;
}
File metainf = new File( apidocs, "META-INF" );
if ( metainf.isDirectory() )
{
System.err.println( metainf.getAbsolutePath() + " exists." );
return false;
}
return true;

/*
* 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.
*/

import java.io.*;

File target = new File( basedir, "test/target" );
if ( !target.isDirectory() )
{
System.err.println( "target is missing or not a directory." );
return false;
}

File apidocs = new File( basedir, "test/target/reports/apidocs" );
if ( !apidocs.isDirectory() )
{
System.err.println( apidocs.getAbsolutePath() + " is missing or not a directory." );
return false;
}

File file1 = new File( apidocs, "file1.txt" );
if ( !file1.isFile() )
{
System.err.println( file1.getAbsolutePath() + " is missing or a directory." );
return false;
}

File file2 = new File( apidocs, "file2.txt" );
if ( !file2.isFile() )
{
System.err.println( file2.getAbsolutePath() + " is missing or a directory." );
return false;
}

File metainf = new File( apidocs, "META-INF" );
if ( metainf.isDirectory() )
{
System.err.println( metainf.getAbsolutePath() + " exists." );
return false;
}

return true;
126 changes: 63 additions & 63 deletions src/it/projects/MJAVADOC-172/verify.bsh
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
/*
* 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.
*/
import java.io.*;
import org.codehaus.plexus.util.*;
boolean result = true;
try
{
File target = new File( basedir, "target" );
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or a directory." );
return false;
}
File apidocs = new File( basedir, "target/site/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/site/apidocs file is missing or a directory." );
return false;
}
File options = new File( apidocs, "options" );
if ( !options.exists() || !options.isFile() )
{
System.err.println( "target/site/apidocs/options file is missing or not a file." );
return false;
}
String str = FileUtils.fileRead( options );
if ( !str.contains( "junit-4.13.1.jar" ) )
{
System.err.println( "Javadoc doesn't used correct artifacts." );
return false;
}
}
catch( IOException e )
{
e.printStackTrace();
result = false;
}
return result;

/*
* 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.
*/

import java.io.*;
import org.codehaus.plexus.util.*;

boolean result = true;

try
{
File target = new File( basedir, "target" );
if ( !target.exists() || !target.isDirectory() )
{
System.err.println( "target file is missing or a directory." );
return false;
}

File apidocs = new File( basedir, "target/reports/apidocs" );
if ( !apidocs.exists() || !apidocs.isDirectory() )
{
System.err.println( "target/reports/apidocs file is missing or a directory." );
return false;
}

File options = new File( apidocs, "options" );
if ( !options.exists() || !options.isFile() )
{
System.err.println( "target/reports/apidocs/options file is missing or not a file." );
return false;
}

String str = FileUtils.fileRead( options );

if ( !str.contains( "junit-4.13.1.jar" ) )
{
System.err.println( "Javadoc doesn't used correct artifacts." );
return false;
}
}
catch( IOException e )
{
e.printStackTrace();
result = false;
}

return result;
Loading

0 comments on commit 8345dbc

Please sign in to comment.