diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 65691111..00000000 --- a/.github/stale.yml +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright (C) 2014-2021 Philip Helger (www.helger.com) -# philip[at]helger[dot]com -# -# Licensed under the Apache License, Version 2.0 (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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 90 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 7 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned - - security -# Label to use when marking an issue as stale -staleLabel: wontfix -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 570b9112..8297395b 100644 --- a/.github/workflows/maven.yml +++ b/.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') }} diff --git a/ph-css/pom.xml b/ph-css/pom.xml index dfd379d9..648aa70a 100644 --- a/ph-css/pom.xml +++ b/ph-css/pom.xml @@ -34,14 +34,14 @@ Apache 2 - http://www.apache.org/licenses/LICENSE-2.0 + https://www.apache.org/licenses/LICENSE-2.0 repo Philip Helger - http://www.helger.com + https://www.helger.com @@ -49,7 +49,7 @@ philip Philip Helger ph(at)helger.com - http://www.helger.com + https://www.helger.com diff --git a/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptor.java b/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptor.java index 74c7a4bd..300ca27e 100644 --- a/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptor.java +++ b/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptor.java @@ -98,7 +98,11 @@ public ICommonsList 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 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 (); } } diff --git a/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptorFlex.java b/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptorFlex.java index 518d7400..caabe037 100644 --- a/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptorFlex.java +++ b/ph-css/src/main/java/com/helger/css/decl/shorthand/CSSShortHandDescriptorFlex.java @@ -53,7 +53,7 @@ protected void modifyExpressionMembers (@Nonnull final ICommonsList 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 ()); } diff --git a/ph-css/src/main/java/com/helger/css/propertyvalue/CSSValueMultiValue.java b/ph-css/src/main/java/com/helger/css/propertyvalue/CSSValueMultiValue.java index 35ddb6f9..170da1ff 100644 --- a/ph-css/src/main/java/com/helger/css/propertyvalue/CSSValueMultiValue.java +++ b/ph-css/src/main/java/com/helger/css/propertyvalue/CSSValueMultiValue.java @@ -47,7 +47,9 @@ public class CSSValueMultiValue implements ICSSMultiValue { private final ICommonsList 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 getAllContainedValues () @Nonnull public ECSSProperty getProp () { - return m_aValues.getFirst ().getProp (); + return m_aValues.getFirstOrNull ().getProp (); } @Nonnull diff --git a/ph-csscompress-maven-plugin/findbugs-exclude.xml b/ph-csscompress-maven-plugin/findbugs-exclude.xml index db1acf8b..fdbbc4c8 100644 --- a/ph-csscompress-maven-plugin/findbugs-exclude.xml +++ b/ph-csscompress-maven-plugin/findbugs-exclude.xml @@ -1,6 +1,6 @@