Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# 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.

invoker.goals=javadoc:javadoc
invoker.java.version = 22+
61 changes: 61 additions & 0 deletions src/it/projects/MJAVADOC-450_classifier-jdk-23-no-fonts/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
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.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-javadoc-plugin.it</groupId>
<artifactId>mjavadoc450-jdk-23-no-fonts</artifactId>
<version>1.0.0-SNAPSHOT</version>

<url>https://github.com/apache/maven-javadoc-plugin/issues/369</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>@maven.compiler.source@</maven.compiler.source>
<maven.compiler.target>@maven.compiler.target@</maven.compiler.target>
</properties>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<stylesheetfile>custom.css</stylesheetfile>
</configuration>
<dependencies>
<dependency>
<groupId>org.apache.maven.plugins.javadoc.its</groupId>
<artifactId>mjavadoc450</artifactId>
<version>1.0</version>
<classifier>static</classifier>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.foo;

/*
* 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.util.Arrays;

public class MyClass
{
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/*
* 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.
*/

def buildLog = new File( basedir, 'build.log' );
assert buildLog.text.contains('custom.css found in javadoc plugin dependencies')

def stylesheetCss = new File( basedir, 'target/reports/apidocs/resource-files/stylesheet.css' );
assert stylesheetCss.text.containsIgnoreCase('dejavu')

assert !(new File( basedir, 'target/reports/apidocs/resource-files/fonts/dejavu.css' ).exists());
2 changes: 2 additions & 0 deletions src/it/projects/MJAVADOC-450_classifier-jdk-23/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<disableNoFonts>true</disableNoFonts>
<stylesheetfile>custom.css</stylesheetfile>
</configuration>
<dependencies>
Expand Down
3 changes: 3 additions & 0 deletions src/it/projects/MJAVADOC-450_classifier-jdk-23/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ assert buildLog.text.contains('custom.css found in javadoc plugin dependencies')

def stylesheetCss = new File( basedir, 'target/reports/apidocs/resource-files/stylesheet.css' );
assert stylesheetCss.text.containsIgnoreCase('dejavu')


assert new File( basedir, 'target/reports/apidocs/resource-files/fonts/dejavu.css' ).exists();
1 change: 1 addition & 0 deletions src/it/projects/MJAVADOC-450_classifier/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>@project.version@</version>
<configuration>
<debug>true</debug>
<stylesheetfile>custom.css</stylesheetfile>
</configuration>
<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1697,6 +1697,16 @@ public AbstractJavadocMojo(
@Parameter(property = "forceRootLocale", defaultValue = "true")
private boolean forceRootLocale;

/**
* From jdk 23, javadoc now include some extra css, files which can increase the size of javadoc jar.
* This can be disabled using the option {@code --no-fonts}
* The javadoc plugin will add this option to diable extra files to be added per default.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diable -> disable

* If you prefer the new font you must set to {@code true} the option {@code disableNoFonts}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO a parameter with double negative is hard to understand

* @since 3.11.3
*/
@Parameter(property = "maven.javadoc.disableNoFonts", defaultValue = "false")
private boolean disableNoFonts;

// ----------------------------------------------------------------------
// protected methods
// ----------------------------------------------------------------------
Expand Down Expand Up @@ -2018,6 +2028,10 @@ protected void executeReport(Locale unusedLocale) throws MavenReportException {
// ----------------------------------------------------------------------
List<String> javadocArguments = new ArrayList<>();

if (JavaVersion.JAVA_VERSION.isAtLeast("23") && !disableNoFonts) {
javadocArguments.add("--no-fonts");
}

addJavadocOptions(javadocOutputDirectory, javadocArguments, sourcePaths, offlineLinks);

// ----------------------------------------------------------------------
Expand Down