Skip to content

Commit

Permalink
Fix bug with javadoc plugin inclusion when not activated by ci.deploy…
Browse files Browse the repository at this point in the history
… profile
  • Loading branch information
brianwyka committed Nov 4, 2020
1 parent 5aa4fe1 commit 0d33512
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 20 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Manages commonly used plugins and configurations across all types of packaging a
<parent>
<groupId>com.optum.sourcehawk</groupId>
<artifactId>sourcehawk-parent</artifactId>
<version>1.1.4</version>
<version>1.1.5</version>
</parent>
```

Expand All @@ -35,7 +35,7 @@ Manages plugins and profiles for all JAR based projects which extend it.
<parent>
<groupId>com.optum.sourcehawk</groupId>
<artifactId>sourcehawk-jar-parent</artifactId>
<version>1.1.4</version>
<version>1.1.5</version>
</parent>
```

Expand Down
2 changes: 1 addition & 1 deletion checkstyle-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.optum.sourcehawk</groupId>
<artifactId>sourcehawk-parent</artifactId>
<version>1.1.4-SNAPSHOT</version>
<version>1.1.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
34 changes: 18 additions & 16 deletions jar-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>sourcehawk-parent</artifactId>
<groupId>com.optum.sourcehawk</groupId>
<version>1.1.4-SNAPSHOT</version>
<version>1.1.5-SNAPSHOT</version>
</parent>

<artifactId>sourcehawk-jar-parent</artifactId>
Expand Down Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>com.optum.sourcehawk</groupId>
<artifactId>sourcehawk-checkstyle-config</artifactId>
<version>1.1.4-SNAPSHOT</version>
<version>1.1.5-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
Expand Down Expand Up @@ -365,20 +365,22 @@
</file>
</activation>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>${java.release.version}</release>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<release>${java.release.version}</release>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>${java.release.version}</release>
</configuration>
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<release>${java.release.version}</release>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.optum.sourcehawk</groupId>
<artifactId>sourcehawk-parent</artifactId>
<version>1.1.4-SNAPSHOT</version>
<version>1.1.5-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Sourcehawk Parent</name>
Expand Down

0 comments on commit 0d33512

Please sign in to comment.