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

Draft attempt at doxia 2 #939

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

Draft attempt at doxia 2 #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cdfe0c
[site] Move project onto site 4
hazendaz Dec 2, 2023
70ed57b
[site] Move all IT tests to site 2.0
hazendaz Dec 27, 2023
95ac11c
[cleanup] Remove items not used in base violation check mojo
hazendaz Dec 27, 2023
e711019
[cleanup] Remove items duplicated from parent in spot bugs mojo for n…
hazendaz Dec 27, 2023
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
67 changes: 6 additions & 61 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,17 +184,16 @@
<groovyVersion>4.0.24</groovyVersion>
<javaparserVersion>3.26.2</javaparserVersion>

<doxiaVersion>1.12.0</doxiaVersion>
<doxiaSiteToolsVersion>1.11.1</doxiaSiteToolsVersion>
<doxiaVersion>2.0.0</doxiaVersion>
<doxiaSiteToolsVersion>2.0.0</doxiaSiteToolsVersion>

<mavenSharedUtilsVersion>3.4.2</mavenSharedUtilsVersion>
<mavenTransferVersion>0.13.1</mavenTransferVersion>
<mavenCommonArtifactFilters>3.4.0</mavenCommonArtifactFilters>
<mavenReportingApiVersion>3.1.1</mavenReportingApiVersion>
<mavenReportingVersion>3.2.0</mavenReportingVersion>
<mavenReportingApiVersion>4.0.0</mavenReportingApiVersion>
<mavenReportingVersion>4.0.0</mavenReportingVersion>
<mavenVersion>3.9.9</mavenVersion>

<plexusContainerVersion>2.1.1</plexusContainerVersion>
<plexusResourcesVersion>1.3.0</plexusResourcesVersion>
<plexusUtilsVersion>4.0.2</plexusUtilsVersion>
<plexusXmlVersion>3.0.1</plexusXmlVersion>
Expand All @@ -208,7 +207,7 @@
<javadocPluginVersion>3.11.1</javadocPluginVersion>
<pluginPluginVersion>3.15.1</pluginPluginVersion>
<scmPluginVersion>2.1.0</scmPluginVersion>
<sitePluginVersion>3.12.1</sitePluginVersion>
<sitePluginVersion>3.20.0</sitePluginVersion>
<versionsPluginVersion>2.17.1</versionsPluginVersion>

<spotbugsTestDebug>false</spotbugsTestDebug>
Expand Down Expand Up @@ -237,15 +236,12 @@
<asm.version>9.7.1</asm.version>
<bcel.version>6.10.0</bcel.version>
<beanutils.version>1.9.4</beanutils.version>
<chain.version>1.2</chain.version>
<codec.version>1.17.1</codec.version>
<collections.version>3.2.2</collections.version>
<digester.version>2.1</digester.version>
<gson.version>2.11.0</gson.version>
<guava.version>33.3.1-jre</guava.version>
<io.version>2.17.0</io.version>
<jaxen.version>2.0.0</jaxen.version>
<lang2.version>2.6</lang2.version>
<lang3.version>3.17.0</lang3.version>

<!-- Automatic Module Name -->
Expand Down Expand Up @@ -427,12 +423,6 @@
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
<version>${mavenReportingVersion}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -496,16 +486,6 @@
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-core</artifactId>
<version>${doxiaVersion}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
Expand All @@ -514,7 +494,7 @@
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-decoration-model</artifactId>
<artifactId>doxia-site-model</artifactId>
<version>${doxiaSiteToolsVersion}</version>
</dependency>
<dependency>
Expand All @@ -526,26 +506,12 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-integration-tools</artifactId>
<version>${doxiaSiteToolsVersion}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Commons -->
Expand All @@ -560,11 +526,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-chain</groupId>
<artifactId>commons-chain</artifactId>
<version>${chain.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand All @@ -575,27 +536,11 @@
<artifactId>commons-collections</artifactId>
<version>${collections.version}</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${digester.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${io.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>${lang2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down
15 changes: 6 additions & 9 deletions src/it/MFINDBUGS-178/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2005-2023 the original author or authors.
Copyright 2005-2024 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,18 +16,15 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
name="SpotBugs Maven Plugin">
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<bannerLeft>
<name>SpotBugs Maven Plugin</name>
</bannerLeft>
<bannerLeft name="SpotBugs Maven Plugin" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.12.0</version>
<version>2.0.0-M11</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0l.0

</skin>

<custom>
Expand All @@ -50,4 +47,4 @@
<publishDate format="yyyy-MM-dd" position="right"/>
<version position="right"/>

</project>
</site>
15 changes: 6 additions & 9 deletions src/it/basic-1/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2005-2023 the original author or authors.
Copyright 2005-2024 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,18 +16,15 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
name="SpotBugs Maven Plugin">
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<bannerLeft>
<name>SpotBugs Maven Plugin</name>
</bannerLeft>
<bannerLeft name="SpotBugs Maven Plugin" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.12.0</version>
<version>2.0.0-M11</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0;0

</skin>

<custom>
Expand All @@ -50,4 +47,4 @@
<publishDate format="yyyy-MM-dd" position="right"/>
<version position="right"/>

</project>
</site>
15 changes: 6 additions & 9 deletions src/it/change-xml-filename/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2005-2023 the original author or authors.
Copyright 2005-2024 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,18 +16,15 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
name="SpotBugs Maven Plugin">
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<bannerLeft>
<name>SpotBugs Maven Plugin</name>
</bannerLeft>
<bannerLeft name="SpotBugs Maven Plugin" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.12.0</version>
<version>2.0.0-M11</version>
</skin>

<custom>
Expand All @@ -50,4 +47,4 @@
<publishDate format="yyyy-MM-dd" position="right"/>
<version position="right"/>

</project>
</site>
15 changes: 6 additions & 9 deletions src/it/check-bug-file-multi-list/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2005-2023 the original author or authors.
Copyright 2005-2024 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,18 +16,15 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
name="SpotBugs Maven Plugin">
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<bannerLeft>
<name>SpotBugs Maven Plugin</name>
</bannerLeft>
<bannerLeft name="SpotBugs Maven Plugin" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.12.0</version>
<version>2.0.0-M11</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0.0

</skin>

<custom>
Expand All @@ -50,4 +47,4 @@
<publishDate format="yyyy-MM-dd" position="right"/>
<version position="right"/>

</project>
</site>
15 changes: 6 additions & 9 deletions src/it/check-bug-file-multi/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2005-2023 the original author or authors.
Copyright 2005-2024 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,18 +16,15 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
name="SpotBugs Maven Plugin">
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<bannerLeft>
<name>SpotBugs Maven Plugin</name>
</bannerLeft>
<bannerLeft name="SpotBugs Maven Plugin" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.12.0</version>
<version>2.0.0-M11</version>
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0.0

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have it updated locally but no luck. I think part of the problem for this project is that it wants to override reporting execute that was made final.

I'll push up fresh copy tonight with this part corrected.

</skin>

<custom>
Expand All @@ -50,4 +47,4 @@
<publishDate format="yyyy-MM-dd" position="right"/>
<version position="right"/>

</project>
</site>
15 changes: 6 additions & 9 deletions src/it/check-bug-file/src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright 2005-2023 the original author or authors.
Copyright 2005-2024 the original author or authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -16,18 +16,15 @@
limitations under the License.

-->
<project xmlns="http://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.1 https://maven.apache.org/xsd/decoration-1.8.1.xsd"
name="SpotBugs Maven Plugin">
<site name="${project.name}" xmlns="http://maven.apache.org/SITE/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0 https://maven.apache.org/xsd/site-2.0.0.xsd">

<bannerLeft>
<name>SpotBugs Maven Plugin</name>
</bannerLeft>
<bannerLeft name="SpotBugs Maven Plugin" />

<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
<version>1.12.0</version>
<version>2.0.0-M11</version>
</skin>

<custom>
Expand All @@ -50,4 +47,4 @@
<publishDate format="yyyy-MM-dd" position="right"/>
<version position="right"/>

</project>
</site>
Loading
Loading