Merge remote-tracking branch 'upstream/master'

Author: shagkur

.github/workflows/codeql-analysis.yml

@@ -27,17 +27,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '17', '21' ]
-    name: Java ${{ matrix.Java }} build
+        java: [ 11, 17, 21, 24 ]
+    name: Java ${{ matrix.java }} build
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK ${{ matrix.Java }}
+    - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v4
       with:
-        java-version: ${{ matrix.Java }}
+        java-version: ${{ matrix.java }}
         distribution: 'adopt'
-        server-id: ossrh
+        server-id: central
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
 
@@ -50,12 +50,12 @@ jobs:
           ${{ runner.os }}-maven-
 
     - name: Publish to the Maven Central Repository
-      run: mvn --batch-mode --update-snapshots deploy
-      if: matrix.Java == 11
+      run: mvn --batch-mode --update-snapshots -P release-snapshot deploy
+      if: matrix.java == 11
       env:
         MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
 
     - name: Maven Build
       run: mvn --batch-mode --update-snapshots install
-      if: matrix.Java != 11
+      if: matrix.java != 11

.github/workflows/maven.yml

@@ -3,6 +3,7 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.helger/ph-css/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.helger/ph-css) 
 [![javadoc](https://javadoc.io/badge2/com.helger/ph-css/javadoc.svg)](https://javadoc.io/doc/com.helger/ph-css)
 [![CodeCov](https://codecov.io/gh/phax/ph-css/branch/master/graph/badge.svg)](https://codecov.io/gh/phax/ph-css)
+[![libs.tech recommends](https://libs.tech/project/23304527/badge.svg)](https://libs.tech/project/23304527/ph-css)
 
 Java CSS 2 and CSS 3 parser and builder. This version supersedes phloc-css.
 The Maven plugin to compress CSS files at build time is located in sub-project ph-csscompress-maven-plugin and described further down.

README.md

@@ -167,6 +167,22 @@
           <doclint>none</doclint>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <configuration>
+          <strictCheck>true</strictCheck>
+          <encoding>${project.build.sourceEncoding}</encoding>
+          <licenseSets>
+            <licenseSet>
+              <header>src/etc/license-template.txt</header>
+              <excludes>
+                <exclude>src/test/resources/**/*utf16*.css</exclude>
+              </excludes>
+            </licenseSet>
+          </licenseSets>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

ph-css/pom.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+ * Copyright (C) 2014-2025 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

ph-css/src/main/jjtree/ParserCSS30.jjt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+ * Copyright (C) 2014-2025 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

ph-css/src/main/jjtree/ParserCSSCharsetDetector.jjt

@@ -1,5 +1,5 @@
 ====
-    Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2014-2025 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");

ph-css/src/test/resources/testfiles/css21/good/themes/a11y/README.txt

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+ * Copyright (C) 2014-2025 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

ph-css/src/test/resources/testfiles/css30/bad_but_browsercompliant/external/namespace/syntax-004.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+ * Copyright (C) 2014-2025 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

ph-css/src/test/resources/testfiles/css30/bad_but_browsercompliant/external/namespace/syntax-006.css

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+ * Copyright (C) 2014-2025 Philip Helger (www.helger.com)
  * philip[at]helger[dot]com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");