Skip to content

Commit 057b979

Browse files
runeflobakkruneflobakk
committed
Use Digipost JAXB resolver
https://github.com/digipost/jaxb-resolver-com.sun.xml.bind/
1 parent 0d0d8f1 commit 057b979

File tree

5 files changed

+29
-73
lines changed

5 files changed

+29
-73
lines changed

‎.mvn/maven.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-P build-sources-and-javadoc
1+
-P build-sources-and-javadoc,dependency-analyze,include-NOTICE

‎NOTICE‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ This software includes third party software subject to the following licenses:
1515
Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0
1616
Apache HttpCore under Apache License, Version 2.0
1717
Digipost Certificate Validator under The Apache Software License, Version 2.0
18-
Digipost com.sun.xml.bind JAXB Service Loader under The Apache Software License, Version 2.0
19-
Jakarta Activation under EDL 1.0
18+
Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0
2019
JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
2120
jaxb-api under CDDL 1.1 or GPL2 w/ CPE
2221
JAXB2 Basics - Runtime under BSD-Style License

‎pom.xml‎

Lines changed: 10 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
<parent>
1111
<groupId>no.digipost</groupId>
1212
<artifactId>digipost-open-super-pom</artifactId>
13-
<version>8</version>
13+
<version>12</version>
1414
</parent>
1515

1616
<properties>
1717
<maven.compiler.source>1.8</maven.compiler.source>
1818
<maven.compiler.target>1.8</maven.compiler.target>
19-
<project.previousVersion>set_with_-Dproject.previousVersion=X.Y</project.previousVersion>
2019
<signature.api.version>old-is-older-SNAPSHOT</signature.api.version>
21-
<slf4j.version>1.7.36</slf4j.version>
2220
</properties>
2321

2422
<dependencyManagement>
@@ -95,12 +93,12 @@
9593
<dependency>
9694
<groupId>org.slf4j</groupId>
9795
<artifactId>slf4j-api</artifactId>
98-
<version>${slf4j.version}</version>
96+
<version>2.0.6</version>
9997
</dependency>
10098
<dependency>
10199
<groupId>org.slf4j</groupId>
102100
<artifactId>slf4j-simple</artifactId>
103-
<version>${slf4j.version}</version>
101+
<version>2.0.6</version>
104102
<scope>test</scope>
105103
</dependency>
106104

@@ -173,6 +171,12 @@
173171
</exclusion>
174172
</exclusions>
175173
</dependency>
174+
<dependency>
175+
<groupId>no.digipost</groupId>
176+
<artifactId>jul-to-slf4j-junit-extension</artifactId>
177+
<version>1.0</version>
178+
<scope>test</scope>
179+
</dependency>
176180
</dependencies>
177181

178182
<build>
@@ -184,53 +188,16 @@
184188
</resources>
185189
<pluginManagement>
186190
<plugins>
187-
<plugin>
188-
<groupId>org.jasig.maven</groupId>
189-
<artifactId>maven-notice-plugin</artifactId>
190-
<version>1.1.0</version>
191-
<configuration>
192-
<excludeScopes>
193-
<excludeScopes>test</excludeScopes>
194-
</excludeScopes>
195-
<noticeTemplate>${project.basedir}/src/main/notice/NOTICE.template</noticeTemplate>
196-
</configuration>
197-
<dependencies>
198-
<dependency>
199-
<groupId>org.glassfish.jaxb</groupId>
200-
<artifactId>jaxb-runtime</artifactId>
201-
<version>2.3.6</version>
202-
</dependency>
203-
<dependency>
204-
<groupId>jakarta.xml.bind</groupId>
205-
<artifactId>jakarta.xml.bind-api</artifactId>
206-
<version>2.3.3</version>
207-
</dependency>
208-
</dependencies>
209-
</plugin>
210191
<plugin>
211192
<artifactId>maven-compiler-plugin</artifactId>
212193
<version>3.11.0</version>
213194
</plugin>
214195
<plugin>
215196
<groupId>com.github.siom79.japicmp</groupId>
216197
<artifactId>japicmp-maven-plugin</artifactId>
217-
<version>0.17.1</version>
198+
<version>0.15.3</version>
218199
<configuration>
219-
<oldVersion>
220-
<dependency>
221-
<groupId>${project.groupId}</groupId>
222-
<artifactId>${project.artifactId}</artifactId>
223-
<version>${project.previousVersion}</version>
224-
</dependency>
225-
</oldVersion>
226-
<newVersion>
227-
<file>
228-
<path>${project.build.directory}/${project.build.finalName}.${project.packaging}</path>
229-
</file>
230-
</newVersion>
231200
<parameter>
232-
<onlyModified>true</onlyModified>
233-
<onlyBinaryIncompatible>true</onlyBinaryIncompatible>
234201
<includes>
235202
<include>no.digipost.signature.client</include>
236203
</includes>
@@ -330,33 +297,6 @@
330297
</plugins>
331298
</pluginManagement>
332299
<plugins>
333-
<plugin>
334-
<artifactId>maven-dependency-plugin</artifactId>
335-
<executions>
336-
<execution>
337-
<goals>
338-
<goal>analyze-only</goal>
339-
</goals>
340-
<configuration>
341-
<failOnWarning>true</failOnWarning>
342-
<ignoreNonCompile>true</ignoreNonCompile>
343-
</configuration>
344-
</execution>
345-
</executions>
346-
</plugin>
347-
<plugin>
348-
<groupId>org.jasig.maven</groupId>
349-
<artifactId>maven-notice-plugin</artifactId>
350-
<executions>
351-
<execution>
352-
<id>check-NOTICE-file</id>
353-
<phase>verify</phase>
354-
<goals>
355-
<goal>check</goal>
356-
</goals>
357-
</execution>
358-
</executions>
359-
</plugin>
360300
<plugin>
361301
<artifactId>maven-shade-plugin</artifactId>
362302
<executions>

src/main/notice/NOTICE.template renamed to src/NOTICE.template

File renamed without changes.

‎src/test/resources/junit-platform.properties‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#
2+
# Copyright (C) Posten Norge AS
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
#
16+
17+
junit.jupiter.extensions.autodetection.enabled=true

0 commit comments

Comments
 (0)