diff --git a/.github/workflows/maven-build-all.yml b/.github/workflows/maven-build-all.yml index 66821eba..67c4a611 100644 --- a/.github/workflows/maven-build-all.yml +++ b/.github/workflows/maven-build-all.yml @@ -29,7 +29,5 @@ jobs: # Package modules that depend on base modules - name: Build events-sdk-transformer with Maven run: mvn -B package --file aws-lambda-java-events-sdk-transformer/pom.xml - - name: Build log4j with Maven - run: mvn -B package --file aws-lambda-java-log4j/pom.xml - name: Build log4j2 with Maven run: mvn -B package --file aws-lambda-java-log4j2/pom.xml diff --git a/README.md b/README.md index cbb2073a..af925de6 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ Check out the per-module release notes: - [aws-lambda-java-core](aws-lambda-java-core/RELEASE.CHANGELOG.md) - [aws-lambda-java-events](aws-lambda-java-events/RELEASE.CHANGELOG.md) - [aws-lambda-java-events-sdk-transformer](aws-lambda-java-events-sdk-transformer/RELEASE.CHANGELOG.md) -- [aws-lambda-java-log4j](aws-lambda-java-log4j/RELEASE.CHANGELOG.md) - [aws-lambda-java-log4j2](aws-lambda-java-log4j2/RELEASE.CHANGELOG.md) # Where to get packages @@ -42,11 +41,6 @@ ___ aws-lambda-java-events-sdk-transformer 2.0.0 - - com.amazonaws - aws-lambda-java-log4j - 1.0.1 - com.amazonaws aws-lambda-java-log4j2 @@ -60,7 +54,6 @@ ___ 'com.amazonaws:aws-lambda-java-core:1.2.1' 'com.amazonaws:aws-lambda-java-events:3.1.0' 'com.amazonaws:aws-lambda-java-events-sdk-transformer:2.0.0' -'com.amazonaws:aws-lambda-java-log4j:1.0.1' 'com.amazonaws:aws-lambda-java-log4j2:1.2.0' ``` @@ -70,7 +63,6 @@ ___ [com.amazonaws/aws-lambda-java-core "1.2.1"] [com.amazonaws/aws-lambda-java-events "3.1.0"] [com.amazonaws/aws-lambda-java-events-sdk-transformer "2.0.0"] -[com.amazonaws/aws-lambda-java-log4j "1.0.1"] [com.amazonaws/aws-lambda-java-log4j2 "1.2.0"] ``` @@ -80,7 +72,6 @@ ___ "com.amazonaws" % "aws-lambda-java-core" % "1.2.1" "com.amazonaws" % "aws-lambda-java-events" % "3.1.0" "com.amazonaws" % "aws-lambda-java-events-sdk-transformer" % "2.0.0" -"com.amazonaws" % "aws-lambda-java-log4j" % "1.0.1" "com.amazonaws" % "aws-lambda-java-log4j2" % "1.2.0" ``` @@ -103,9 +94,4 @@ See the [documentation](aws-lambda-java-events-sdk-transformer/README.md) for mo # Using aws-lambda-java-log4j2 This package defines the Lambda adapter to use with log4j version 2. -See the [documentation](aws-lambda-java-log4j2/README.md) for information on how to use the adapter. - -# Using aws-lambda-java-log4j (Not recommended) - -This package defines the Lambda adapter to use with log4j version 1. -See the [official documentation](http://docs.aws.amazon.com/lambda/latest/dg/java-logging.html#java-wt-logging-using-log4j) for information on how to use this adapter. +See the [README](aws-lambda-java-log4j2/README.md) or the [official documentation](http://docs.aws.amazon.com/lambda/latest/dg/java-logging.html#java-wt-logging-using-log4j) for information on how to use the adapter. diff --git a/aws-lambda-java-log4j/RELEASE.CHANGELOG.md b/aws-lambda-java-log4j/RELEASE.CHANGELOG.md deleted file mode 100644 index b009b21f..00000000 --- a/aws-lambda-java-log4j/RELEASE.CHANGELOG.md +++ /dev/null @@ -1,9 +0,0 @@ -### Apr 28, 2020 -`1.0.1`: -- Added missing XML namespace declarations to `pom.xml` file ([#97](https://github.com/aws/aws-lambda-java-libs/issues/97)) -- Updated `nexusUrl` in `pom.xml` file ([#108](https://github.com/aws/aws-lambda-java-libs/issues/108)) -- Updated `aws-lambda-java-core` to `1.2.1` - -### Oct 07, 2015 -`1.0.0`: -- Initial release of AWS Lambda Log4j support diff --git a/aws-lambda-java-log4j/pom.xml b/aws-lambda-java-log4j/pom.xml deleted file mode 100644 index 6b1a2b36..00000000 --- a/aws-lambda-java-log4j/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - 4.0.0 - - com.amazonaws - aws-lambda-java-log4j - 1.0.1 - jar - - AWS Lambda Java Log4j 1.2 Library - - Support for using log4j 1.2 with AWS Lambda. - - https://aws.amazon.com/lambda/ - - - Apache License, Version 2.0 - https://aws.amazon.com/apache2.0 - repo - - - - https://github.com/aws/aws-lambda-java-libs.git - - - - AWS Lambda team - Amazon Web Services - https://aws.amazon.com/ - - - - - 1.8 - 1.8 - - - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - com.amazonaws - aws-lambda-java-core - 1.2.1 - - - log4j - log4j - 1.2.17 - - - - - - dev - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - - - attach-javadocs - - jar - - - - - - - - - release - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - -Xdoclint:none - - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.5 - - - sign-artifacts - verify - - sign - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.3 - true - - sonatype-nexus-staging - https://aws.oss.sonatype.org/ - false - - - - - - - diff --git a/aws-lambda-java-log4j/src/main/java/com/amazonaws/services/lambda/runtime/log4j/LambdaAppender.java b/aws-lambda-java-log4j/src/main/java/com/amazonaws/services/lambda/runtime/log4j/LambdaAppender.java deleted file mode 100644 index 72b268cb..00000000 --- a/aws-lambda-java-log4j/src/main/java/com/amazonaws/services/lambda/runtime/log4j/LambdaAppender.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.amazonaws.services.lambda.runtime.log4j; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.spi.LoggingEvent; -import org.apache.log4j.Layout; - -import com.amazonaws.services.lambda.runtime.LambdaRuntime; -import com.amazonaws.services.lambda.runtime.LambdaRuntimeInternal; -import com.amazonaws.services.lambda.runtime.LambdaLogger; - -/** - * LambdaAppender is the custom log4j appender - * to be used in the log4j.properties file. - * You should not be required to use this class directly. - */ -public class LambdaAppender extends AppenderSkeleton { - - LambdaLogger logger = LambdaRuntime.getLogger(); - - public LambdaAppender() { - super(); - LambdaRuntimeInternal.setUseLog4jAppender(true); - } - - @Override - protected void append(LoggingEvent event) { - if(this.layout == null) { - logger.log(event.getLevel() + " " + event.getMessage()); - return; - } - logger.log(this.layout.format(event)); - //prints the Throwable from the log - if(layout.ignoresThrowable()) { - StringBuilder traceString = new StringBuilder(); - String[] s = event.getThrowableStrRep(); - if (s != null) { - int len = s.length; - for(int i = 0; i < len; i++) { - traceString.append(s[i]); - traceString.append(Layout.LINE_SEP); - } - } - logger.log(traceString.toString()); - } - } - - public void close() { - } - - public boolean requiresLayout() { - return true; - } -}