Update project

vitalijr2 · Mar 2, 2025 · 62cd9a4 · 62cd9a4
1 parent 50a24fb
commit 62cd9a4
Show file tree

Hide file tree

Showing 19 changed files with 379 additions and 332 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 aws-lambda-slf4j
-Copyright 2022-2024 Vitalij Berdinskih
+Copyright (C) 2022 Vitalij Berdinskih
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -13,27 +13,6 @@ 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.
 
-This software uses slf4j, see license
-------------------------------------------------------------------------
-Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland)
-All rights reserved.
+=======================================================================
 
-Permission is hereby granted, free  of charge, to any person obtaining
-a  copy  of this  software  and  associated  documentation files  (the
-"Software"), to  deal in  the Software without  restriction, including
-without limitation  the rights to  use, copy, modify,  merge, publish,
-distribute,  sublicense, and/or sell  copies of  the Software,  and to
-permit persons to whom the Software  is furnished to do so, subject to
-the following conditions:
-
-The  above  copyright  notice  and  this permission  notice  shall  be
-included in all copies or substantial portions of the Software.
-
-THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
-EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
-MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------
+See THIRD-PARTY.txt for additional third party licenses used by this product.
diff --git a/THIRD-PARTY.txt b/THIRD-PARTY.txt
@@ -0,0 +1,6 @@
+
+Lists of 4 third-party dependencies.
+     (Apache License version 2.0) AWS Lambda Java Core Library (com.amazonaws:aws-lambda-java-core:1.2.3 - https://aws.amazon.com/lambda/)
+     (Apache License version 2.0) JetBrains Java Annotations (org.jetbrains:annotations:26.0.2 - https://github.com/JetBrains/java-annotations)
+     (Public Domain) JSON in Java (org.json:json:20250107 - https://github.com/douglascrockford/JSON-java)
+     (MIT License) SLF4J API Module (org.slf4j:slf4j-api:2.0.17 - http://www.slf4j.org)
diff --git a/core/pom.xml b/core/pom.xml
@@ -1,93 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-	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.
-	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.
--->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://maven.apache.org/POM/4.0.0"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <artifactId>aws-lambda-slf4j-core</artifactId>
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <groupId>org.jacoco</groupId>
       </plugin>
       <plugin>
         <artifactId>maven-failsafe-plugin</artifactId>
         <groupId>org.apache.maven.plugins</groupId>
       </plugin>
       <plugin>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <groupId>org.jacoco</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
       </plugin>
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <artifactId>annotations</artifactId>
-      <groupId>org.jetbrains</groupId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <artifactId>aws-lambda-java-core</artifactId>
       <groupId>com.amazonaws</groupId>
     </dependency>
     <dependency>
-      <artifactId>slf4j-api</artifactId>
-      <groupId>org.slf4j</groupId>
+      <artifactId>hamcrest</artifactId>
+      <groupId>org.hamcrest</groupId>
+    </dependency>
+    <dependency>
+      <artifactId>annotations</artifactId>
+      <groupId>org.jetbrains</groupId>
+      <scope>provided</scope>
     </dependency>
-    <!-- test -->
     <dependency>
       <artifactId>junit-jupiter-api</artifactId>
       <groupId>org.junit.jupiter</groupId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>junit-jupiter-engine</artifactId>
       <groupId>org.junit.jupiter</groupId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>junit-jupiter-params</artifactId>
       <groupId>org.junit.jupiter</groupId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>mockito-core</artifactId>
       <groupId>org.mockito</groupId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>mockito-junit-jupiter</artifactId>
       <groupId>org.mockito</groupId>
-      <scope>test</scope>
     </dependency>
     <dependency>
-      <artifactId>hamcrest</artifactId>
-      <groupId>org.hamcrest</groupId>
-      <scope>test</scope>
+      <artifactId>slf4j-api</artifactId>
+      <groupId>org.slf4j</groupId>
     </dependency>
     <dependency>
       <artifactId>system-stubs-core</artifactId>
       <groupId>uk.org.webcompere</groupId>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <artifactId>system-stubs-jupiter</artifactId>
       <groupId>uk.org.webcompere</groupId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <description>An SLF4J Logger implementation for AWS Lambda, core module</description>
@@ -96,6 +72,22 @@
   <parent>
     <artifactId>aws-lambda-slf4j</artifactId>
     <groupId>io.github.vitalijr2.logging</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
+  <profiles>
+    <profile>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>license-maven-plugin</artifactId>
+            <configuration>
+              <skipCheckLicense>false</skipCheckLicense>
+            </configuration>
+            <groupId>org.codehaus.mojo</groupId>
+          </plugin>
+        </plugins>
+      </build>
+      <id>prepare-and-check</id>
+    </profile>
+  </profiles>
 </project>
diff --git a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLogger.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLogger.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;
 

diff --git a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfiguration.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfiguration.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;
 

diff --git a/.../main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfigurationProperty.java b/.../main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfigurationProperty.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;
 

diff --git a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerFactory.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerFactory.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;
 

diff --git a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerLevel.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerLevel.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;
 

diff --git a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerOutput.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerOutput.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;
 

diff --git a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaServiceProvider.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaServiceProvider.java
@@ -1,17 +1,21 @@
-/*
- * Copyright 2022-2024 Vitalij Berdinskih
- *
+/*-
+ * ---------------LICENSE_START-----------------
+ * SLF4J for AWS Lambda
+ * ---------------------------------------------
+ * Copyright (C) 2022 - 2025 Vitalij Berdinskih
+ * ---------------------------------------------
  * 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
+ *      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.
+ * ---------------LICENSE_END-------------------
  */
 package io.github.vitalijr2.aws.lambda.slf4j;