Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e2282d7

Browse files
andrezimmermannwhummer
andrezimmermann
authored and
whummer
committed
updates aws libraries and add missing apache.common.logging jar (localstack#729)
1 parent df75f79 commit e2282d7

File tree

2 files changed

+30
-45
lines changed

2 files changed

+30
-45
lines changed

‎localstack/ext/java/pom.xml

+20-42
Original file line numberDiff line numberDiff line change
@@ -53,45 +53,31 @@
5353
<artifactId>winp</artifactId>
5454
<version>1.23</version>
5555
</dependency>
56-
56+
<dependency>
57+
<groupId>org.projectlombok</groupId>
58+
<artifactId>lombok</artifactId>
59+
<version>1.16.12</version>
60+
</dependency>
5761
<dependency>
5862
<groupId>com.amazonaws</groupId>
5963
<artifactId>aws-java-sdk</artifactId>
60-
<version>1.11.125</version>
64+
<version>1.11.313</version>
6165
<scope>provided</scope>
6266
</dependency>
6367
<dependency>
6468
<groupId>com.amazonaws</groupId>
6569
<artifactId>aws-lambda-java-core</artifactId>
66-
<version>1.1.0</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.projectlombok</groupId>
70-
<artifactId>lombok</artifactId>
71-
<version>1.16.12</version>
70+
<version>1.2.0</version>
7271
</dependency>
7372
<dependency>
7473
<groupId>com.amazonaws</groupId>
7574
<artifactId>aws-lambda-java-events</artifactId>
76-
<version>1.3.0</version>
77-
<exclusions>
78-
<exclusion>
79-
<groupId>com.amazonaws</groupId>
80-
<artifactId>aws-java-sdk-s3</artifactId>
81-
</exclusion>
82-
<exclusion>
83-
<groupId>com.amazonaws</groupId>
84-
<artifactId>aws-java-sdk-sns</artifactId>
85-
</exclusion>
86-
<exclusion>
87-
<groupId>com.amazonaws</groupId>
88-
<artifactId>aws-java-sdk-kinesis</artifactId>
89-
</exclusion>
90-
<exclusion>
91-
<groupId>com.amazonaws</groupId>
92-
<artifactId>aws-java-sdk-dynamodb</artifactId>
93-
</exclusion>
94-
</exclusions>
75+
<version>2.1.0</version>
76+
</dependency>
77+
<dependency>
78+
<groupId>commons-logging</groupId>
79+
<artifactId>commons-logging</artifactId>
80+
<version>1.2</version>
9581
</dependency>
9682

9783
<!-- test dependencies -->
@@ -120,11 +106,11 @@
120106
<profile>
121107
<id>fatjar</id>
122108
<dependencies>
123-
<dependency>
124-
<groupId>com.amazonaws</groupId>
125-
<artifactId>aws-java-sdk</artifactId>
126-
<version>1.11.125</version>
127-
</dependency>
109+
<dependency>
110+
<groupId>com.amazonaws</groupId>
111+
<artifactId>aws-java-sdk</artifactId>
112+
<version>1.11.313</version>
113+
</dependency>
128114
</dependencies>
129115
</profile>
130116
</profiles>
@@ -152,7 +138,7 @@
152138
</execution>
153139
</executions>
154140
<configuration>
155-
<minimizeJar>true</minimizeJar>
141+
<minimizeJar>false</minimizeJar>
156142
<createDependencyReducedPom>false</createDependencyReducedPom>
157143
<shadedArtifactAttached>true</shadedArtifactAttached>
158144
<shadedClassifierName>fat</shadedClassifierName>
@@ -190,20 +176,12 @@
190176
</relocation>
191177
<relocation>
192178
<pattern>org.apache.commons</pattern>
193-
<shadedPattern>com.amazonaws.thirdparty.apache.codec</shadedPattern>
179+
<shadedPattern>com.amazonaws.thirdparty.apache.commons</shadedPattern>
194180
</relocation>
195181
<relocation>
196182
<pattern>software.amazon.ion</pattern>
197183
<shadedPattern>com.amazonaws.thirdparty.ion</shadedPattern>
198184
</relocation>
199-
<relocation>
200-
<pattern>org.apache.commons.logging</pattern>
201-
<shadedPattern>com.amazonaws.thirdparty.apache.logging</shadedPattern>
202-
</relocation>
203-
<relocation>
204-
<pattern>org.apache.commons.logging</pattern>
205-
<shadedPattern>com.amazonaws.thirdparty.apache.logging</shadedPattern>
206-
</relocation>
207185
</relocations>
208186
</configuration>
209187
</plugin>

‎localstack/ext/java/src/main/java/cloud/localstack/LambdaContext.java

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
11
package cloud.localstack;
22

3-
import java.util.logging.Level;
4-
import java.util.logging.Logger;
5-
63
import com.amazonaws.services.lambda.runtime.ClientContext;
74
import com.amazonaws.services.lambda.runtime.CognitoIdentity;
85
import com.amazonaws.services.lambda.runtime.Context;
96
import com.amazonaws.services.lambda.runtime.LambdaLogger;
107

8+
import java.util.logging.Level;
9+
import java.util.logging.Logger;
10+
1111
public class LambdaContext implements Context {
1212

1313
private final Logger LOG = Logger.getLogger(LambdaContext.class.getName());
1414

1515
public LambdaLogger getLogger() {
1616
return new LambdaLogger() {
17+
18+
@Override
1719
public void log(String msg) {
1820
LOG.log(Level.INFO, msg);
1921
}
22+
23+
@Override
24+
public void log(byte[] msg) {
25+
log(new String(msg));
26+
}
2027
};
2128
}
2229

0 commit comments

Comments
 (0)