Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 84c847d
Merge: 84b9d0f 1ca70fd
Author: Martin Lindström <[email protected]>
Date:   Thu Nov 2 12:45:59 2023 +0100

    Merge pull request #170 from swedenconnect/release/1.1.0-release

    Release/1.1.0 release

commit 1ca70fd
Author: Martin Lindström <[email protected]>
Date:   Thu Nov 2 12:30:37 2023 +0100

    1.1.0

commit 5b17580
Author: Martin Lindström <[email protected]>
Date:   Thu Nov 2 12:26:41 2023 +0100

    1.1.0

commit 84b9d0f
Merge: f1a39c1 4bbb732
Author: Martin Lindström <[email protected]>
Date:   Thu Nov 2 11:24:02 2023 +0100

    Merge pull request #169 from swedenconnect/feature/IS-134-logo-path

    IS-134 It is now possible to give entire url for logotype

commit 4bbb732
Author: Martin Lindström <[email protected]>
Date:   Thu Nov 2 11:18:53 2023 +0100

    IS-134 It is now possible to give entire url for logotype

commit f1a39c1
Merge: daf1399 c4be72d
Author: Martin Lindström <[email protected]>
Date:   Thu Oct 26 22:20:21 2023 +0200

    Merge pull request #168 from swedenconnect/feature/IS-167-hostname-verification

    IS-167 Hostname verification disabled

commit c4be72d
Author: Martin Lindström <[email protected]>
Date:   Thu Oct 26 22:15:25 2023 +0200

    IS-167 Hostname verification disabled

commit daf1399
Merge: 84ed5e6 b9706bd
Author: Martin Lindström <[email protected]>
Date:   Thu Oct 26 22:09:59 2023 +0200

    Merge pull request #164 from swedenconnect/feature/IS-160-fail-fast

    IS-160 Added fail-fast config setting for metadata providers

commit b9706bd
Author: Martin Lindström <[email protected]>
Date:   Wed Oct 25 12:40:24 2023 +0200

    IS-160 Added fail-fast config setting for metadata providers

commit 84ed5e6
Merge: f5d49e2 6bd8e8d
Author: Martin Lindström <[email protected]>
Date:   Wed Oct 25 12:26:48 2023 +0200

    Merge pull request #163 from swedenconnect/feature/IS-162-jakarta

    Feature/is 162 jakarta

commit 6bd8e8d
Author: Martin Lindström <[email protected]>
Date:   Wed Oct 25 12:01:26 2023 +0200

    IS-162 Updated actions to use Java 17

commit 19d2b72
Author: Martin Lindström <[email protected]>
Date:   Wed Oct 25 11:56:51 2023 +0200

    IS-162 Changes for Spring Boot starters in Boot 3

commit 8a4c6c8
Author: Martin Lindström <[email protected]>
Date:   Mon Oct 23 15:50:44 2023 +0200

    IS-162 javax -> jakarta - Java 17

commit f0af439
Author: Martin Lindström <[email protected]>
Date:   Mon Oct 23 11:01:37 2023 +0200

    IS-162 Port to Jakarta
  • Loading branch information
martin-lindstrom committed Nov 2, 2023
1 parent f5d49e2 commit 0c10b89
Show file tree
Hide file tree
Showing 1,194 changed files with 79,623 additions and 182,982 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'

- name: Build with Maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-test-and-codecoverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '11'
java-version: '17'
distribution: 'adopt'

- name: Build with Maven
Expand Down
11 changes: 2 additions & 9 deletions audit/actuator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>se.swedenconnect.signservice</groupId>
<artifactId>signservice-audit-parent</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
</parent>

<name>Sweden Connect :: SignService :: Auditing :: Actuator</name>
Expand Down Expand Up @@ -73,13 +73,6 @@

<dependencies>

<!-- Snyk -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.14.1</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
Expand Down Expand Up @@ -108,7 +101,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.12.14</version><!--$NO-MVN-MAN-VER$-->
<version>1.14.9</version><!--$NO-MVN-MAN-VER$-->
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,8 +15,7 @@
*/
package se.swedenconnect.signservice.audit.actuator;

import javax.annotation.Nonnull;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditLogger;
import se.swedenconnect.signservice.audit.callback.AuditLoggerListener;
import se.swedenconnect.signservice.audit.callback.CallbackAuditLogger;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,8 +15,7 @@
*/
package se.swedenconnect.signservice.audit.actuator;

import javax.annotation.Nonnull;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerConfiguration;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,11 +15,10 @@
*/
package se.swedenconnect.signservice.audit.actuator;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.springframework.context.ApplicationEventPublisher;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.audit.AuditLogger;
import se.swedenconnect.signservice.audit.base.AbstractAuditLogger;
import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -19,11 +19,10 @@
import java.util.Objects;
import java.util.stream.Collectors;

import javax.annotation.Nonnull;

import org.springframework.boot.actuate.audit.listener.AuditApplicationEvent;
import org.springframework.context.ApplicationEventPublisher;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditEventParameter;
import se.swedenconnect.signservice.audit.callback.AuditLoggerListener;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions audit/base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>se.swedenconnect.signservice</groupId>
<artifactId>signservice-audit-parent</artifactId>
<version>1.0.2</version>
<version>1.1.0</version>
</parent>

<name>Sweden Connect :: SignService :: Auditing :: Base</name>
Expand Down Expand Up @@ -79,7 +79,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.11</version>
<version>1.4.11</version>
<scope>test</scope>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,9 +15,8 @@
*/
package se.swedenconnect.signservice.audit.base;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditEventBuilder;
import se.swedenconnect.signservice.audit.AuditEventParameter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,10 @@

import java.util.Optional;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditLogger;
import se.swedenconnect.signservice.audit.base.events.AuditEventFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -18,9 +18,8 @@
import java.lang.reflect.Constructor;
import java.util.Arrays;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.audit.AuditLogger;
import se.swedenconnect.signservice.audit.base.events.AuditEventFactory;
import se.swedenconnect.signservice.core.config.AbstractHandlerFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,8 +15,7 @@
*/
package se.swedenconnect.signservice.audit.base.events;

import javax.annotation.Nonnull;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,8 +15,7 @@
*/
package se.swedenconnect.signservice.audit.base.events;

import javax.annotation.Nonnull;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -21,9 +21,8 @@
import java.util.List;
import java.util.Objects;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditEventParameter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,8 +15,7 @@
*/
package se.swedenconnect.signservice.audit.callback;

import javax.annotation.Nonnull;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -17,11 +17,10 @@

import java.util.Objects;

import javax.annotation.Nonnull;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditEvent;
import se.swedenconnect.signservice.audit.AuditLogger;
import se.swedenconnect.signservice.audit.AuditLoggerException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,9 +15,8 @@
*/
package se.swedenconnect.signservice.audit.callback;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerConfiguration;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,10 +15,9 @@
*/
package se.swedenconnect.signservice.audit.callback;

import javax.annotation.Nonnull;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import jakarta.annotation.Nonnull;
import se.swedenconnect.signservice.audit.AuditLogger;
import se.swedenconnect.signservice.audit.base.AbstractAuditLogger;
import se.swedenconnect.signservice.audit.base.AbstractAuditLoggerFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2022 Sweden Connect
* Copyright 2022-2023 Sweden Connect
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
import java.util.logging.Level;
import java.util.logging.LogRecord;

import javax.annotation.Nonnull;

import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;

import jakarta.annotation.Nonnull;

/**
* A wrapper class to Java Util Logging's {@link FileHandler} that supports "rolling files" per date.
Expand Down
Loading

0 comments on commit 0c10b89

Please sign in to comment.