Skip to content

Commit a8d4690

Browse files
[MDEP-788] Upgrade maven-reporting-impl to version 3.1.0
- use maven-site-plugin in IT test - remove dependency to doxia, it is transitive from maven-reporting-impl
1 parent 25ca833 commit a8d4690

File tree

4 files changed

+35
-57
lines changed

4 files changed

+35
-57
lines changed

pom.xml

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ under the License.
9090

9191
<properties>
9292
<mavenVersion>3.1.1</mavenVersion>
93-
<doxiaVersion>1.11.1</doxiaVersion>
94-
<doxiaSitetoolsVersion>1.11.1</doxiaSitetoolsVersion>
9593
<jettyVersion>9.4.44.v20210927</jettyVersion>
9694
<pluginTestingVersion>3.1.0</pluginTestingVersion>
9795
<javaVersion>8</javaVersion>
@@ -146,57 +144,17 @@ under the License.
146144
</dependency>
147145

148146
<!-- reporting -->
149-
<dependency>
150-
<groupId>org.apache.maven.reporting</groupId>
151-
<artifactId>maven-reporting-api</artifactId>
152-
<version>3.0</version>
153-
</dependency>
154147
<dependency>
155148
<groupId>org.apache.maven.reporting</groupId>
156149
<artifactId>maven-reporting-impl</artifactId>
157-
<version>3.0.0</version>
158-
<exclusions>
159-
<exclusion>
160-
<artifactId>maven-artifact-manager</artifactId>
161-
<groupId>org.apache.maven</groupId>
162-
</exclusion>
163-
<exclusion>
164-
<artifactId>maven-project</artifactId>
165-
<groupId>org.apache.maven</groupId>
166-
</exclusion>
167-
<exclusion>
168-
<artifactId>maven-profile</artifactId>
169-
<groupId>org.apache.maven</groupId>
170-
</exclusion>
171-
<exclusion>
172-
<artifactId>maven-plugin-registry</artifactId>
173-
<groupId>org.apache.maven</groupId>
174-
</exclusion>
175-
</exclusions>
150+
<version>3.1.0</version>
176151
</dependency>
177152
<dependency>
178153
<groupId>commons-io</groupId>
179154
<artifactId>commons-io</artifactId>
180155
<version>2.11.0</version>
181156
</dependency>
182157

183-
<!-- doxia -->
184-
<dependency>
185-
<groupId>org.apache.maven.doxia</groupId>
186-
<artifactId>doxia-sink-api</artifactId>
187-
<version>${doxiaVersion}</version>
188-
</dependency>
189-
<dependency>
190-
<groupId>org.apache.maven.doxia</groupId>
191-
<artifactId>doxia-core</artifactId>
192-
<version>${doxiaVersion}</version>
193-
</dependency>
194-
<dependency>
195-
<groupId>org.apache.maven.doxia</groupId>
196-
<artifactId>doxia-site-renderer</artifactId>
197-
<version>${doxiaSitetoolsVersion}</version>
198-
</dependency>
199-
200158
<!-- plexus -->
201159
<dependency>
202160
<groupId>org.codehaus.plexus</groupId>
@@ -259,12 +217,6 @@ under the License.
259217
<version>4.2</version>
260218
</dependency>
261219

262-
<dependency>
263-
<groupId>classworlds</groupId>
264-
<artifactId>classworlds</artifactId>
265-
<version>1.1</version>
266-
</dependency>
267-
268220
<!-- dependencies to annotations -->
269221
<dependency>
270222
<groupId>org.apache.maven.plugin-tools</groupId>

src/it/projects/analyze-report/invoker.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,4 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
invoker.goals = clean ${project.groupId}:${project.artifactId}:${project.version}:analyze-report
19-
invoker.maven.version = 3.0+
18+
invoker.goals = site

src/it/projects/analyze-report/pom.xml

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,40 @@
5959
<plugins>
6060
<plugin>
6161
<artifactId>maven-dependency-plugin</artifactId>
62-
<configuration>
63-
<outputXML>true</outputXML>
64-
<scriptableOutput>true</scriptableOutput>
65-
<verbose>true</verbose>
66-
</configuration>
62+
<version>@project.version@</version>
63+
</plugin>
64+
<plugin>
65+
<artifactId>maven-site-plugin</artifactId>
66+
<version>3.10.0</version>
6767
</plugin>
6868
</plugins>
6969
</pluginManagement>
7070
</build>
71+
72+
<reporting>
73+
<plugins>
74+
<plugin>
75+
<artifactId>maven-project-info-reports-plugin</artifactId>
76+
<version>3.2.1</version>
77+
<reportSets>
78+
<reportSet>
79+
<reports>
80+
<report>index</report>
81+
</reports>
82+
</reportSet>
83+
</reportSets>
84+
</plugin>
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-dependency-plugin</artifactId>
88+
<reportSets>
89+
<reportSet>
90+
<reports>
91+
<report>analyze-report</report>
92+
</reports>
93+
</reportSet>
94+
</reportSets>
95+
</plugin>
96+
</plugins>
97+
</reporting>
7198
</project>

src/it/projects/analyze-report/verify.bsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.io.*;
2121

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

2424
if ( !htmlFile.isFile() )
2525
{

0 commit comments

Comments
 (0)