Skip to content

Commit 9725021

Browse files
Fix Maven file structure (#729)
Reporting configuration should be done in <reporting> section, not in maven-site-plugin <configuration> as reportPlugins parameter. Signed-off-by: Thibault Meyer <meyer.thibault@gmail.com>
1 parent ede5f3f commit 9725021

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

ninja-core/src/site/markdown/developer/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Version 6.8.2
22
=============
33

4+
* 2022-01-19 Fix Maven file structure: Reporting configuration should be done in <reporting> section (thibaultmeyer)
45
* 2022-01-10 Updated Maven Archetype plugin to 3.2.1 (thibaultmeyer)
56
* 2021-12-18 Added Jackson Module to handle Java8 and Joda data types (thibaultmeyer)
67
* 2021-12-24 Fixed NullPointerException on "Message::getWithDefault" when value and default value are both null

pom.xml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<groupId>org.apache.maven.plugins</groupId>
160160
<artifactId>maven-javadoc-plugin</artifactId>
161161
<configuration>
162-
<additionalparam>-Xdoclint:none</additionalparam>
162+
<doclint>none</doclint>
163163
</configuration>
164164
</plugin>
165165

@@ -181,16 +181,6 @@
181181
<version>3.7.1</version>
182182

183183
<configuration>
184-
<reportPlugins>
185-
<plugin>
186-
<groupId>org.apache.maven.plugins</groupId>
187-
<artifactId>maven-javadoc-plugin</artifactId>
188-
<version>2.9.1</version>
189-
<configuration>
190-
<additionalparam>-Xdoclint:none</additionalparam>
191-
</configuration>
192-
</plugin>
193-
</reportPlugins>
194184
</configuration>
195185

196186
<dependencies>
@@ -253,6 +243,19 @@
253243
</pluginManagement>
254244
</build>
255245

246+
<reporting>
247+
<plugins>
248+
<plugin>
249+
<groupId>org.apache.maven.plugins</groupId>
250+
<artifactId>maven-javadoc-plugin</artifactId>
251+
<version>2.9.1</version>
252+
<configuration>
253+
<doclint>none</doclint>
254+
</configuration>
255+
</plugin>
256+
</plugins>
257+
</reporting>
258+
256259
<scm>
257260
<url>https://github.com/ninjaframework/ninja</url>
258261
<connection>scm:git://github.com/ninjaframework/ninja.git</connection>
@@ -269,7 +272,7 @@
269272
<mailingList>
270273
<name>Ninja Web Framework Users</name>
271274
<post>ninja-framework@googlegroups.com</post>
272-
<archive>http://groups.google.com/group/ninja-framework</archive>
275+
<archive>https://groups.google.com/group/ninja-framework</archive>
273276
</mailingList>
274277
</mailingLists>
275278

@@ -288,7 +291,7 @@
288291
<licenses>
289292
<license>
290293
<name>The Apache Software License, Version 2.0</name>
291-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
294+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
292295
<distribution>repo</distribution>
293296
</license>
294297
</licenses>
@@ -496,7 +499,7 @@
496499
<version>${guice.version}</version>
497500
</dependency>
498501

499-
<!-- We use Jackson for rendering jsons: -->
502+
<!-- We use Jackson for rendering JSON: -->
500503
<dependency>
501504
<groupId>com.fasterxml.jackson.core</groupId>
502505
<artifactId>jackson-core</artifactId>
@@ -573,7 +576,7 @@
573576
<version>1.15</version>
574577
</dependency>
575578

576-
<!-- Enrcyption library providing support for blowfish -->
579+
<!-- Encryption library providing support for blowfish -->
577580
<dependency>
578581
<groupId>org.mindrot</groupId>
579582
<artifactId>jbcrypt</artifactId>

0 commit comments

Comments
 (0)