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

Change skin for mvn site report to use fluido #731

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Change skin for mvn site report to use fluido #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6a7ab3
Change skin for mvn site report to use fluido, including custom OWASP…
davewichers Jul 25, 2022
dface3a
Remove 'https' changes from first line of pom per @kwwall request.
davewichers Aug 22, 2022
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
20 changes: 14 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
Copy link
Contributor

Choose a reason for hiding this comment

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

Question for you @davewichers - This is just an XML namespace and often IRL, these URLs do not even exist and would return a 404. So if we were to change them to https would the schema validation still work or is there a chance it could break something. TBH, I've never seen https:// schema used in XML namespace and I'd be concerned if someone wrote a parser to do schema validations of Maven pom files (like might be in some IDEs), that this change could break something.

Copy link
Contributor

Choose a reason for hiding this comment

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

@davewichers - I'm going to reject this particular change as it causes an error / warning in Eclipse and perhaps other zIDEs as well. See attached pic for example
ESAPI-pom-Eclipse
.

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
Expand All @@ -26,12 +26,12 @@
<licenses>
<license>
<name>BSD</name>
<url>http://www.opensource.org/licenses/bsd-license.php</url>
<url>https://www.opensource.org/licenses/bsd-license.php</url>
<comments>Code License - New BSD License</comments>
</license>
<license>
<name>Creative Commons 3.0 BY-SA</name>
<url>http://creativecommons.org/licenses/by-sa/3.0/</url>
<url>https://creativecommons.org/licenses/by-sa/3.0/</url>
<comments>Content License - Create Commons 3.0 BY-SA</comments>
</license>
</licenses>
Expand Down Expand Up @@ -693,9 +693,16 @@
</plugin>

<plugin>
<!-- Note: This uses the maven-fluido-skin version specified next. The skin is referenced in src/site/site.xml. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M2</version>
<version>4.0.0-M3</version>
</plugin>

<plugin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluid-skin</artifactId>
<version>1.11.1</version>
</plugin>

<plugin>
Expand Down Expand Up @@ -768,10 +775,11 @@

<reporting>
<plugins>
<plugin>
<!-- plugin>
This is broken currently, in the mvn site output, so commenting out.
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
</plugin>
</plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
Expand Down
Binary file added src/site/resources/images/owasp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions src/site/site.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="${project.name}" xmlns="https://maven.apache.org/DECORATION/1.8.0"
xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://maven.apache.org/DECORATION/1.8.0 https://maven.apache.org/xsd/decoration-1.8.0.xsd">
<bannerLeft>
<src>/images/owasp.png</src>
<href>https://owasp.org/www-project-enterprise-security-api/</href>
</bannerLeft>
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
</skin>
<custom>
<fluidoSkin>
<topBarEnabled>false</topBarEnabled>
<sideBarEnabled>true</sideBarEnabled>
</fluidoSkin>
</custom>
<body>
<links>
<item name="OWASP ESAPI" href="https://owasp.org/www-project-enterprise-security-api/" />
</links>
<menu ref="reports" />
</body>
</project>