Updated version headers

.github/workflows/maven.yml

@@ -25,20 +25,24 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [ '11', '17', '21' ]
+    name: Java ${{ matrix.Java }} build
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - name: Set up JDK ${{ matrix.Java }}
+      uses: actions/setup-java@v4
       with:
-        java-version: '11'
+        java-version: ${{ matrix.Java }}
         distribution: 'adopt'
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
 
     - name: Cache local Maven repository
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

ph-css/pom.xml

@@ -34,22 +34,22 @@
   <licenses>
     <license>
       <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
 
   <organization>
     <name>Philip Helger</name>
-    <url>http://www.helger.com</url>
+    <url>https://www.helger.com</url>
   </organization>
 
   <developers>
     <developer>
       <id>philip</id>
       <name>Philip Helger</name>
       <email>ph(at)helger.com</email>
-      <url>http://www.helger.com</url>
+      <url>https://www.helger.com</url>
     </developer>
   </developers>
 

ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptor.java

@@ -98,7 +98,11 @@ public ICommonsList <CSSDeclaration> getSplitIntoPieces (@Nonnull final CSSDecla
 
     // Check that declaration matches this property
     if (!aDeclaration.hasProperty (m_eProperty))
-      throw new IllegalArgumentException ("Cannot split a '" + aDeclaration.getProperty () + "' as a '" + m_eProperty.getName () + "'");
+      throw new IllegalArgumentException ("Cannot split a '" +
+                                          aDeclaration.getProperty () +
+                                          "' as a '" +
+                                          m_eProperty.getName () +
+                                          "'");
 
     // global
     final int nSubProperties = m_aSubProperties.size ();
@@ -174,6 +178,8 @@ public ICommonsList <CSSDeclaration> getSplitIntoPieces (@Nonnull final CSSDecla
   @Override
   public String toString ()
   {
-    return new ToStringGenerator (this).append ("property", m_eProperty).append ("subProperties", m_aSubProperties).getToString ();
+    return new ToStringGenerator (this).append ("property", m_eProperty)
+                                       .append ("subProperties", m_aSubProperties)
+                                       .getToString ();
   }
 }

ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptorFlex.java

@@ -53,7 +53,7 @@ protected void modifyExpressionMembers (@Nonnull final ICommonsList <ICSSExpress
       // assumed to be 0.
       // * one of the keywords: none, auto, or initial.
 
-      final ICSSExpressionMember aMember = aExpressionMembers.getFirst ();
+      final ICSSExpressionMember aMember = aExpressionMembers.getFirstOrNull ();
       final String sCSS = aMember.getAsCSSString ();
       if (CCSSValue.INITIAL.equals (sCSS))
       {

ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptorWithAlignment.java

@@ -46,7 +46,7 @@ protected void modifyExpressionMembers (@Nonnull final ICommonsList <ICSSExpress
     if (nSize == 1)
     {
       // 4px -> 4px 4px 4px 4px
-      final ICSSExpressionMember aMember = aExpressionMembers.getFirst ();
+      final ICSSExpressionMember aMember = aExpressionMembers.getFirstOrNull ();
       for (int i = 0; i < 3; ++i)
         aExpressionMembers.add (aMember.getClone ());
     }

ph-css/src/main/java/com/helger/css/propertyvalue/CSSValueMultiValue.java

@@ -47,7 +47,9 @@ public class CSSValueMultiValue implements ICSSMultiValue
 {
   private final ICommonsList <CSSValue> m_aValues = new CommonsArrayList <> ();
 
-  public CSSValueMultiValue (@Nonnull final ICSSProperty aProperty, @Nonnull @Nonempty final String [] aValues, final boolean bIsImportant)
+  public CSSValueMultiValue (@Nonnull final ICSSProperty aProperty,
+                             @Nonnull @Nonempty final String [] aValues,
+                             final boolean bIsImportant)
   {
     ValueEnforcer.notNull (aProperty, "Property");
     ValueEnforcer.notEmptyNoNullValue (aValues, "Values");
@@ -66,7 +68,7 @@ public ICommonsList <CSSValue> getAllContainedValues ()
   @Nonnull
   public ECSSProperty getProp ()
   {
-    return m_aValues.getFirst ().getProp ();
+    return m_aValues.getFirstOrNull ().getProp ();
   }
 
   @Nonnull

ph-csscompress-maven-plugin/findbugs-exclude.xml

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

ph-csscompress-maven-plugin/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2014-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,46 +35,41 @@
   <licenses>
     <license>
       <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
 
   <organization>
     <name>Philip Helger</name>
-    <url>http://www.helger.com</url>
+    <url>https://www.helger.com</url>
   </organization>
 
   <developers>
     <developer>
       <id>philip</id>
       <name>Philip Helger</name>
       <email>ph(at)helger.com</email>
-      <url>http://www.helger.com</url>
+      <url>https://www.helger.com</url>
     </developer>
   </developers>
 
   <properties>
-    <maven.version>3.1.0</maven.version>
+    <maven.core.version>3.8.3</maven.core.version>
+    <maven.annot.version>3.8.2</maven.annot.version>
   </properties>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${maven.version}</version>
+      <version>${maven.core.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${maven.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
-      <version>${maven.version}</version>
+      <version>${maven.core.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -135,7 +130,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.11.0</version>
       </plugin>
     </plugins>
   </reporting>

ph-csscompress-maven-plugin/src/etc/javadoc.css

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

ph-csscompress-maven-plugin/src/etc/license-template.txt

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

ph-csscompress-maven-plugin/src/main/java/com/helger/maven/csscompress/CSSCompressMojo.java

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

ph-csscompress-maven-plugin/src/main/resources/META-INF/m2e/lifecycle-mapping-metadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2014-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");

ph-csscompress-maven-plugin/src/test/java/com/helger/maven/csscompress/SPITest.java

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

pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2014-2023 Philip Helger (www.helger.com)
+    Copyright (C) 2014-2024 Philip Helger (www.helger.com)
     philip[at]helger[dot]com
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.helger</groupId>
     <artifactId>parent-pom</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
   </parent>
   <artifactId>ph-css-parent-pom</artifactId>
   <version>7.0.2-SNAPSHOT</version>
@@ -35,29 +35,29 @@
   <licenses>
     <license>
       <name>Apache 2</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
 
   <scm>
-    <connection>scm:git:git@github.com:phax/ph-css.git</connection>
-    <developerConnection>scm:git:git@github.com:phax/ph-css.git</developerConnection>
-    <url>http://github.com/phax/ph-css</url>
+    <connection>scm:git:https://github.com/phax/ph-css.git</connection>
+    <developerConnection>scm:git:https://github.com/phax/ph-css.git</developerConnection>
+    <url>https://github.com/phax/ph-css</url>
     <tag>HEAD</tag>
   </scm>
 
   <organization>
     <name>Philip Helger</name>
-    <url>http://www.helger.com</url>
+    <url>https://www.helger.com</url>
   </organization>
 
   <developers>
     <developer>
       <id>philip</id>
       <name>Philip Helger</name>
       <email>ph(at)helger.com</email>
-      <url>http://www.helger.com</url>
+      <url>https://www.helger.com</url>
     </developer>
   </developers>
 
@@ -66,7 +66,7 @@
       <dependency>
         <groupId>com.helger.commons</groupId>
         <artifactId>ph-commons-parent-pom</artifactId>
-        <version>11.1.0</version>
+        <version>11.1.5</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

src/etc/license-template.txt

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