Skip to content

Commit 8177f7a

Browse files
authored
OAK-11319 Always execute apache-rat-plugin (#1912)
Remove "rat" profile Enable profile "javadoc" for GHA CI
1 parent 9eae47c commit 8177f7a

File tree

3 files changed

+14
-61
lines changed

3 files changed

+14
-61
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
cache: maven
3838
- name: Build
3939
# executing ITs requires installing artifacts to the local repository
40-
run: mvn -B install -Pcoverage -PintegrationTesting -Dnsfixtures=SEGMENT_TAR,DOCUMENT_NS
40+
run: mvn -B install -Pcoverage,integrationTesting,javadoc -Dnsfixtures=SEGMENT_TAR,DOCUMENT_NS
4141
- name: Upload build result
4242
uses: actions/upload-artifact@v4
4343
with:

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def buildModule(moduleSpec) {
6363
// clean all modules
6464
sh "${MAVEN_CMD} -T 1C clean"
6565
// build and install up to desired module
66-
sh "${MAVEN_CMD} -Dbaseline.skip=true -Prat -T 1C install -DskipTests -pl :${moduleName} -am"
66+
sh "${MAVEN_CMD} -Dbaseline.skip=true -T 1C install -DskipTests -pl :${moduleName} -am"
6767
try {
6868
sh "${MAVEN_CMD} ${testOptions} -DtrimStackTrace=false -Dnsfixtures=SEGMENT_TAR,DOCUMENT_NS -Dmongo.db=MongoMKDB-${MONGODB_SUFFIX} clean verify -pl :${moduleName}"
6969
} finally {

oak-parent/pom.xml

+12-59
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,18 @@
453453
</execution>
454454
</executions>
455455
</plugin>
456+
<plugin>
457+
<groupId>org.apache.rat</groupId>
458+
<artifactId>apache-rat-plugin</artifactId>
459+
<executions>
460+
<execution>
461+
<phase>verify</phase>
462+
<goals>
463+
<goal>check</goal>
464+
</goals>
465+
</execution>
466+
</executions>
467+
</plugin>
456468
</plugins>
457469
</build>
458470

@@ -936,18 +948,6 @@
936948
</execution>
937949
</executions>
938950
</plugin>
939-
<plugin>
940-
<groupId>org.apache.rat</groupId>
941-
<artifactId>apache-rat-plugin</artifactId>
942-
<executions>
943-
<execution>
944-
<phase>verify</phase>
945-
<goals>
946-
<goal>check</goal>
947-
</goals>
948-
</execution>
949-
</executions>
950-
</plugin>
951951
<plugin>
952952
<artifactId>maven-checkstyle-plugin</artifactId>
953953
<configuration>
@@ -1023,33 +1023,6 @@
10231023
</build>
10241024
</profile>
10251025

1026-
<profile>
1027-
<id>rat</id>
1028-
<build>
1029-
<plugins>
1030-
<plugin>
1031-
<groupId>org.apache.rat</groupId>
1032-
<artifactId>apache-rat-plugin</artifactId>
1033-
<executions>
1034-
<execution>
1035-
<phase>verify</phase>
1036-
<goals>
1037-
<goal>check</goal>
1038-
</goals>
1039-
</execution>
1040-
</executions>
1041-
</plugin>
1042-
<plugin>
1043-
<artifactId>maven-surefire-plugin</artifactId>
1044-
<configuration>
1045-
<!-- run a test to prevent Jenkins from failing because no test ran -->
1046-
<test>PathUtilsTest</test>
1047-
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
1048-
</configuration>
1049-
</plugin>
1050-
</plugins>
1051-
</build>
1052-
</profile>
10531026
<profile>
10541027
<id>javadoc</id>
10551028
<build>
@@ -1065,33 +1038,13 @@
10651038
</execution>
10661039
</executions>
10671040
</plugin>
1068-
<plugin>
1069-
<artifactId>maven-surefire-plugin</artifactId>
1070-
<configuration>
1071-
<!-- run a test to prevent Jenkins from failing because no test ran -->
1072-
<test>PathUtilsTest</test>
1073-
<failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
1074-
</configuration>
1075-
</plugin>
10761041
</plugins>
10771042
</build>
10781043
</profile>
10791044
<profile>
10801045
<id>pedantic</id>
10811046
<build>
10821047
<plugins>
1083-
<plugin>
1084-
<groupId>org.apache.rat</groupId>
1085-
<artifactId>apache-rat-plugin</artifactId>
1086-
<executions>
1087-
<execution>
1088-
<phase>verify</phase>
1089-
<goals>
1090-
<goal>check</goal>
1091-
</goals>
1092-
</execution>
1093-
</executions>
1094-
</plugin>
10951048
<plugin>
10961049
<artifactId>maven-checkstyle-plugin</artifactId>
10971050
<configuration>

0 commit comments

Comments
 (0)