Skip to content

Commit

Permalink
Merge pull request #8 from digipost/upgrade-caffeine
Browse files Browse the repository at this point in the history
Housekeeping
  • Loading branch information
runeflobakk authored Apr 29, 2024
2 parents 37276d3 + f096835 commit a9aede7
Show file tree
Hide file tree
Showing 41 changed files with 220 additions and 379 deletions.
31 changes: 31 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
# Copyright (C) Posten Norge AS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

root = true

[*]
end_of_line = lf
insert_final_newline = true
indent_style = tab
indent_size = 4
charset = utf-8
continuation_indent_size = 8

[*.yml]
indent_size = 2

[*.md]
indent_size = 2
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
name: Deploy snapshot
steps:
- uses: actions/checkout@v4
- uses: digipost/action-maven-publish@1.1.0
- uses: digipost/action-maven-publish@v1
with:
sonatype_secrets: ${{ secrets.sonatype_secrets }}
release_version: ${{ needs.makeversion.outputs.version }}
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Check out Git repository
uses: actions/checkout@v4
- name: Release to Central Repository
uses: digipost/action-maven-publish@1.1.0
uses: digipost/action-maven-publish@v1
with:
sonatype_secrets: ${{ secrets.sonatype_secrets }}
release_version: ${{ needs.makeversion.outputs.version }}
Expand Down
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-P build-sources-and-javadoc,dependency-analyze,check-license-header,include-NOTICE
24 changes: 0 additions & 24 deletions LICENSE_BSD

This file was deleted.

70 changes: 0 additions & 70 deletions LICENSE_EPL_1.0

This file was deleted.

17 changes: 0 additions & 17 deletions LICENSE_MIT

This file was deleted.

2 changes: 2 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
This software includes third party software subject to the following licenses:

Caffeine cache under Apache License, Version 2.0
Checker Qual under The MIT License
Digipost Caching under The Apache Software License, Version 2.0
error-prone annotations under Apache 2.0
SLF4J API Module under MIT License


Loading

0 comments on commit a9aede7

Please sign in to comment.