Merge pull request #2191 from hazendaz/master

Add more plugins for controlling formatting and move sortpom into normal formatting profile
Waffle · Jan 20, 2024 · f4e332c · f4e332c
2 parents e182a83 + 404ac24
commit f4e332c
Show file tree

Hide file tree

Showing 40 changed files with 231 additions and 128 deletions.
diff --git a/Source/JNA/pom.xml b/Source/JNA/pom.xml
diff --git a/Source/JNA/src/site/markdown/README.md b/Source/JNA/src/site/markdown/README.md
@@ -4,7 +4,8 @@ WAFFLE - Windows Authentication Framework
 [![Java CI](https://github.com/Waffle/waffle/workflows/Java%20CI/badge.svg)](https://github.com/Waffle/waffle/actions?query=workflow%3A%22Java+CI%22)
 [![DotNET CI](https://github.com/Waffle/waffle/workflows/DotNET/badge.svg)](https://github.com/Waffle/waffle/workflows/DotNET)
 [![Coverity Scan Status](https://scan.coverity.com/projects/22153/badge.svg)](https://scan.coverity.com/projects/22153)
-[![Coverage Status](https://sonarcloud.io/api/project_badges/measure?project=Waffle_waffle&metric=coverage)](https://sonarcloud.io/dashboard?id=Waffle_waffle)
+[![Coverage Status Sonar](https://sonarcloud.io/api/project_badges/measure?project=Waffle_waffle&metric=coverage)](https://sonarcloud.io/component_measures?id=Waffle_waffle&metric=coverage)
+[![Coverage Status Coveralls](https://coveralls.io/repos/Waffle/waffle/badge.svg?branch=master&service=github)](https://coveralls.io/github/Waffle/waffle?branch=master)
 [![Maven central](https://maven-badges.herokuapp.com/maven-central/com.github.waffle/waffle-jna/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.waffle/waffle-jna)
 [![releases](https://img.shields.io/github/v/release/Waffle/waffle)](https://github.com/Waffle/waffle/releases/tag/waffle-parent-2.3.0)
 [![MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)

diff --git a/Source/JNA/waffle-demo/pom.xml b/Source/JNA/waffle-demo/pom.xml
@@ -58,8 +58,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-filter/pom.xml b/Source/JNA/waffle-demo/waffle-filter/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-filter/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-filter/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -79,7 +79,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-form/pom.xml b/Source/JNA/waffle-demo/waffle-form/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-form/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-form/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -77,7 +77,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-jaas/pom.xml b/Source/JNA/waffle-demo/waffle-jaas/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-jaas/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-jaas/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -77,7 +77,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml b/Source/JNA/waffle-demo/waffle-mixed-post/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-mixed-post/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-mixed-post/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-mixed/pom.xml b/Source/JNA/waffle-demo/waffle-mixed/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-mixed/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-mixed/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-negotiate/pom.xml b/Source/JNA/waffle-demo/waffle-negotiate/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-negotiate/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-negotiate/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml b/Source/JNA/waffle-demo/waffle-spring-boot-filter2/pom.xml
@@ -43,8 +43,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml b/Source/JNA/waffle-demo/waffle-spring-boot-filter3/pom.xml
@@ -43,8 +43,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml b/Source/JNA/waffle-demo/waffle-spring-filter/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/WEB-INF/waffle-filter.xml b/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/WEB-INF/waffle-filter.xml
@@ -3,7 +3,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -27,7 +27,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:sec="http://www.springframework.org/schema/security"
     xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd">
+        http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd">
 
     <!-- windows authentication provider -->
     <bean id="waffleWindowsAuthProvider" class="waffle.windows.auth.impl.WindowsAuthProviderImpl" />

diff --git a/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-spring-filter/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-demo/waffle-spring-form/pom.xml b/Source/JNA/waffle-demo/waffle-spring-form/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-demo/waffle-spring-form/src/main/webapp/index.jsp b/Source/JNA/waffle-demo/waffle-spring-form/src/main/webapp/index.jsp
@@ -2,7 +2,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2022 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +73,7 @@
   <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
    <input type="text" name="role" value="<%= role %>">
   </form>
-  <br><br> 
+  <br><br>
   You can logoff by clicking
   <a href='<%= response.encodeURL("index.jsp?logoff=true") %>'>here</a>.
   This should cause automatic re-logon with Waffle and a new session ID.

diff --git a/Source/JNA/waffle-jetty/pom.xml b/Source/JNA/waffle-jetty/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
@@ -113,8 +113,8 @@
                     <artifactId>apache-el</artifactId>
                 </exclusion>
                 <exclusion>
-                     <groupId>javax.servlet</groupId>
-                     <artifactId>javax.servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -154,10 +154,10 @@
             <version>${jsp.version}</version>
             <scope>provided</scope>
             <exclusions>
-                 <exclusion>
-                      <groupId>org.glassfish</groupId>
-                      <artifactId>javax.el</artifactId>
-                 </exclusion>
+                <exclusion>
+                    <groupId>org.glassfish</groupId>
+                    <artifactId>javax.el</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>

diff --git a/Source/JNA/waffle-jna-jakarta/pom.xml b/Source/JNA/waffle-jna-jakarta/pom.xml
@@ -3,7 +3,7 @@
 
     MIT License
 
-    Copyright (c) 2010-2023 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
+    Copyright (c) 2010-2024 The Waffle Project Contributors: https://github.com/Waffle/waffle/graphs/contributors
 
     Permission is hereby granted, free of charge, to any person obtaining a copy
     of this software and associated documentation files (the "Software"), to deal
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-jna/pom.xml b/Source/JNA/waffle-jna/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-shiro/pom.xml b/Source/JNA/waffle-shiro/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>

diff --git a/Source/JNA/waffle-spring-boot2/pom.xml b/Source/JNA/waffle-spring-boot2/pom.xml
@@ -41,11 +41,16 @@
     <description>Sping Boot integration for WAFFLE</description>
     <url>https://waffle.github.io/waffle/</url>
 
+    <modules>
+        <module>waffle-spring-boot-autoconfigure2</module>
+        <module>waffle-spring-boot-starter2</module>
+    </modules>
+
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>
@@ -60,11 +65,6 @@
         <module.name>waffle.spring.boot2</module.name>
     </properties>
 
-    <modules>
-        <module>waffle-spring-boot-autoconfigure2</module>
-        <module>waffle-spring-boot-starter2</module>
-    </modules>
-
     <dependencyManagement>
         <dependencies>
             <!-- Internal Dependencies -->

diff --git a/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/pom.xml b/Source/JNA/waffle-spring-boot2/waffle-spring-boot-autoconfigure2/pom.xml
@@ -44,8 +44,8 @@
     <scm>
         <connection>scm:git:ssh://[email protected]/waffle/waffle.git</connection>
         <developerConnection>scm:git:ssh://[email protected]/waffle/waffle.git</developerConnection>
-        <url>https://github.com/Waffle/waffle</url>
         <tag>HEAD</tag>
+        <url>https://github.com/Waffle/waffle</url>
     </scm>
 
     <properties>