Skip to content

Commit

Permalink
Bump the prod-deps group across 1 directory with 8 updates (#1389)
Browse files Browse the repository at this point in the history
* Bump the prod-deps group across 1 directory with 8 updates

Bumps the prod-deps group with 8 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| org.slf4j:slf4j-api | `2.0.12` | `2.0.13` |
| org.slf4j:jul-to-slf4j | `2.0.12` | `2.0.13` |
| org.slf4j:jcl-over-slf4j | `2.0.12` | `2.0.13` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.4` | `1.5.6` |
| [com.graphql-java:graphql-java](https://github.com/graphql-java/graphql-java) | `21.5` | `22.0` |
| [com.graphql-java:graphql-java-extended-scalars](https://github.com/graphql-java/graphql-java-extended-scalars) | `21.0` | `22.0` |
| [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) | `3.3.0` | `3.4.1` |
| io.swagger.codegen.v3:swagger-codegen-maven-plugin | `3.0.54` | `3.0.55` |



Updates `org.slf4j:slf4j-api` from 2.0.12 to 2.0.13

Updates `org.slf4j:jul-to-slf4j` from 2.0.12 to 2.0.13

Updates `org.slf4j:jcl-over-slf4j` from 2.0.12 to 2.0.13

Updates `org.slf4j:jul-to-slf4j` from 2.0.12 to 2.0.13

Updates `org.slf4j:jcl-over-slf4j` from 2.0.12 to 2.0.13

Updates `ch.qos.logback:logback-classic` from 1.5.4 to 1.5.6
- [Commits](qos-ch/logback@v_1.5.4...v_1.5.6)

Updates `com.graphql-java:graphql-java` from 21.5 to 22.0
- [Release notes](https://github.com/graphql-java/graphql-java/releases)
- [Commits](graphql-java/graphql-java@v21.5...v22.0)

Updates `com.graphql-java:graphql-java-extended-scalars` from 21.0 to 22.0
- [Release notes](https://github.com/graphql-java/graphql-java-extended-scalars/releases)
- [Commits](graphql-java/graphql-java-extended-scalars@v21.0...v22.0)

Updates `org.apache.maven.plugins:maven-jar-plugin` from 3.3.0 to 3.4.1
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](apache/maven-jar-plugin@maven-jar-plugin-3.3.0...maven-jar-plugin-3.4.1)

Updates `io.swagger.codegen.v3:swagger-codegen-maven-plugin` from 3.0.54 to 3.0.55

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
- dependency-name: org.slf4j:jul-to-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
- dependency-name: org.slf4j:jcl-over-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
- dependency-name: org.slf4j:jul-to-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
- dependency-name: org.slf4j:jcl-over-slf4j
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
- dependency-name: com.graphql-java:graphql-java
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: prod-deps
- dependency-name: com.graphql-java:graphql-java-extended-scalars
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: prod-deps
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: prod-deps
- dependency-name: io.swagger.codegen.v3:swagger-codegen-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: prod-deps
...

Signed-off-by: dependabot[bot] <[email protected]>

* Fikser testene.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Michal J. Sladek <[email protected]>
Co-authored-by: Michal J. Sladek <[email protected]>
  • Loading branch information
3 people authored Apr 23, 2024
1 parent a3f8b9e commit 5eff889
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
17 changes: 8 additions & 9 deletions mocks/saf-mock/src/test/java/GraphQLTjenesteTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,31 @@
import static org.mockito.Mockito.when;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;

import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.JournalpostBruker;
import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.JournalpostModell;
import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.koder.Arkivtema;
import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.koder.BrukerType;
import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.koder.Journalposttyper;
import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.koder.Mottakskanal;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;

import no.nav.foreldrepenger.vtp.testmodell.dokument.modell.JournalpostModell;
import no.nav.foreldrepenger.vtp.testmodell.repo.JournalRepository;
import no.nav.saf.graphql.GraphQLRequest;
import no.nav.saf.graphql.GraphQLTjeneste;

public class GraphQLTjenesteTest {
class GraphQLTjenesteTest {

private final static String jpId = "12345678";
private final static String sakId = "sakId";
private final static String fnr = "12345678901";

@Test
public void testSaf() {
void testSaf() {
// Arrange
GraphQLTjeneste graphQLTjeneste = GraphQLTjeneste.getInstance();
graphQLTjeneste.init();
Expand All @@ -55,7 +54,7 @@ public void testSaf() {
}

@Test
public void testSafSelvbetjening() {
void testSafSelvbetjening() {

GraphQLTjeneste graphQLTjeneste = GraphQLTjeneste.getInstance();
graphQLTjeneste.init();
Expand All @@ -75,7 +74,7 @@ public void testSafSelvbetjening() {
assertThat(resultat.get("data"))
.extracting("dokumentoversiktSelvbetjening")
.extracting("journalposter")
.extracting(jp -> ((ArrayList<?>) jp).get(0))
.extracting(jp -> ((List<?>) jp).getFirst())
.extracting("journalpostId")
.matches(jpId::equals);
}
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
<fp-kontrakter.version>9.1.12</fp-kontrakter.version>

<!-- Eksterne avhengigheter -->
<swagger-codegen-maven-plugin.version>3.0.54</swagger-codegen-maven-plugin.version> <!-- > 3.0.41 har bug med slf4.. -->
<graphql-java.version>21.5</graphql-java.version>
<graphql-scalar-java.version>21.0</graphql-scalar-java.version>
<swagger-codegen-maven-plugin.version>3.0.55</swagger-codegen-maven-plugin.version> <!-- > 3.0.41 har bug med slf4.. -->
<graphql-java.version>22.0</graphql-java.version>
<graphql-scalar-java.version>22.0</graphql-scalar-java.version>
<avro.version>1.11.3</avro.version>
<kafka.version>3.5.1</kafka.version>

Expand All @@ -56,8 +56,8 @@
<logstash.version>7.4</logstash.version>
<jetty.version>12.0.8</jetty.version>
<jersey.version>3.1.6</jersey.version>
<slf4j.version>2.0.12</slf4j.version>
<logback.version>1.5.4</logback.version>
<slf4j.version>2.0.13</slf4j.version>
<logback.version>1.5.6</logback.version>
<swagger.version>2.2.21</swagger.version>
<mockito.version>5.11.0</mockito.version>
</properties>
Expand Down Expand Up @@ -500,7 +500,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 5eff889

Please sign in to comment.