Skip to content

Commit b0e9acb

Browse files
authored
Merge pull request #151 from khmarbaise/issue-150
Fixed #150 - Maven build - JavaDoc Configuration / Defaults
2 parents 0843fda + f7e09b6 commit b0e9acb

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

airline-core/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@
55
<groupId>com.github.rvesse</groupId>
66
<artifactId>airline-parent</artifactId>
77
<version>3.1.1-SNAPSHOT</version>
8-
<relativePath>../pom.xml</relativePath>
98
</parent>
109

1110
<artifactId>airline</artifactId>
12-
<packaging>jar</packaging>
1311

1412
<name>Airline - Library</name>
1513
<description>Java library provided an annotation-based framework for parsing Git like command line structures</description>

airline-jpms-debug/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<artifactId>airline-parent</artifactId>
56
<groupId>com.github.rvesse</groupId>
67
<version>3.1.1-SNAPSHOT</version>
78
</parent>
8-
<modelVersion>4.0.0</modelVersion>
99
<artifactId>airline-jpms-debug</artifactId>
1010
<name>Airline - JPMS - Resource Visibility Debugging Utility</name>
1111
<description>A debugging utility for scanning the classpath for resources</description>

airline-jpms-resources/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<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">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<artifactId>airline-parent</artifactId>
56
<groupId>com.github.rvesse</groupId>
67
<version>3.1.1-SNAPSHOT</version>
78
</parent>
8-
<modelVersion>4.0.0</modelVersion>
99
<artifactId>airline-jpms-resources</artifactId>
1010
<name>Airline - JPMS - Resource Locator</name>
1111
<description>Provides an Airline ResourceLocator that is able to locate resources when Airline is used in JPMS

airline-maven-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<url>http://rvesse.github.io/airline/</url>
1616

1717
<properties>
18-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1918
<license.header.path>${project.parent.basedir}</license.header.path>
2019
<coveralls.skip>true</coveralls.skip>
2120

pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
<jdk.target>11</jdk.target>
4646
<jdk.enforced>11</jdk.enforced>
4747
<license.header.path>${project.basedir}</license.header.path>
48-
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
48+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
49+
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4950

5051
<!-- Coveralls API Token - MUST be injected into build via Maven properties -->
5152
<coveralls.token />
@@ -421,8 +422,8 @@
421422
<id>attach-sources</id>
422423
<phase>package</phase>
423424
<goals>
424-
<goal>jar</goal>
425-
<goal>test-jar</goal>
425+
<goal>jar-no-fork</goal>
426+
<goal>test-jar-no-fork</goal>
426427
</goals>
427428
</execution>
428429
</executions>
@@ -444,9 +445,6 @@
444445
<configuration>
445446
<javadocVersion>${jdk.target}</javadocVersion>
446447
<quiet>true</quiet>
447-
<encoding>UTF-8</encoding>
448-
<charset>UTF-8</charset>
449-
<docencoding>UTF-8</docencoding>
450448
<additionalOptions>
451449
<option>-Xdoclint:none</option>
452450
</additionalOptions>

0 commit comments

Comments
 (0)