Update site, dependencies, breaking change in SLF4J 2.0.10

core: replace Util.report with Reporter.warn, was changed in SLF4J 2.0.10

Author: vitalijr2

.github/workflows/codeql.yml

@@ -28,14 +28,14 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"

.gitlab-ci.yml

@@ -18,6 +18,7 @@ stages:
   - test
   - verify
   - release
+  - deploy
 
 build:
   stage: build
@@ -44,6 +45,10 @@ sast:
   variables:
     SAST_EXCLUDED_PATHS: jacoco-resources,prism.js
 
+semgrep-sast:
+  rules:
+    - if: $CI_COMMIT_TAG == null
+
 coverage:
   stage: verify
   script:
@@ -59,20 +64,29 @@ codacy:
   rules:
     - if: $CODACY_PROJECT_TOKEN && $CI_COMMIT_TAG == null
 
-deploy:
+release:
   stage: release
   script:
-    - ./mvnw $MAVEN_CLI_OPTS -s ci_settings.xml -pl core,logger,json-logger,. -am deploy -ntp -Dchangelist= -Psources,javadocs,sign-and-deploy
-  only:
-    - tags
+    - ./mvnw $MAVEN_CLI_OPTS -s ci_settings.xml -pl core,logger,json-logger,. -am -ntp -DskipTests -Dchangelist= -Pjavadocs,release
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_DEFAULT_BRANCH != $CI_COMMIT_BRANCH
+      when: never
+  cache:
+    paths:
+      - target
 
 pages:
-  stage: release
+  stage: deploy
   script:
     - cp changelog.md src/site/markdown
-    - ./mvnw $MAVEN_CLI_OPTS -pl . verify site site:stage -Dchangelist= -Pjavadocs,site
+    - cp contributing.md src/site/markdown
+    - ./mvnw javadoc:aggregate -Dchangelist= -Pjavadocs
+    - ./mvnw $MAVEN_CLI_OPTS -pl . -Dchangelist= -Psite
   artifacts:
     paths:
       - public
-  only:
-    - tags
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: $CI_DEFAULT_BRANCH != $CI_COMMIT_BRANCH
+      when: never

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

NOTICE

@@ -1,5 +1,5 @@
 slf4j-aws-lambda
-Copyright 2022-2023 Vitalij Berdinskih
+Copyright 2022-2024 Vitalij Berdinskih
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

changelog.md

@@ -1,9 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+### Changed
+- Update dependencies
+- Updage site
+- **core:** replace `Util.report` with `Reporter.warn`, was changed in SLF4J 2.0.10
+
 ## 1.0.2 - 2023-10-16
 ### Changed
 - Update dependencies

core/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Copyright 2022-2023 Vitalij Berdinskih
+	Copyright 2022-2024 Vitalij Berdinskih
 
 	Licensed under the Apache License, Version 2.0 (the "License");
 	you may not use this file except in compliance with the License.
@@ -24,17 +24,6 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <groupId>org.apache.maven.plugins</groupId>
       </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Automatic-Module-Name>org.slf4j.aws_lambda.core</Automatic-Module-Name>
-            </manifestEntries>
-          </archive>
-        </configuration>
-        <groupId>org.apache.maven.plugins</groupId>
-      </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
         <groupId>org.apache.maven.plugins</groupId>

core/src/main/java/uk/bot_by/aws_lambda/slf4j/AWSLambdaLogger.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Vitalij Berdinskih
+ * Copyright 2022-2024 Vitalij Berdinskih
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public class AWSLambdaLogger implements Logger, Serializable {
   private final AWSLambdaLoggerConfiguration configuration;
   private final AWSLambdaLoggerOutput output;
 
-  public AWSLambdaLogger(@NotNull AWSLambdaLoggerConfiguration configuration,
+  AWSLambdaLogger(@NotNull AWSLambdaLoggerConfiguration configuration,
       @NotNull AWSLambdaLoggerOutput output) {
     this.configuration = configuration;
     this.output = output;

core/src/main/java/uk/bot_by/aws_lambda/slf4j/AWSLambdaLoggerConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Vitalij Berdinskih
+ * Copyright 2022-2024 Vitalij Berdinskih
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

core/src/main/java/uk/bot_by/aws_lambda/slf4j/AWSLambdaLoggerConfigurationProperty.java

@@ -93,8 +93,17 @@ public enum AWSLambdaLoggerConfigurationProperty {
    */
   ShowThreadName("showThreadName", "LOG_SHOW_THREAD_NAME", "false");
 
+  /**
+   * Default value of the property.
+   */
   public final String defaultValue;
+  /**
+   * Property name.
+   */
   public final String propertyName;
+  /**
+   * Environment variable name.
+   */
   public final String variableName;
 
   AWSLambdaLoggerConfigurationProperty(String propertyName, String variableName,

core/src/main/java/uk/bot_by/aws_lambda/slf4j/AWSLambdaLoggerFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022-2023 Vitalij Berdinskih
+ * Copyright 2022-2024 Vitalij Berdinskih
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.event.Level;
-import org.slf4j.helpers.Util;
+import org.slf4j.helpers.Reporter;
 
 /**
  * Responsible for building {@link Logger} using the {@link AWSLambdaLogger} implementation.
@@ -126,6 +126,11 @@ public class AWSLambdaLoggerFactory implements ILoggerFactory {
   private final boolean showThreadId;
   private final boolean showThreadName;
 
+  /**
+   * AWS Lambda Logger Factory.
+   * <p>
+   * Looking for a configuration file <em>lambda-logger.properties</em>.
+   */
   public AWSLambdaLoggerFactory() {
     this(CONFIGURATION_FILE);
   }
@@ -134,12 +139,11 @@ public AWSLambdaLoggerFactory() {
   AWSLambdaLoggerFactory(String configurationFile) {
     loggers = new ConcurrentHashMap<>();
     properties = loadProperties(configurationFile);
-    dateTimeFormat = getDateTimeFormat(AWSLambdaLoggerConfigurationProperty.DateTimeFormat);
+    dateTimeFormat = getDateTimeFormat();
     // logLevelSeparator and markerSeparator should be resolved before defaultLoggerLevel
     logLevelSeparator = getStringProperty(AWSLambdaLoggerConfigurationProperty.LogLevelSeparator);
     markerSeparator = getStringProperty(AWSLambdaLoggerConfigurationProperty.MarkerSeparator);
-    defaultLoggerLevel = getLoggerLevelProperty(
-        AWSLambdaLoggerConfigurationProperty.DefaultLogLevel);
+    defaultLoggerLevel = getLoggerLevelProperty();
     levelInBrackets = getBooleanProperty(AWSLambdaLoggerConfigurationProperty.LevelInBrackets);
     requestId = getStringProperty(AWSLambdaLoggerConfigurationProperty.RequestId);
     showDateTime = getBooleanProperty(AWSLambdaLoggerConfigurationProperty.ShowDateTime);
@@ -192,46 +196,47 @@ private boolean getBooleanProperty(AWSLambdaLoggerConfigurationProperty configur
     return Boolean.parseBoolean(getStringProperty(configurationProperty));
   }
 
-  private DateFormat getDateTimeFormat(AWSLambdaLoggerConfigurationProperty configurationProperty) {
-    String dateTimeFormatString = getStringProperty(configurationProperty);
+  private DateFormat getDateTimeFormat() {
+    var dateTimeFormatString = getStringProperty(
+        AWSLambdaLoggerConfigurationProperty.DateTimeFormat);
 
     if (nonNull(dateTimeFormatString)) {
       try {
         return new SimpleDateFormat(dateTimeFormatString);
       } catch (IllegalArgumentException exception) {
-        Util.report("Bad date format in " + CONFIGURATION_FILE + "; will output relative time",
-            exception);
+        Reporter.warn(
+            "Bad date-time format in " + CONFIGURATION_FILE + "; will output relative time");
       }
     }
 
     return null;
   }
 
-  private List<AWSLambdaLoggerLevel> getLoggerLevelProperty(
-      AWSLambdaLoggerConfigurationProperty configurationProperty) {
-    String value = System.getenv(configurationProperty.variableName);
+  private List<AWSLambdaLoggerLevel> getLoggerLevelProperty() {
+    var defaultLogLevelProperty = AWSLambdaLoggerConfigurationProperty.DefaultLogLevel;
+    var value = System.getenv(defaultLogLevelProperty.variableName);
 
     if (nonNull(value)) {
       try {
         return parseLoggerLevelString(value);
       } catch (IllegalArgumentException exception) {
-        Util.report("Bad log level in the variable " + configurationProperty.variableName,
-            exception);
+        Reporter.warn("Bad log level in the variable " + defaultLogLevelProperty.variableName);
       }
     }
 
-    value = getProperties().getProperty(configurationProperty.propertyName);
+    value = getProperties().getProperty(defaultLogLevelProperty.propertyName);
     if (nonNull(value)) {
       try {
         return parseLoggerLevelString(value);
       } catch (IllegalArgumentException exception) {
-        Util.report("Bad log level in the property " + configurationProperty.propertyName + " of "
-            + CONFIGURATION_FILE, exception);
+        Reporter.warn(
+            "Bad log level in the property " + defaultLogLevelProperty.propertyName + " of "
+                + CONFIGURATION_FILE);
       }
     }
 
     return List.of(
-        AWSLambdaLoggerLevel.builder().level(Level.valueOf(configurationProperty.defaultValue))
+        AWSLambdaLoggerLevel.builder().level(Level.valueOf(defaultLogLevelProperty.defaultValue))
             .build());
   }
 
@@ -252,7 +257,7 @@ private List<AWSLambdaLoggerLevel> getLoggerLevels(String loggerName) {
       try {
         loggerLevels = parseLoggerLevelString(loggerLevelString);
       } catch (IllegalArgumentException exception) {
-        Util.report("Bad log level of the logger " + loggerName, exception);
+        Reporter.warn("Bad log level of the logger " + loggerName);
       }
     }
 
@@ -304,7 +309,7 @@ private Properties loadProperties(String configurationFile) {
       properties.load(configurationInputStream);
     } catch (IOException | NullPointerException e) {
       // ignored
-      Util.report(CONFIGURATION_FILE + " is missed");
+      Reporter.warn(CONFIGURATION_FILE + " is missed");
     }
 
     return properties;