This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
The following commit(s) were added to refs/heads/main by this push:
new 8e50c91ff Add EditorConfig checker with pre-commit (#2559)
8e50c91ff is described below
commit 8e50c91ff81f829778f2b9cf3eb841aba8a3e866
Author: John Bampton <[email protected]>
AuthorDate: Wed Feb 11 00:53:45 2026 +1000
Add EditorConfig checker with pre-commit (#2559)
A Python wrapper for the main checker written in Go:
https://github.com/editorconfig-checker/editorconfig-checker.python?tab=readme-ov-file#usage-with-the-pre-commit-git-hooks-framework
https://github.com/editorconfig-checker/editorconfig-checker
Clean ups in HTML, RDF and XHTML
Standardization of the position of the `html` doctype to the top for HTML
and XHTML files.
Also standardized the doctypes to one format with lowercase "html" part.
The RDF file had indentation standardized to 4 characters as detailed in
the Editorconfig file.
The XHTML file seemed invalid with the XML declaration so it was removed.
---
.pre-commit-config.yaml | 7 +++++++
.../webapp/WEB-INF/errorpages/invalidErrorPage.xhtml | 1 -
.../src/main/resources/templates/account-info.html | 2 +-
.../src/main/resources/templates/fragments/head.html | 2 +-
.../src/main/resources/templates/hello.html | 2 +-
.../src/main/resources/templates/login.html | 2 +-
.../src/main/resources/templates/account-info.html | 2 +-
.../src/main/resources/templates/fragments/head.html | 2 +-
.../src/main/resources/templates/hello.html | 2 +-
.../src/main/resources/templates/login.html | 2 +-
shiro.doap.rdf | 18 +++++++++---------
11 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5e411bea5..48eaf3283 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -132,3 +132,10 @@ repos:
- id: shellcheck
name: run shellcheck
description: check Shell scripts with shellcheck
+ - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
+ rev: 3.6.0
+ hooks:
+ - id: editorconfig-checker
+ name: run editorconfig-checker
+ description: a tool to verify that your files are in harmony with your
.editorconfig
+ alias: ec
diff --git
a/integration-tests/jakarta-ee/src/main/webapp/WEB-INF/errorpages/invalidErrorPage.xhtml
b/integration-tests/jakarta-ee/src/main/webapp/WEB-INF/errorpages/invalidErrorPage.xhtml
index 3189266fb..2b2c439d0 100644
---
a/integration-tests/jakarta-ee/src/main/webapp/WEB-INF/errorpages/invalidErrorPage.xhtml
+++
b/integration-tests/jakarta-ee/src/main/webapp/WEB-INF/errorpages/invalidErrorPage.xhtml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
diff --git
a/samples/spring-boot-3-web/src/main/resources/templates/account-info.html
b/samples/spring-boot-3-web/src/main/resources/templates/account-info.html
index 601dcbf55..4470db0bc 100644
--- a/samples/spring-boot-3-web/src/main/resources/templates/account-info.html
+++ b/samples/spring-boot-3-web/src/main/resources/templates/account-info.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org";>
<head>
<title>Account Info</title>
diff --git
a/samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html
b/samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html
index fc90b38b6..9b9e2978b 100644
--- a/samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html
+++ b/samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org";>
<head th:fragment="head">
<meta charset="utf-8"/>
diff --git a/samples/spring-boot-3-web/src/main/resources/templates/hello.html
b/samples/spring-boot-3-web/src/main/resources/templates/hello.html
index 0d6c46528..87748fa54 100644
--- a/samples/spring-boot-3-web/src/main/resources/templates/hello.html
+++ b/samples/spring-boot-3-web/src/main/resources/templates/hello.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org";>
<head>
<title>Getting Started: Serving Web Content</title>
diff --git a/samples/spring-boot-3-web/src/main/resources/templates/login.html
b/samples/spring-boot-3-web/src/main/resources/templates/login.html
index fde30c743..8b0735b45 100644
--- a/samples/spring-boot-3-web/src/main/resources/templates/login.html
+++ b/samples/spring-boot-3-web/src/main/resources/templates/login.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE HTML>
<html>
<head>
<title>Getting Started: Serving Web Content</title>
diff --git
a/samples/spring-boot-web/src/main/resources/templates/account-info.html
b/samples/spring-boot-web/src/main/resources/templates/account-info.html
index a1cb61a99..069097c50 100644
--- a/samples/spring-boot-web/src/main/resources/templates/account-info.html
+++ b/samples/spring-boot-web/src/main/resources/templates/account-info.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org";>
<head>
<title>Account Info</title>
diff --git
a/samples/spring-boot-web/src/main/resources/templates/fragments/head.html
b/samples/spring-boot-web/src/main/resources/templates/fragments/head.html
index fc90b38b6..9b9e2978b 100644
--- a/samples/spring-boot-web/src/main/resources/templates/fragments/head.html
+++ b/samples/spring-boot-web/src/main/resources/templates/fragments/head.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org";>
<head th:fragment="head">
<meta charset="utf-8"/>
diff --git a/samples/spring-boot-web/src/main/resources/templates/hello.html
b/samples/spring-boot-web/src/main/resources/templates/hello.html
index 51fd21284..3097ff9e8 100644
--- a/samples/spring-boot-web/src/main/resources/templates/hello.html
+++ b/samples/spring-boot-web/src/main/resources/templates/hello.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE HTML>
<html xmlns:th="http://www.thymeleaf.org";>
<head>
<title>Getting Started: Serving Web Content</title>
diff --git a/samples/spring-boot-web/src/main/resources/templates/login.html
b/samples/spring-boot-web/src/main/resources/templates/login.html
index 44da6606d..44aab18ac 100644
--- a/samples/spring-boot-web/src/main/resources/templates/login.html
+++ b/samples/spring-boot-web/src/main/resources/templates/login.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -16,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<!DOCTYPE HTML>
<html>
<head>
<title>Getting Started: Serving Web Content</title>
diff --git a/shiro.doap.rdf b/shiro.doap.rdf
index e3dc50035..44b05dad8 100644
--- a/shiro.doap.rdf
+++ b/shiro.doap.rdf
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl"?>
<rdf:RDF xml:lang="en"
- xmlns="http://usefulinc.com/ns/doap#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:asfext="http://projects.apache.org/ns/asfext#";
- xmlns:foaf="http://xmlns.com/foaf/0.1/";>
+ xmlns="http://usefulinc.com/ns/doap#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:asfext="http://projects.apache.org/ns/asfext#";
+ xmlns:foaf="http://xmlns.com/foaf/0.1/";>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -13,7 +13,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -134,10 +134,10 @@
</release>
<repository>
- <GitRepository>
- <location rdf:resource="https://git.apache.org/shiro.git"/>
- <browse rdf:resource="https://git.apache.org/shiro.git"/>
- </GitRepository>
+ <GitRepository>
+ <location rdf:resource="https://git.apache.org/shiro.git"/>
+ <browse rdf:resource="https://git.apache.org/shiro.git"/>
+ </GitRepository>
</repository>
<maintainer>
<foaf:Person>
