Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #65

Merged
merged 28 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ff51bba
Bump junit-jupiter.version from 5.10.3 to 5.11.0 (#45)
dependabot[bot] Aug 17, 2024
72a32f2
Improve the logger output test
vitalijr2 Aug 17, 2024
6363c86
Improve the logger output test
vitalijr2 Aug 17, 2024
5722fa8
Update workflows
vitalijr2 Aug 20, 2024
9aa7803
Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.3.1 to 3.5…
dependabot[bot] Sep 4, 2024
627ee54
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.3.1 to 3.5…
dependabot[bot] Sep 4, 2024
ff5b33a
Bump mockito.version from 5.12.0 to 5.13.0 (#50)
dependabot[bot] Sep 4, 2024
6b00dae
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.8.0 to 3.10…
dependabot[bot] Sep 4, 2024
11ecb34
Bump com.amazonaws:aws-lambda-java-events from 3.13.0 to 3.14.0
dependabot[bot] Sep 22, 2024
5ac0f02
Merge pull request #52 from vitalijr2/dependabot/maven/development/co…
vitalijr2 Sep 23, 2024
b0cf582
Bump mockito.version from 5.13.0 to 5.14.0
dependabot[bot] Sep 29, 2024
da33bb1
Bump system-stubs.version from 2.1.6 to 2.1.7
dependabot[bot] Sep 29, 2024
379c661
Bump org.sonatype.central:central-publishing-maven-plugin
dependabot[bot] Sep 29, 2024
c321899
Bump org.jetbrains:annotations from 24.1.0 to 26.0.1
dependabot[bot] Oct 20, 2024
40bde27
Merge pull request #59 from vitalijr2/dependabot/maven/development/or…
vitalijr2 Oct 21, 2024
0fbd2e9
Merge pull request #55 from vitalijr2/dependabot/maven/development/sy…
vitalijr2 Oct 21, 2024
a126d95
Merge pull request #53 from vitalijr2/dependabot/maven/development/mo…
vitalijr2 Oct 21, 2024
a1da726
Merge pull request #57 from vitalijr2/dependabot/maven/development/or…
vitalijr2 Oct 21, 2024
68460f2
Bump mockito.version from 5.14.0 to 5.14.2
dependabot[bot] Oct 21, 2024
4f36d0c
Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.0 to 3.10.1
dependabot[bot] Oct 21, 2024
fe0dd7c
Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.1
dependabot[bot] Oct 21, 2024
d8f1062
Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.0 to 3.5.1
dependabot[bot] Oct 21, 2024
5eb25a4
Merge pull request #64 from vitalijr2/dependabot/maven/development/or…
vitalijr2 Oct 21, 2024
6fff2b2
Merge pull request #62 from vitalijr2/dependabot/maven/development/or…
vitalijr2 Oct 21, 2024
02e5ba4
Merge pull request #61 from vitalijr2/dependabot/maven/development/mo…
vitalijr2 Oct 21, 2024
a1943a8
Bump junit-jupiter.version from 5.11.0 to 5.11.3
dependabot[bot] Oct 21, 2024
bc35b1a
Merge pull request #63 from vitalijr2/dependabot/maven/development/or…
vitalijr2 Oct 21, 2024
c34cd86
Merge pull request #60 from vitalijr2/dependabot/maven/development/ju…
vitalijr2 Oct 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,21 @@ on:
# The branches below must be a subset of the branches above
branches: [ "**" ]

permissions: read-all

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
timeout-minutes: 15
permissions:
actions: read
contents: read
security-events: write
strategy:
fail-fast: false
matrix:
language: [ 'java' ]
include:
- language: java-kotlin
build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -32,8 +34,7 @@ jobs:
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
- name: Autobuild
uses: github/codeql-action/autobuild@v3
build-mode: ${{ matrix.build-mode }}
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/sonatype.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ on:
release:
types: [ created ]

permissions: read-all

jobs:
publish:
name: Publish to Maven Central
runs-on: ubuntu-latest
timeout-minutes: 15
permissions:
actions: read
contents: read
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,34 @@
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.verify;

import org.example.ServiceProvider;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.slf4j.event.Level;

@ExtendWith(MockitoExtension.class)
@Tag("slow")
class AWSLambdaLoggerFactoryTest {

@Mock
private AWSLambdaLoggerConfiguration configuration;

@DisplayName("Custom output service provider")
@Test
void customOutputServiceProvider() {
// when
var serviceProvider = (ServiceProvider) assertDoesNotThrow(
var loggerOutput = assertDoesNotThrow(
() -> AWSLambdaLoggerFactory.getOutputServiceProvider(ServiceProvider.class));
var message = serviceProvider.hello();
loggerOutput.log(configuration, null, Level.TRACE, "test message", null);

// then
assertEquals("hello world", message);
verify(configuration).isLevelEnabled(Level.TRACE);
}

@DisplayName("No output service providers")
Expand Down
4 changes: 3 additions & 1 deletion core/src/test/java/org/example/ServiceProvider.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package org.example;

import io.github.vitalijr2.aws.lambda.slf4j.AWSLambdaLoggerConfiguration;
import io.github.vitalijr2.aws.lambda.slf4j.AWSLambdaLoggerOutput;
import org.slf4j.event.Level;

public interface ServiceProvider extends AWSLambdaLoggerOutput {

String hello();
void hello(AWSLambdaLoggerConfiguration configuration, Level level);

}
6 changes: 3 additions & 3 deletions core/src/test/java/org/example/TestServiceProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
public class TestServiceProvider implements ServiceProvider {

@Override
public String hello() {
return "hello world";
public void hello(AWSLambdaLoggerConfiguration configuration, Level level) {
configuration.isLevelEnabled(level);
}

@Override
public void log(@NotNull AWSLambdaLoggerConfiguration configuration, @Nullable Marker marker,
@NotNull Level level, @NotNull String message, @Nullable Throwable throwable) {
hello();
hello(configuration, level);
}

}
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</properties>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3.1</version>
<version>3.5.1</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -124,7 +124,7 @@
</execution>
</executions>
<groupId>org.apache.maven.plugins</groupId>
<version>3.3.1</version>
<version>3.5.1</version>
</plugin>
<plugin>
<artifactId>jacoco-maven-plugin</artifactId>
Expand Down Expand Up @@ -268,7 +268,7 @@
</configuration>
<extensions>true</extensions>
<groupId>org.sonatype.central</groupId>
<version>0.5.0</version>
<version>0.6.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -315,7 +315,7 @@
<artifactId>annotations</artifactId>
<groupId>org.jetbrains</groupId>
<scope>provided</scope>
<version>24.1.0</version>
<version>26.0.1</version>
</dependency>
<dependency>
<artifactId>aws-lambda-java-core</artifactId>
Expand All @@ -325,7 +325,7 @@
<dependency>
<artifactId>aws-lambda-java-events</artifactId>
<groupId>com.amazonaws</groupId>
<version>3.13.0</version>
<version>3.14.0</version>
</dependency>
<dependency>
<artifactId>slf4j-api</artifactId>
Expand Down Expand Up @@ -439,12 +439,12 @@
</profiles>
<properties>
<java.version>11</java.version>
<javadoc-plugin.version>3.8.0</javadoc-plugin.version>
<junit-jupiter.version>5.10.3</junit-jupiter.version>
<mockito.version>5.12.0</mockito.version>
<javadoc-plugin.version>3.10.1</javadoc-plugin.version>
<junit-jupiter.version>5.11.3</junit-jupiter.version>
<mockito.version>5.14.2</mockito.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>2.0.16</slf4j.version>
<system-stubs.version>2.1.6</system-stubs.version>
<system-stubs.version>2.1.7</system-stubs.version>
</properties>
<scm>
<connection>scm:git:https://github.com/vitalijr2/aws-lambda-slf4j.git</connection>
Expand Down
Loading