Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: RAT-397: Migrate RAT to new site stack and prepare for upcoming Doxia 2.x migration #386

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

WIP: RAT-397: Migrate RAT to new site stack and prepare for upcoming Doxia 2.x migration #386

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
920306f
RAT-397: Allowe deployment of site next to old version in rat017
ottlinger Nov 7, 2024
2aee606
RAT-397: Start migration to new site/skin structure
ottlinger Nov 7, 2024
b8a459a
RAT-397, RAT-345: Update project-info-reports-plugin
ottlinger Nov 8, 2024
cf051c0
RAT-397: Migrate base site structures
ottlinger Nov 8, 2024
c1bcb40
RAT-397: Add github ribbon
ottlinger Nov 15, 2024
ccd7caa
RAT-397: xmllint site desc
ottlinger Nov 15, 2024
c5886a8
RAT-397: Add build helper to format site descriptors properly
ottlinger Nov 15, 2024
c872260
RAT-397: Cleanup all site descriptors
ottlinger Nov 15, 2024
363500d
RAT-397: Fix coordinates
ottlinger Nov 15, 2024
cc7aa78
Merge remote-tracking branch 'origin/master' into feature/RAT-397
ottlinger Nov 23, 2024
7062ee7
RAT-379: Resources from the parent project are no longer handled by t…
jochenw Dec 2, 2024
4e76340
Revert "RAT-379: Resources from the parent project are no longer hand…
ottlinger Dec 2, 2024
ee34979
RAT-379: Resources from the parent project are no longer handled by t…
jochenw Dec 2, 2024
cc0d20a
Restoring the ability to build with Maven 4
jochenw Dec 2, 2024
a91c209
Revert "Restoring the ability to build with Maven 4"
ottlinger Dec 2, 2024
27bed36
Revert "RAT-379: Resources from the parent project are no longer hand…
ottlinger Dec 2, 2024
6b7ee32
Merge remote-tracking branch 'origin/master' into feature/RAT-397
ottlinger Dec 5, 2024
d6d6339
MCHANGELOG-157, RAT-397: Add other broken report
ottlinger Dec 5, 2024
05d6f11
RAT-397: Adapt target to new changes version
ottlinger Dec 12, 2024
bdc3975
Merge branch 'master' into feature/RAT-397
ottlinger Dec 12, 2024
b47955d
RAT-397: Remove deprecated configuration params
ottlinger Dec 12, 2024
6ba119a
Merge remote-tracking branch 'origin/master' into feature/RAT-397
ottlinger Dec 12, 2024
d6dd171
RAT-397: explicitly manage version of skin used
ottlinger Dec 12, 2024
8115815
Merge remote-tracking branch 'origin/master' into feature/RAT-397
ottlinger Dec 13, 2024
21c56af
RAT-397: Adapt changelog configs
ottlinger Dec 13, 2024
4fc0292
RAT-397: Add taglist plugin
ottlinger Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "RAT-379: Resources from the parent project are no longer hand… 
…led by the maven-resources-plugin."

This reverts commit ee34979.
  • Loading branch information
@ottlinger
ottlinger committed Dec 2, 2024
commit 27bed3657eab5be930d489a81f2065442a582045
36 changes: 7 additions & 29 deletions apache-rat-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
</resource>
<resource>
<directory>..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>RELEASE_NOTES.txt</include>
</includes>
</resource>
</resources>
<pluginManagement>
<plugins>
Expand All @@ -44,12 +51,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<!-- Automatically generated by Eclipse, thus ignorable. -->
<exclude>.classpath</exclude>
<exclude>.project</exclude>
<exclude>.settings/**/*</exclude>
<exclude>bin/**/*</exclude>

<!-- These files have bad license headers because they are used to test bad license headers -->
<exclude>src/test/resources/**</exclude>
<exclude>src/it/resources/ReportTest/**</exclude>
Expand Down Expand Up @@ -135,29 +136,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.jochenw.jmp</groupId>
<artifactId>jwigrv-maven-plugin</artifactId>
<version>0.2</version>
<executions>
<execution>
<!-- Copy a set of resource files from the parent project to target/classes/META-INF,
so that they become a part of the generated jar file. See RAT-379.
-->
<phase>generate-resources</phase>
<goals><goal>run</goal></goals>
<configuration>
<scriptFile>src/main/build-grv/copyResourcesFromParentProject.groovy</scriptFile>
<scriptProperties>
<sourceDir>${basedir}/..</sourceDir>
<targetDir>${project.build.outputDirectory}/META-INF</targetDir>
<!-- Comma separated list of files, which are being copied -->
<filesToCopy>RELEASE_NOTES.txt</filesToCopy>
</scriptProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
59 changes: 0 additions & 59 deletions apache-rat-core/src/main/build-grv/copyResourcesFromParentProject.groovy
View file
Open in desktop

This file was deleted.

28 changes: 7 additions & 21 deletions apache-rat-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
</resource>
<resource>
<directory>..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>RELEASE_NOTES.txt</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
Expand Down Expand Up @@ -85,12 +92,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<!-- Automatically generated by Eclipse, thus ignorable. -->
<exclude>.classpath</exclude>
<exclude>.project</exclude>
<exclude>.settings/**/*</exclude>
<exclude>bin/**/*</exclude>

<!-- These files do not have license headers because they are used to test license headers -->
<exclude>src/it/**</exclude>
<exclude>src/it/**/src.apt</exclude>
Expand Down Expand Up @@ -253,21 +254,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<configuration>
<includeArtifactIds>apache-rat-core</includeArtifactIds>
<includes>META-INF/RELEASE_NOTES.txt</includes>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
24 changes: 7 additions & 17 deletions apache-rat-tasks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,20 @@
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
</resource>
<resource>
<directory>..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>RELEASE_NOTES.txt</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>generate-test-resources</id>
<phase>generate-test-resources</phase>
<goals>
<goal>copy-dependencies</goal>
Expand All @@ -100,16 +106,6 @@
<outputDirectory>${project.build.directory}/dependencies</outputDirectory>
</configuration>
</execution>
<execution>
<id>generate-resources</id>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<configuration>
<includeArtifactIds>apache-rat-core</includeArtifactIds>
<includes>META-INF/RELEASE_NOTES.txt</includes>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -246,12 +242,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<!-- Automatically generated by Eclipse, thus ignorable. -->
<exclude>.classpath</exclude>
<exclude>.project</exclude>
<exclude>.settings/**/*</exclude>
<exclude>bin/**/*</exclude>

<!-- These files do not have license headers -->
<exclude>src/test/resources/</exclude>
<exclude>src/site/apt/*.txt</exclude>
Expand Down
28 changes: 7 additions & 21 deletions apache-rat-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@
<filtering>true</filtering>
<directory>src/main/filtered-resources</directory>
</resource>
<resource>
<directory>..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>RELEASE_NOTES.txt</include>
</includes>
</resource>
</resources>
<pluginManagement>
<plugins>
Expand All @@ -44,12 +51,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<!-- Automatically generated by Eclipse, thus ignorable. -->
<exclude>.classpath</exclude>
<exclude>.project</exclude>
<exclude>.settings/**/*</exclude>
<exclude>bin/**/*</exclude>

<!-- This file is included into a generated file. -->
<exclude>src/main/resources/Args.tpl</exclude>
<exclude>src/main/resources/ant/report.tpl</exclude>
Expand All @@ -58,21 +59,6 @@
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals><goal>unpack-dependencies</goal></goals>
<configuration>
<includeArtifactIds>apache-rat-core</includeArtifactIds>
<includes>META-INF/RELEASE_NOTES.txt</includes>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
40 changes: 11 additions & 29 deletions apache-rat/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,17 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>..</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>RELEASE_NOTES.txt</include>
<include>LICENSE</include>
<include>NOTICE</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -200,29 +211,6 @@
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>com.github.jochenw.jmp</groupId>
<artifactId>jwigrv-maven-plugin</artifactId>
<version>0.2</version>
<executions>
<execution>
<!-- Copy a set of resource files from the parent project to target/classes/META-INF,
so that they become a part of the generated jar file. See RAT-379.
-->
<phase>generate-resources</phase>
<goals><goal>run</goal></goals>
<configuration>
<scriptFile>src/main/build-grv/copyResourcesFromParentProject.groovy</scriptFile>
<scriptProperties>
<sourceDir>${basedir}/..</sourceDir>
<targetDir>${project.build.outputDirectory}/META-INF</targetDir>
<!-- Comma separated list of files, which are being copied -->
<filesToCopy>RELEASE_NOTES.txt,LICENSE,NOTICE</filesToCopy>
</scriptProperties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
Expand All @@ -231,12 +219,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
<!-- Automatically generated by Eclipse, thus ignorable. -->
<exclude>.classpath</exclude>
<exclude>.project</exclude>
<exclude>.settings/**/*</exclude>
<exclude>bin/**/*</exclude>

<!-- These files only describe how to use the project and they
have no license headers -->
<exclude>README-ANT.txt</exclude>
Expand Down
59 changes: 0 additions & 59 deletions apache-rat/src/main/build-grv/copyResourcesFromParentProject.groovy
View file
Open in desktop

This file was deleted.

Loading
Loading