Skip to content

Commit 3f4717c

Browse files
cekiceki
committed
get javadoc:aggregate command to work
Signed-off-by: Ceki Gulcu <[email protected]>
1 parent d9145fb commit 3f4717c

File tree

2 files changed

+21
-86
lines changed

2 files changed

+21
-86
lines changed

‎parent/pom.xml‎

Lines changed: 20 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<inceptionYear>2005</inceptionYear>
2525

2626

27-
2827
<properties>
2928
<!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
3029
<project.build.outputTimestamp>2024-01-08T17:55:00Z</project.build.outputTimestamp>
@@ -38,22 +37,21 @@
3837
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3938
<!-- used in integration testing -->
4039
<cal10n.version>0.8.1</cal10n.version>
41-
<reload4j.version>1.2.22</reload4j.version>
40+
<reload4j.version>1.2.22</reload4j.version>
4241
<logback.version>1.2.10</logback.version>
4342
<jcl.version>1.2</jcl.version>
4443
<junit.version>4.13.1</junit.version>
4544
<maven-site-plugin.version>3.7.1</maven-site-plugin.version>
4645
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
4746
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
48-
<maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
47+
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
4948
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
5049
<maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
5150
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
5251
<maven-jxr-plugin.version>3.1.1</maven-jxr-plugin.version>
5352
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
5453
</properties>
5554

56-
5755

5856
<dependencies>
5957
<dependency>
@@ -72,7 +70,7 @@
7270
<artifactId>reload4j</artifactId>
7371
<version>${reload4j.version}</version>
7472
</dependency>
75-
73+
7674
<dependency>
7775
<groupId>ch.qos.cal10n</groupId>
7876
<artifactId>cal10n-api</artifactId>
@@ -147,14 +145,14 @@
147145
<source>${jdk.version}</source>
148146
<target>${jdk.version}</target>
149147
</configuration>
150-
</execution>
148+
</execution>
151149

152-
<execution>
150+
<execution>
153151
<id>module-compile</id>
154152
<phase>compile</phase>
155153
<goals>
156154
<goal>compile</goal>
157-
</goals>
155+
</goals>
158156
<configuration>
159157
<release>9</release>
160158
<compileSourceRoots>
@@ -165,7 +163,6 @@
165163
</execution>
166164

167165

168-
169166
</executions>
170167

171168
</plugin>
@@ -200,19 +197,19 @@
200197
<supportIncrementalBuild>true</supportIncrementalBuild>
201198
<!-- populated by the plugin itself -->
202199
<instructions>
203-
<Bundle-SymbolicName>${replacestring;${project.artifactId};-;.}</Bundle-SymbolicName>
204-
<Bundle-Vendor>SLF4J.ORG</Bundle-Vendor>
205-
<_snapshot/>
206-
<_exportcontents>!META-INF.versions.9,*;-noimport:=true</_exportcontents>
207-
<Bundle-Description>${project.description}</Bundle-Description>
208-
<Bundle-DocURL>${project.url}</Bundle-DocURL>
209-
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
210-
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
211-
<Implementation-Version>${project.version}</Implementation-Version>
212-
<Implementation-Title>${project.artifactId}</Implementation-Title>
213-
<Multi-Release>true</Multi-Release>
214-
<_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource</_removeheaders>
215-
</instructions>
200+
<Bundle-SymbolicName>${replacestring;${project.artifactId};-;.}</Bundle-SymbolicName>
201+
<Bundle-Vendor>SLF4J.ORG</Bundle-Vendor>
202+
<_snapshot/>
203+
<_exportcontents>!META-INF.versions.9,*;-noimport:=true</_exportcontents>
204+
<Bundle-Description>${project.description}</Bundle-Description>
205+
<Bundle-DocURL>${project.url}</Bundle-DocURL>
206+
<X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
207+
<X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
208+
<Implementation-Version>${project.version}</Implementation-Version>
209+
<Implementation-Title>${project.artifactId}</Implementation-Title>
210+
<Multi-Release>true</Multi-Release>
211+
<_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource</_removeheaders>
212+
</instructions>
216213
</configuration>
217214
<executions>
218215
<execution>
@@ -267,70 +264,8 @@
267264
<version>3.0.0</version>
268265
</plugin>
269266
</plugins>
270-
271-
</build>
272267

273-
<reporting>
274-
<plugins>
275-
<plugin>
276-
<groupId>org.apache.maven.plugins</groupId>
277-
<artifactId>maven-jxr-plugin</artifactId>
278-
<version>${maven-jxr-plugin.version}</version>
279-
<configuration>
280-
<aggregate>true</aggregate>
281-
<javadocDir>target/site/apidocs/</javadocDir>
282-
<linkJavadoc>true</linkJavadoc>
283-
</configuration>
284-
</plugin>
285-
286-
<plugin>
287-
<groupId>org.apache.maven.plugins</groupId>
288-
<artifactId>maven-javadoc-plugin</artifactId>
289-
<version>${maven-javadoc-plugin.version}</version>
290-
<configuration>
291-
<linkJavadoc>true</linkJavadoc>
292-
<linksource>true</linksource>
293-
<aggregate>true</aggregate>
294-
<additionalOptions>
295-
<additionalOption>-Xdoclint:none</additionalOption>
296-
</additionalOptions>
297-
<sourceFileExcludes>
298-
<sourceFileExclude>**/module-info.java</sourceFileExclude>
299-
</sourceFileExcludes>
300-
301-
<groups>
302-
<group>
303-
<title>SLF4J packages</title>
304-
<packages>org.slf4j:org.slf4j.*</packages>
305-
</group>
306-
307-
<group>
308-
<title>SLF4J extensions</title>
309-
<packages>
310-
org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
311-
</packages>
312-
</group>
313-
314-
<group>
315-
<title>Jakarta Commons Logging packages</title>
316-
<packages>org.apache.commons.*</packages>
317-
</group>
318-
319-
<group>
320-
<title>java.util.logging (JUL) to SLF4J bridge</title>
321-
<packages>org.slf4j.bridge</packages>
322-
</group>
323-
324-
<group>
325-
<title>Apache log4j</title>
326-
<packages>org.apache.log4j:org.apache.log4j.*</packages>
327-
</group>
328-
</groups>
329-
</configuration>
330-
</plugin>
331-
332-
</plugins>
333-
</reporting>
268+
</build>
334269

335270
<profiles>
336271
<profile>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
slf4j-jdk-platform-logging,slf4j-migrator,osgi-over-slf4j
158158
</skippedModules>
159159
<detectLinks>true</detectLinks>
160-
<doctitle>SLF4J project modules 2.1.0-alpha1</doctitle>
160+
<doctitle>SLF4J project modules ${project.version}</doctitle>
161161
<windowtitle>SLF4J javadoc</windowtitle>
162162
<bottom><![CDATA[Copyright &copy; 2005-{currentYear} QOS.CH Sarl. All rights reserved]]></bottom>
163163
<linksource>true</linksource>

0 commit comments

Comments
 (0)