Skip to content

Commit

Permalink
Make license header path accessible to submodules (oshi#714)
Browse files Browse the repository at this point in the history
* Make license header path accessible to submodules

* Version updates
  • Loading branch information
dbwiddis committed Dec 5, 2018
1 parent 260ea46 commit bf6d56f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 4 deletions.
4 changes: 4 additions & 0 deletions oshi-core-shaded/pom.xml
Expand Up @@ -40,6 +40,10 @@
<tag>HEAD</tag>
</scm>

<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>

<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
1 change: 1 addition & 0 deletions oshi-core/pom.xml
Expand Up @@ -42,6 +42,7 @@

<properties>
<jna.version>5.1.0</jna.version>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>

<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions oshi-dist/pom.xml
Expand Up @@ -38,6 +38,10 @@
<tag>HEAD</tag>
</scm>

<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>

<!-- NOTE: These dependency declarations are only required to sort this
project to the end of the line in the multimodule build. -->
<dependencies>
Expand Down
4 changes: 4 additions & 0 deletions oshi-json/pom.xml
Expand Up @@ -40,6 +40,10 @@
<tag>HEAD</tag>
</scm>

<properties>
<main.basedir>${project.parent.basedir}</main.basedir>
</properties>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Expand Down
10 changes: 6 additions & 4 deletions pom.xml
Expand Up @@ -110,6 +110,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<signature.artifact>java17</signature.artifact>
<signature.version>1.0</signature.version>
<!-- Base directory, overwrite in submodules -->
<main.basedir>${project.basedir}</main.basedir>
<!-- Dependency versions -->
<slf4j.version>1.7.25</slf4j.version>
<junit-vintage-engine.version>4.12.3</junit-vintage-engine.version>
Expand Down Expand Up @@ -145,7 +147,7 @@
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<spotbugs-maven-plugin.version>3.1.8</spotbugs-maven-plugin.version>
<spotbugs-maven-plugin.version>3.1.9</spotbugs-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.2</jacoco-maven-plugin.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<tidy-maven-plugin.version>1.1.0</tidy-maven-plugin.version>
Expand All @@ -162,15 +164,15 @@
<maven-scm-plugin.version>1.11.1</maven-scm-plugin.version>
<maven-scm-provider-jgit.version>1.11.1</maven-scm-provider-jgit.version>
<JavaEWAH.version>1.1.6</JavaEWAH.version>
<jsch.version>0.1.54</jsch.version>
<jsch.version>0.1.55</jsch.version>
<jgit.version>5.1.3.201810200350-r</jgit.version>
<plexus-utils.version>3.1.0</plexus-utils.version>
<!-- Misc. -->
<sonar-maven-plugin.version>3.5.0.1254</sonar-maven-plugin.version>
<wagon-maven-plugin.version>2.0.0</wagon-maven-plugin.version>
<animal-sniffer-maven-plugin.version>1.17</animal-sniffer-maven-plugin.version>
<dependency-check-maven.version>3.3.4</dependency-check-maven.version>
<puppycrawl.checkstyle.version>8.14</puppycrawl.checkstyle.version>
<puppycrawl.checkstyle.version>8.15</puppycrawl.checkstyle.version>
<m2e.lifecycle-mapping.version>1.0.0</m2e.lifecycle-mapping.version>
</properties>

Expand Down Expand Up @@ -484,7 +486,7 @@
<artifactId>license-maven-plugin</artifactId>
<version>${license-maven-plugin.version}</version>
<configuration>
<header>LICENSE_HEADER</header>
<header>${main.basedir}/LICENSE_HEADER</header>
<excludes>
<exclude>**/*test.*.txt</exclude>
<exclude>**/maven-wrapper.properties</exclude>
Expand Down

0 comments on commit bf6d56f

Please sign in to comment.