Skip to content

Commit

Permalink
[MDEP-788] Upgrade maven-reporting-impl to version 3.1.0
Browse files Browse the repository at this point in the history
- use maven-site-plugin in IT test
- remove dependency to doxia, it is transitive from maven-reporting-impl
  • Loading branch information
slawekjaranowski committed Feb 21, 2022
1 parent 25ca833 commit a8d4690
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 57 deletions.
50 changes: 1 addition & 49 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ under the License.

<properties>
<mavenVersion>3.1.1</mavenVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
<jettyVersion>9.4.44.v20210927</jettyVersion>
<pluginTestingVersion>3.1.0</pluginTestingVersion>
<javaVersion>8</javaVersion>
Expand Down Expand Up @@ -146,57 +144,17 @@ under the License.
</dependency>

<!-- reporting -->
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>3.0.0</version>
<exclusions>
<exclusion>
<artifactId>maven-artifact-manager</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
<exclusion>
<artifactId>maven-project</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
<exclusion>
<artifactId>maven-profile</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
<exclusion>
<artifactId>maven-plugin-registry</artifactId>
<groupId>org.apache.maven</groupId>
</exclusion>
</exclusions>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>

<!-- doxia -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-sink-api</artifactId>
<version>${doxiaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>${doxiaVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
<version>${doxiaSitetoolsVersion}</version>
</dependency>

<!-- plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Expand Down Expand Up @@ -259,12 +217,6 @@ under the License.
<version>4.2</version>
</dependency>

<dependency>
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
<version>1.1</version>
</dependency>

<!-- dependencies to annotations -->
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
Expand Down
3 changes: 1 addition & 2 deletions src/it/projects/analyze-report/invoker.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@
# specific language governing permissions and limitations
# under the License.

invoker.goals = clean ${project.groupId}:${project.artifactId}:${project.version}:analyze-report
invoker.maven.version = 3.0+
invoker.goals = site
37 changes: 32 additions & 5 deletions src/it/projects/analyze-report/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,40 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<outputXML>true</outputXML>
<scriptableOutput>true</scriptableOutput>
<verbose>true</verbose>
</configuration>
<version>@project.version@</version>
</plugin>
<plugin>
<artifactId>maven-site-plugin</artifactId>
<version>3.10.0</version>
</plugin>
</plugins>
</pluginManagement>
</build>

<reporting>
<plugins>
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.2.1</version>
<reportSets>
<reportSet>
<reports>
<report>index</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<reportSets>
<reportSet>
<reports>
<report>analyze-report</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
2 changes: 1 addition & 1 deletion src/it/projects/analyze-report/verify.bsh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

import java.io.*;

File htmlFile = new File( basedir, "target/dependency-analysis.html" );
File htmlFile = new File( basedir, "target/site/dependency-analysis.html" );

if ( !htmlFile.isFile() )
{
Expand Down

0 comments on commit a8d4690

Please sign in to comment.