Skip to content

Commit

Permalink
Upgrade parent pom to latest and perform maintainence on licences and…
Browse files Browse the repository at this point in the history
… notices
  • Loading branch information
eivinhb committed Dec 15, 2023
1 parent fea7f64 commit d2f88ed
Show file tree
Hide file tree
Showing 18 changed files with 103 additions and 210 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) Posten Norge AS
# Copyright (C) Posten Bring AS
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
24 changes: 8 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,15 @@ jobs:

name: build java ${{ matrix.java }}
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: actions/checkout@v3
- name: Set up java
uses: actions/setup-java@v3
uses: actions/setup-java@v3.6.0
with:
java-version: ${{ matrix.java }}
distribution: temurin
server-id: github
cache: 'maven'

cache: "maven"
- name: Build with Maven
run: mvn -B package --no-transfer-progress --file pom.xml
run: mvn --settings .mvn/settings.xml -B verify -U --no-transfer-progress

makeversion:
if: github.ref != 'refs/heads/main'
Expand All @@ -50,10 +46,8 @@ jobs:

name: Deploy snapshot
steps:
- uses: actions/checkout@v4
with:
submodules: true
- uses: digipost/[email protected]
- uses: actions/checkout@v3
- uses: digipost/[email protected]
with:
sonatype_secrets: ${{ secrets.sonatype_secrets }}
release_version: ${{ needs.makeversion.outputs.version }}
Expand All @@ -66,11 +60,9 @@ jobs:
name: Release to Sonatype
steps:
- name: Check out Git repository
uses: actions/checkout@v4
with:
submodules: true
uses: actions/checkout@v3
- name: Release to Central Repository
uses: digipost/action-maven-publish@1.1.0
uses: digipost/action-maven-publish@1.3.2
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,include-NOTICE
28 changes: 28 additions & 0 deletions .mvn/settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">

<profiles>
<profile>
<id>sonatype_snapshots</id>
<repositories>
<repository>
<id>oss.sonatype.org-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</profile>
</profiles>

<activeProfiles>
<activeProfile>sonatype_snapshots</activeProfile>
</activeProfiles>

</settings>
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.

4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Digipost Printability Validator

Copyright 2015 Posten Norge AS. All Rights Reserved.
Copyright 2023 Posten Norge AS. All Rights Reserved.

This product includes software developed by Posten Norge AS. - https://www.posten.no/
Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
Expand All @@ -11,7 +11,7 @@ This software includes third party software subject to the following licenses:
Apache FontBox under Apache License, Version 2.0
Apache PDFBox under Apache License, Version 2.0
Digipost Printability Validator under The Apache Software License, Version 2.0
JCL 1.2 implemented over SLF4J under MIT License
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
SLF4J API Module under MIT License


Loading

0 comments on commit d2f88ed

Please sign in to comment.