Skip to content

Commit 4d03942

Browse files
authored
Merge pull request #199 from digipost/licence_update
Licence update
2 parents 40de24f + 0de8436 commit 4d03942

File tree

237 files changed

+281
-265
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+281
-265
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) Posten Norge AS
2+
# Copyright (C) Posten Bring AS
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License");
55
# you may not use this file except in compliance with the License.

NOTICE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Digipost API Client
22

3-
Copyright 2011 Posten Norge AS. All Rights Reserved.
3+
Copyright 2011–2025 Posten Bring AS. All Rights Reserved.
44

5-
This product includes software developed by Posten Norge AS. - https://www.posten.no/
5+
This product includes software developed by Posten Bring AS. - https://www.posten.no/
66
Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
77

88

@@ -24,7 +24,7 @@ This software includes third party software subject to the following licenses:
2424
Byte Buddy (without dependencies) under Apache License, Version 2.0
2525
Caffeine cache under Apache License, Version 2.0
2626
Checker Qual under The MIT License
27-
Digipost API Client under The Apache Software License, Version 2.0
27+
Digipost API Client under Apache License, Version 2.0
2828
Digipost Caching under The Apache Software License, Version 2.0
2929
Digipost Data Types under The Apache Software License, Version 2.0
3030
Digipost HTTP Client Builder under The Apache Software License, Version 2.0
@@ -43,8 +43,8 @@ This software includes third party software subject to the following licenses:
4343
Java 8 Shim under Apache License, Version 2.0
4444
JAXB Core under Eclipse Distribution License - v 1.0
4545
JAXB Runtime under Eclipse Distribution License - v 1.0
46-
JCL 1.2 implemented over SLF4J under Apache License, Version 2.0
46+
JCL 1.2 implemented over SLF4J under Apache-2.0
4747
OWASP Java HTML Sanitizer under Apache License, Version 2.0
48-
SLF4J API Module under MIT License
48+
SLF4J API Module under MIT
4949
TXW2 Runtime under Eclipse Distribution License - v 1.0
5050

docs/Gemfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ GEM
1717
addressable (2.8.7)
1818
public_suffix (>= 2.0.2, < 7.0)
1919
base64 (0.2.0)
20-
benchmark (0.4.0)
21-
bigdecimal (3.1.9)
20+
benchmark (0.4.1)
21+
bigdecimal (3.2.2)
2222
coffee-script (2.4.1)
2323
coffee-script-source
2424
execjs
@@ -27,24 +27,24 @@ GEM
2727
commonmarker (0.23.11)
2828
concurrent-ruby (1.3.5)
2929
connection_pool (2.5.3)
30-
csv (3.3.4)
30+
csv (3.3.5)
3131
dnsruby (1.72.4)
3232
base64 (~> 0.2.0)
3333
logger (~> 1.6.5)
3434
simpleidn (~> 0.2.1)
35-
drb (2.2.1)
35+
drb (2.2.3)
3636
em-websocket (0.5.3)
3737
eventmachine (>= 0.12.9)
3838
http_parser.rb (~> 0)
3939
ethon (0.16.0)
4040
ffi (>= 1.15.0)
4141
eventmachine (1.2.7)
4242
execjs (2.10.0)
43-
faraday (2.13.1)
43+
faraday (2.13.4)
4444
faraday-net_http (>= 2.0, < 3.5)
4545
json
4646
logger
47-
faraday-net_http (3.4.0)
47+
faraday-net_http (3.4.1)
4848
net-http (>= 0.5.0)
4949
ffi (1.17.2-aarch64-linux-gnu)
5050
ffi (1.17.2-aarch64-linux-musl)
@@ -224,7 +224,7 @@ GEM
224224
gemoji (>= 3, < 5)
225225
html-pipeline (~> 2.2)
226226
jekyll (>= 3.0, < 5.0)
227-
json (2.12.0)
227+
json (2.13.2)
228228
kramdown (2.4.0)
229229
rexml
230230
kramdown-parser-gfm (1.1.0)
@@ -242,21 +242,21 @@ GEM
242242
minitest (5.25.5)
243243
net-http (0.6.0)
244244
uri
245-
nokogiri (1.18.8-aarch64-linux-gnu)
245+
nokogiri (1.18.9-aarch64-linux-gnu)
246246
racc (~> 1.4)
247-
nokogiri (1.18.8-aarch64-linux-musl)
247+
nokogiri (1.18.9-aarch64-linux-musl)
248248
racc (~> 1.4)
249-
nokogiri (1.18.8-arm-linux-gnu)
249+
nokogiri (1.18.9-arm-linux-gnu)
250250
racc (~> 1.4)
251-
nokogiri (1.18.8-arm-linux-musl)
251+
nokogiri (1.18.9-arm-linux-musl)
252252
racc (~> 1.4)
253-
nokogiri (1.18.8-arm64-darwin)
253+
nokogiri (1.18.9-arm64-darwin)
254254
racc (~> 1.4)
255-
nokogiri (1.18.8-x86_64-darwin)
255+
nokogiri (1.18.9-x86_64-darwin)
256256
racc (~> 1.4)
257-
nokogiri (1.18.8-x86_64-linux-gnu)
257+
nokogiri (1.18.9-x86_64-linux-gnu)
258258
racc (~> 1.4)
259-
nokogiri (1.18.8-x86_64-linux-musl)
259+
nokogiri (1.18.9-x86_64-linux-musl)
260260
racc (~> 1.4)
261261
octokit (4.25.1)
262262
faraday (>= 1, < 3)

pom.xml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,29 @@
1212
<version>16.0-SNAPSHOT</version>
1313
<name>Digipost API Client</name>
1414
<description>Java library for interacting with the Digipost REST API</description>
15+
16+
<organization>
17+
<name>Posten Bring AS</name>
18+
<url>https://www.posten.no/</url>
19+
</organization>
1520

21+
<licenses>
22+
<license>
23+
<name>Apache License, Version 2.0</name>
24+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
25+
<distribution>repo</distribution>
26+
<comments>
27+
Copyright 2011-2025 Posten Bring AS. All Rights Reserved.
28+
This product includes software developed by Posten Bring AS.
29+
</comments>
30+
</license>
31+
</licenses>
32+
1633
<properties>
1734
<maven.compiler.source>11</maven.compiler.source>
1835
<maven.compiler.target>11</maven.compiler.target>
1936

20-
<bouncycastle.version>1.78.1</bouncycastle.version>
21-
<slf4j.version>2.0.9</slf4j.version>
37+
<bouncycastle.version>1.81</bouncycastle.version>
2238
</properties>
2339

2440
<dependencies>
@@ -80,12 +96,12 @@
8096
<dependency>
8197
<groupId>commons-io</groupId>
8298
<artifactId>commons-io</artifactId>
83-
<version>2.16.1</version>
99+
<version>2.20.0</version>
84100
</dependency>
85101
<dependency>
86102
<groupId>org.apache.commons</groupId>
87103
<artifactId>commons-lang3</artifactId>
88-
<version>3.14.0</version>
104+
<version>3.18.0</version>
89105
</dependency>
90106
<dependency>
91107
<groupId>org.bouncycastle</groupId>
@@ -150,7 +166,7 @@
150166
<dependency>
151167
<groupId>no.digipost</groupId>
152168
<artifactId>digg</artifactId>
153-
<version>0.34</version>
169+
<version>0.37</version>
154170
<scope>test</scope>
155171
</dependency>
156172
<dependency>
@@ -180,26 +196,26 @@
180196
<dependency>
181197
<groupId>org.slf4j</groupId>
182198
<artifactId>slf4j-bom</artifactId>
183-
<version>2.0.13</version>
199+
<version>2.0.17</version>
184200
<type>pom</type>
185201
<scope>import</scope>
186202
</dependency>
187203
<dependency>
188204
<groupId>org.junit</groupId>
189205
<artifactId>junit-bom</artifactId>
190-
<version>5.10.2</version>
206+
<version>5.13.4</version>
191207
<type>pom</type>
192208
<scope>import</scope>
193209
</dependency>
194210
<dependency>
195211
<groupId>commons-codec</groupId>
196212
<artifactId>commons-codec</artifactId>
197-
<version>1.16.1</version>
213+
<version>1.19.0</version>
198214
</dependency>
199215
<dependency>
200216
<groupId>org.mockito</groupId>
201217
<artifactId>mockito-bom</artifactId>
202-
<version>5.11.0</version>
218+
<version>5.18.0</version>
203219
<type>pom</type>
204220
<scope>import</scope>
205221
</dependency>

src/NOTICE.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Digipost API Client
22

3-
Copyright 2011 Posten Norge AS. All Rights Reserved.
3+
Copyright 2011–2025 Posten Bring AS. All Rights Reserved.
44

5-
This product includes software developed by Posten Norge AS. - https://www.posten.no/
5+
This product includes software developed by Posten Bring AS. - https://www.posten.no/
66
Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html
77

88

src/license-header.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) Posten Norge AS
1+
Copyright (C) Posten Bring AS
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
1010
distributed under the License is distributed on an "AS IS" BASIS,
1111
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
See the License for the specific language governing permissions and
13-
limitations under the License.
13+
limitations under the License.

src/main/java/no/digipost/api/client/BrokerId.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) Posten Norge AS
2+
* Copyright (C) Posten Bring AS
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/no/digipost/api/client/DigipostClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) Posten Norge AS
2+
* Copyright (C) Posten Bring AS
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/no/digipost/api/client/DigipostClientConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) Posten Norge AS
2+
* Copyright (C) Posten Bring AS
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/java/no/digipost/api/client/EventLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) Posten Norge AS
2+
* Copyright (C) Posten Bring AS
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)