Skip to content

Commit 650b9e6

Browse files
kwinuschindler
andauthored
Improve javadoc of "includes" and "excludes" (#229)
Co-authored-by: Uwe Schindler <[email protected]>
1 parent beaaa9c commit 650b9e6

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

build.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@
105105
<property file="build.properties" />
106106

107107
<property name="jdk.version" value="1.7"/>
108-
<property name="maven.version" value="2.2.1"/>
109-
<property name="maven-plugin-plugin.version" value="3.4"/>
108+
<property name="maven.version" value="3.2.5"/>
109+
<property name="maven-plugin-plugin.version" value="3.8.1"/>
110110

111111
<!-- with fork=false this somehow takes endless to download the internet, so let's fork - and slow down in an other way (startup) -->
112112
<property name="maven.fork" value="true"/>
@@ -672,6 +672,8 @@
672672
<exclude name="**/jdk-deprecated-*.txt"/>
673673
<exclude name="**/jdk-internal-*.txt"/>
674674
<exclude name="**/*.iml"/>
675+
<exclude name="**/.project"/>
676+
<exclude name="**/.settings"/>
675677
</fileset>
676678
</rat:report>
677679
<!-- now print the output, for review -->

src/main/java/de/thetaphi/forbiddenapis/maven/AbstractCheckMojo.java

+12-7
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ public abstract class AbstractCheckMojo extends AbstractMojo implements Constant
137137
* signatures that refer to methods or field in classes that are not on classpath,
138138
* e.g. This is useful in multi-module Maven builds where a common set of signatures is used,
139139
* that are not part of every sub-modules dependencies.
140-
* @see #ignoreSignaturesOfMissingClasses)
141-
* @deprecated The setting 'failOnUnresolvableSignatures' was deprecated and will be removed in next version. Use 'ignoreSignaturesOfMissingClasses' instead.
140+
* @see #ignoreSignaturesOfMissingClasses
141+
* @deprecated The setting {@code failOnUnresolvableSignatures} was deprecated and will be removed in next version. Use {@link #ignoreSignaturesOfMissingClasses} instead.
142142
* @since 1.4
143143
*/
144144
@Deprecated
@@ -196,17 +196,22 @@ public abstract class AbstractCheckMojo extends AbstractMojo implements Constant
196196
private String releaseVersion;
197197

198198
/**
199-
* List of patterns matching all class files to be parsed from the classesDirectory.
200-
* Can be changed to e.g. exclude several files (using excludes).
201-
* The default is a single include with pattern '**&#47;*.class'
199+
* List of <a href="https://ant.apache.org/manual/dirtasks.html#patterns">Ant patterns</a> which must match all relative class paths to be considered.
200+
* All relative class paths matching one or more of the given patterns and not matching any of the ones from {@link #excludes} are considered.
201+
* The given paths are relative to {@code classesDirectory}.
202+
* Can be changed to e.g. exclude several files (using {@link #excludes}).
203+
* The default is a single include with pattern {@code **&#47;*.class}.
202204
* @see #excludes
203205
* @since 1.0
204206
*/
205207
@Parameter(required = false)
206208
private String[] includes;
207209

208210
/**
209-
* List of patterns matching class files to be excluded from checking.
211+
* List of <a href="https://ant.apache.org/manual/dirtasks.html#patterns">Ant patterns</a>.
212+
* All relative class paths matching one or more of the given patterns are skipped.
213+
* The given paths are relative to {@code classesDirectory}.
214+
*
210215
* @see #includes
211216
* @since 1.0
212217
*/
@@ -488,4 +493,4 @@ public void debug(String msg) {
488493
}
489494
}
490495

491-
}
496+
}

src/main/maven/pom-build.xml.template

+3
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
<extractor>java-javadoc</extractor>
4444
<extractor>java-annotations</extractor>
4545
</extractors>
46+
<externalJavadocBaseUrls>
47+
<externalJavadocBaseUrl>https://docs.oracle.com/javase/7/docs/api/</externalJavadocBaseUrl>
48+
</externalJavadocBaseUrls>
4649
</configuration>
4750
</plugin>
4851
<plugin>

0 commit comments

Comments
 (0)