Skip to content

Commit 6fb007a

Browse files
authored
Find parent pom directory using maven magic (#1585)
1 parent 626534b commit 6fb007a

File tree

11 files changed

+20
-19
lines changed

11 files changed

+20
-19
lines changed

build-tools/checkstyle/customized_google_checks.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</module>
4242

4343
<module name="RegexpHeader">
44-
<property name="headerFile" value="build-tools/checkstyle/java.header"/>
44+
<property name="header" value="^// Copyright \(c\) (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\.$\n^// Licensed under the Universal Permissive License v 1\.0 as shown at https://oss\.oracle\.com/licenses/upl\.$"/>
4545
<property name="fileExtensions" value="java"/>
4646
</module>
4747

build-tools/checkstyle/java.header

Lines changed: 0 additions & 2 deletions
This file was deleted.

buildtime-reports/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,4 @@
7070
</dependency>
7171
</dependencies>
7272

73-
<properties>
74-
<root.basedir>${project.parent.basedir}</root.basedir>
75-
</properties>
76-
7773
</project>

integration-tests/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<properties>
2929
<src-integration-test>${project.basedir}/src/test/java</src-integration-test>
3030
<resource-integration-test>${project.basedir}/src/test/resources</resource-integration-test>
31-
<root.basedir>${project.parent.basedir}</root.basedir>
3231
<junit-version>4.13</junit-version>
3332
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
3433
</properties>

json-schema-maven-plugin/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
</dependencies>
5151

5252
<properties>
53-
<root.basedir>${project.parent.basedir}</root.basedir>
5453
<junit-version>4.13</junit-version>
5554
</properties>
5655

json-schema/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
</dependencies>
4747

4848
<properties>
49-
<root.basedir>${project.parent.basedir}</root.basedir>
5049
<junit-version>4.13</junit-version>
5150
</properties>
5251

kubernetes/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
</dependencies>
104104

105105
<properties>
106-
<root.basedir>${project.parent.basedir}</root.basedir>
107106
<junit-version>4.13</junit-version>
108107
</properties>
109108

new-integration-tests/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<wit.version>latest</wit.version>
2222
<wdt.version>latest</wdt.version>
2323
<includes-failsafe>**/It*</includes-failsafe>
24-
<root.basedir>${project.parent.basedir}</root.basedir>
2524
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
2625
</properties>
2726

operator/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</execution>
4141
</executions>
4242
<configuration>
43-
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
43+
<dotGitDirectory>${root.basedir}/.git</dotGitDirectory>
4444
<prefix>git</prefix>
4545
<verbose>false</verbose>
4646
<generateGitPropertiesFile>true</generateGitPropertiesFile>
@@ -384,7 +384,6 @@
384384
</dependencies>
385385

386386
<properties>
387-
<root.basedir>${project.parent.basedir}</root.basedir>
388387
<junit-version>4.13</junit-version>
389388
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/../${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
390389
</properties>

pom.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,24 @@
238238
<artifactId>maven-enforcer-plugin</artifactId>
239239
</plugin>
240240

241+
<plugin>
242+
<groupId>org.commonjava.maven.plugins</groupId>
243+
<artifactId>directory-maven-plugin</artifactId>
244+
<version>0.1</version>
245+
<executions>
246+
<execution>
247+
<id>directories</id>
248+
<goals>
249+
<goal>highest-basedir</goal>
250+
</goals>
251+
<phase>initialize</phase>
252+
<configuration>
253+
<property>root.basedir</property>
254+
</configuration>
255+
</execution>
256+
</executions>
257+
</plugin>
258+
241259
<plugin>
242260
<groupId>org.apache.maven.plugins</groupId>
243261
<artifactId>maven-javadoc-plugin</artifactId>
@@ -706,7 +724,6 @@
706724
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
707725
<src-integration-test>${project.basedir}/src/test/java</src-integration-test>
708726
<resource-integration-test>${project.basedir}/src/test/resources</resource-integration-test>
709-
<root.basedir>${project.basedir}</root.basedir>
710727
<maven.compiler.source>11</maven.compiler.source>
711728
<maven.compiler.target>11</maven.compiler.target>
712729
<java.version.range>11</java.version.range>

0 commit comments

Comments
 (0)