diff --git a/NOTICE b/NOTICE index 9d1a08b..1b62d8a 100644 --- 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 new file mode 100644 index 0000000..7002e5a --- /dev/null +++ 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 index 6d2e792..42fb836 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,19 +1,4 @@ - @@ -21,73 +6,64 @@ - maven-surefire-plugin - org.apache.maven.plugins + jacoco-maven-plugin + org.jacoco maven-failsafe-plugin org.apache.maven.plugins - jacoco-maven-plugin - org.jacoco + maven-surefire-plugin + org.apache.maven.plugins - - annotations - org.jetbrains - provided - aws-lambda-java-core com.amazonaws - slf4j-api - org.slf4j + hamcrest + org.hamcrest + + + annotations + org.jetbrains + provided - junit-jupiter-api org.junit.jupiter - test junit-jupiter-engine org.junit.jupiter - test junit-jupiter-params org.junit.jupiter - test mockito-core org.mockito - test mockito-junit-jupiter org.mockito - test - hamcrest - org.hamcrest - test + slf4j-api + org.slf4j system-stubs-core uk.org.webcompere - test system-stubs-jupiter uk.org.webcompere - test An SLF4J Logger implementation for AWS Lambda, core module @@ -96,6 +72,22 @@ aws-lambda-slf4j io.github.vitalijr2.logging - 1.2.1 + 1.2.2 + + + + + + license-maven-plugin + + false + + org.codehaus.mojo + + + + prepare-and-check + + 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 index cd84222..b9557bf 100644 --- 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 index b0afdad..8b78814 100644 --- 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/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfigurationProperty.java b/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfigurationProperty.java index ad7bd17..774cda2 100644 --- a/core/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/AWSLambdaLoggerConfigurationProperty.java +++ b/core/src/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 index 5deed81..36873b6 100644 --- 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 index 20c4bfc..b833f1f 100644 --- 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 index 22113b0..3b96d6f 100644 --- 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 index 0858e35..4c5fe56 100644 --- 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; diff --git a/json-logger/pom.xml b/json-logger/pom.xml index 87ea92c..20e67fe 100644 --- a/json-logger/pom.xml +++ b/json-logger/pom.xml @@ -1,84 +1,59 @@ - aws-lambda-slf4j-json-logger - - maven-surefire-plugin - org.apache.maven.plugins - jacoco-maven-plugin org.jacoco + + maven-surefire-plugin + org.apache.maven.plugins + - annotations - org.jetbrains - provided + aws-lambda-slf4j-core + io.github.vitalijr2.logging + 1.2.2 aws-lambda-java-core com.amazonaws - slf4j-api - org.slf4j - - - aws-lambda-slf4j-core - io.github.vitalijr2.logging - 1.2.1 + annotations + org.jetbrains + provided - json - org.json - 20250107 + hamcrest + org.hamcrest - junit-jupiter-api org.junit.jupiter - test junit-jupiter-engine org.junit.jupiter - test + + + json + org.json + 20250107 mockito-core org.mockito - test mockito-junit-jupiter org.mockito - test - - - hamcrest - org.hamcrest - test jsonassert @@ -86,6 +61,10 @@ test 1.5.1 + + slf4j-api + org.slf4j + An SLF4J Logger implementation for AWS Lambda, JSON Output 4.0.0 @@ -93,9 +72,23 @@ aws-lambda-slf4j io.github.vitalijr2.logging - 1.2.1 + 1.2.2 + + + + + license-maven-plugin + + false + + org.codehaus.mojo + + + + prepare-and-check + @@ -106,7 +99,7 @@ https://javadoc.io/doc/io.github.vitalijr2.logging/aws-lambda-slf4j-core/${project.version}/ - ${project.basedir}/../core/target/apidocs + ${project.basedir}/../core/target/reports/apidocs diff --git a/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/JSONLoggerOutput.java b/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/JSONLoggerOutput.java similarity index 93% rename from json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/JSONLoggerOutput.java rename to json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/JSONLoggerOutput.java index 440b746..4352a4b 100644 --- a/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/JSONLoggerOutput.java +++ b/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/JSONLoggerOutput.java @@ -1,19 +1,23 @@ -/* - * 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.logger; +package io.github.vitalijr2.aws.lambda.slf4j.json.logger; import static java.util.Objects.nonNull; diff --git a/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/package-info.java b/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/package-info.java similarity index 68% rename from json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/package-info.java rename to json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/package-info.java index 54fa8f4..6077fd6 100644 --- a/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/package-info.java +++ b/json-logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/package-info.java @@ -4,4 +4,4 @@ * @author Vitalij Berdinskih * @since 1.0.0 */ -package io.github.vitalijr2.aws.lambda.slf4j.logger; +package io.github.vitalijr2.aws.lambda.slf4j.json.logger; diff --git a/json-logger/src/main/resources/META-INF/services/io.github.vitalijr2.aws.lambda.slf4j.AWSLambdaLoggerOutput b/json-logger/src/main/resources/META-INF/services/io.github.vitalijr2.aws.lambda.slf4j.AWSLambdaLoggerOutput index 0cde75b..4324746 100644 --- a/json-logger/src/main/resources/META-INF/services/io.github.vitalijr2.aws.lambda.slf4j.AWSLambdaLoggerOutput +++ b/json-logger/src/main/resources/META-INF/services/io.github.vitalijr2.aws.lambda.slf4j.AWSLambdaLoggerOutput @@ -1 +1 @@ -io.github.vitalijr2.aws.lambda.slf4j.logger.JSONLoggerOutput \ No newline at end of file +io.github.vitalijr2.aws.lambda.slf4j.json.logger.JSONLoggerOutput \ No newline at end of file diff --git a/json-logger/src/test/java/io/github/vitalijr2/aws/lambda/slf4j/logger/JSONLoggerOutputTest.java b/json-logger/src/test/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/JSONLoggerOutputTest.java similarity index 99% rename from json-logger/src/test/java/io/github/vitalijr2/aws/lambda/slf4j/logger/JSONLoggerOutputTest.java rename to json-logger/src/test/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/JSONLoggerOutputTest.java index d8b500e..ebec93c 100644 --- a/json-logger/src/test/java/io/github/vitalijr2/aws/lambda/slf4j/logger/JSONLoggerOutputTest.java +++ b/json-logger/src/test/java/io/github/vitalijr2/aws/lambda/slf4j/json/logger/JSONLoggerOutputTest.java @@ -1,4 +1,4 @@ -package io.github.vitalijr2.aws.lambda.slf4j.logger; +package io.github.vitalijr2.aws.lambda.slf4j.json.logger; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; diff --git a/logger/pom.xml b/logger/pom.xml index 65393b0..33c9028 100644 --- a/logger/pom.xml +++ b/logger/pom.xml @@ -1,79 +1,58 @@ - aws-lambda-slf4j-logger - - maven-surefire-plugin - org.apache.maven.plugins - jacoco-maven-plugin org.jacoco + + maven-surefire-plugin + org.apache.maven.plugins + - annotations - org.jetbrains - provided + aws-lambda-slf4j-core + io.github.vitalijr2.logging + 1.2.2 aws-lambda-java-core com.amazonaws - slf4j-api - org.slf4j + annotations + org.jetbrains + provided - aws-lambda-slf4j-core - io.github.vitalijr2.logging - 1.2.1 + hamcrest + org.hamcrest - junit-jupiter-api org.junit.jupiter - test junit-jupiter-engine org.junit.jupiter - test mockito-core org.mockito - test mockito-junit-jupiter org.mockito - test - hamcrest - org.hamcrest - test + slf4j-api + org.slf4j An SLF4J Logger implementation for AWS Lambda @@ -82,9 +61,23 @@ aws-lambda-slf4j io.github.vitalijr2.logging - 1.2.1 + 1.2.2 + + + + + license-maven-plugin + + false + + org.codehaus.mojo + + + + prepare-and-check + @@ -95,7 +88,7 @@ https://javadoc.io/doc/io.github.vitalijr2.logging/aws-lambda-slf4j-core/${project.version}/ - ${project.basedir}/../core/target/apidocs + ${project.basedir}/../core/target/reports/apidocs diff --git a/logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/LambdaLoggerOutput.java b/logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/LambdaLoggerOutput.java index 08bdc63..ec7fa55 100644 --- a/logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/LambdaLoggerOutput.java +++ b/logger/src/main/java/io/github/vitalijr2/aws/lambda/slf4j/logger/LambdaLoggerOutput.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.logger; diff --git a/pom.xml b/pom.xml index 52d2eed..c7aa25d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,19 +1,4 @@ - @@ -23,9 +8,9 @@ - maven-clean-plugin - org.apache.maven.plugins - 3.4.0 + central-publishing-maven-plugin + org.sonatype.central + 0.7.0 flatten-maven-plugin @@ -49,82 +34,7 @@ org.codehaus.mojo - 1.6.0 - - - templating-maven-plugin - - - - filter-sources - - filter-sources - - - org.codehaus.mojo - 3.0.0 - - - maven-resources-plugin - - ISO-8859-1 - - org.apache.maven.plugins - 3.3.1 - - - maven-compiler-plugin - - ${java.version} - - org.apache.maven.plugins - 3.13.0 - - - maven-surefire-plugin - - - fast - - - org.apache.maven.plugins - 3.5.2 - - - maven-jar-plugin - - - - ${java.vm.version} (${java.vm.vendor}) - ${project.name} - - - - org.apache.maven.plugins - 3.4.2 - - - maven-failsafe-plugin - - 1 - - **/*Test.java - - - slow - - false - - - - - integration-test - verify - - - - org.apache.maven.plugins - 3.5.2 + 1.7.0 jacoco-maven-plugin @@ -200,17 +110,56 @@ 0.8.12 - maven-source-plugin + maven-clean-plugin + org.apache.maven.plugins + 3.4.1 + + + maven-compiler-plugin + + ${java.version} + true + ${java.version} + ${java.version} + + org.apache.maven.plugins + 3.14.0 + + + maven-failsafe-plugin + + 1 + + **/*Test.java + + + slow + + false + - jar + integration-test + verify - attach-sources org.apache.maven.plugins - 3.3.1 + 3.5.2 + + + maven-jar-plugin + + + + ${java.vm.version} (${java.vm.vendor}) + ${project.name} + + + + org.apache.maven.plugins + 3.4.2 maven-javadoc-plugin @@ -238,37 +187,41 @@ ]]> - - - - aggregate-jar - - attach-javadocs - - org.apache.maven.plugins ${javadoc-plugin.version} - sign-maven-plugin - - - - sign - - - - org.simplify4u.plugins - 1.1.0 + maven-resources-plugin + + ISO-8859-1 + + org.apache.maven.plugins + 3.3.1 - central-publishing-maven-plugin + maven-source-plugin + org.apache.maven.plugins + 3.3.1 + + + maven-surefire-plugin - central + + fast + - true - org.sonatype.central - 0.7.0 + org.apache.maven.plugins + 3.5.2 + + + semver-maven-plugin + io.github.q3769 + 20240116.0.202411140438 + + + sign-maven-plugin + org.simplify4u.plugins + 1.1.0 @@ -278,7 +231,7 @@ - [11,) + [${java.version},) [3.9.0,) @@ -309,14 +262,12 @@ + + GitHub Actions + https://github.com/vitalijr2/aws-lambda-slf4j/actions + - - annotations - org.jetbrains - provided - 26.0.2 - aws-lambda-java-core com.amazonaws @@ -325,31 +276,37 @@ aws-lambda-java-events com.amazonaws - 3.14.0 + 3.15.0 - slf4j-api - org.slf4j - ${slf4j.version} + annotations + org.jetbrains + provided + 26.0.2 + + + hamcrest + org.hamcrest + test + 3.0 - junit-jupiter-api org.junit.jupiter test - ${junit-jupiter.version} + ${junit.version} junit-jupiter-engine org.junit.jupiter test - ${junit-jupiter.version} + ${junit.version} junit-jupiter-params org.junit.jupiter test - ${junit-jupiter.version} + ${junit.version} mockito-core @@ -364,10 +321,9 @@ ${mockito.version} - hamcrest - org.hamcrest - test - 3.0 + slf4j-api + org.slf4j + ${slf4j.version} system-stubs-core @@ -395,11 +351,15 @@ io.github.vitalijr2.logging 2022 + + GitHub Issues + https://github.com/vitalijr2/aws-lambda-slf4j/issues + See NOTICE for third-party licenses. repo - Apache 2 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt @@ -412,26 +372,110 @@ SLF4J for AWS Lambda pom + + + + + + license-maven-plugin + + + + false + true + io\.github\.vitalijr2\.logging + test + + **/package-info.java + + ${project.inceptionYear} + + + Apache License version 2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0 + MIT License|MIT + + apache_v2 + + Vitalij Berdinskih + ${project.basedir} + ---------------LICENSE_END------------------- + ---------------LICENSE_START----------------- + SLF4J for AWS Lambda + + src/main/java + + --------------------------------------------- + + true + + default-cli + + + org.codehaus.mojo + 2.5.0 + + + + + + license-maven-plugin + + true + + org.codehaus.mojo + + + + prepare-and-check + clean deploy + + central-publishing-maven-plugin + + true + central + + true + org.sonatype.central + maven-javadoc-plugin + + + + jar + + attach-javadocs + + org.apache.maven.plugins maven-source-plugin + + + + jar + + attach-sources + + org.apache.maven.plugins sign-maven-plugin + + + + sign + + + org.simplify4u.plugins - - central-publishing-maven-plugin - org.sonatype.central - release @@ -440,10 +484,10 @@ 11 3.11.2 - 5.11.4 + 5.12.0 5.15.2 UTF-8 - 2.0.16 + 2.0.17 2.1.7 @@ -452,5 +496,5 @@ https://github.com/vitalijr2/aws-lambda-slf4j https://github.com/vitalijr2/aws-lambda-slf4j - 1.2.1 + 1.2.2 diff --git a/readme.md b/readme.md index d31283a..a668547 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ An [SLF4J][] Logger implementation for [AWS Lambda][lambda] and [CloudWatch][cloudwatch]. [![Java Version][java-version]][jdk-download] -[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0.html) +[![License][license-badge]][license-link] [![GitHub master check runs][github-master-check-runs]][github-master-check-runs-link] [![Codacy Badge][codacy-badge]][codacy-badge-link] [![Codacy Coverage][codacy-coverage]][codacy-coverage-link] @@ -18,17 +18,21 @@ and [CloudWatch][cloudwatch]. ## Table of Contents + * [Getting started](#getting-started) - * [Usage](#usage) - * [Configuration](#configuration) - * [Setup a provider by a system property](#setup-a-provider-by-a-system-property) +* [Usage](#usage) +* [Configuration](#configuration) +* [Setup a provider by a system property](#setup-a-provider-by-a-system-property) * [Other solutions](#other-solutions) * [Contributing](#contributing) * [History](#history) * [Authors and acknowledgment](#authors-and-acknowledgment) * [License](#license) -Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc) + + + + ## Getting started @@ -214,21 +218,23 @@ See [Changelog](changelog.md) ## License -Copyright 2022-2024 Vitalij Berdinskih +```text +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. You may obtain a copy of the License at -[http://www.apache.org/licenses/LICENSE-2.0][license] + https://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. +``` -[Apache License v2.0](LICENSE) +See full text [here](LICENSE "the LICENSE file"). [SLF4J]: https://www.slf4j.org/ @@ -282,4 +288,6 @@ limitations under the License. [cloudwatchlogs-java-appender]: https://github.com/boxfuse/cloudwatchlogs-java-appender -[license]: http://www.apache.org/licenses/LICENSE-2.0 "Apache License, Version 2.0" +[license-badge]: https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat + +[license-link]: https://www.apache.org/licenses/LICENSE-2.0.html