Skip to content

Commit 73a9574

Browse files
phaxphax
committed
Updated to ph-commons v12
1 parent 144dadb commit 73a9574

File tree

55 files changed

+337
-344
lines changed

Some content is hidden

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

55 files changed

+337
-344
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ name: Maven deploy Snapshots
22

33
on:
44
push:
5-
branches:
6-
- master
75

86
jobs:
97
build:
108
runs-on: ubuntu-latest
119
strategy:
1210
matrix:
13-
java: [ 11, 17, 21, 24 ]
11+
java: [ 17, 21, 24 ]
1412
name: Java ${{ matrix.java }} build
1513

1614
steps:
@@ -34,11 +32,11 @@ jobs:
3432
3533
- name: Publish to the Maven Central Repository
3634
run: mvn --batch-mode --update-snapshots -P release-snapshot deploy
37-
if: matrix.java == 11
35+
if: matrix.java == 17
3836
env:
3937
MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
4038
MAVEN_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
4139

4240
- name: Maven Build
4341
run: mvn --batch-mode --update-snapshots install
44-
if: matrix.java != 11
42+
if: matrix.java != 17

‎README.md‎

Lines changed: 98 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -58,74 +58,104 @@ Add the following to your pom.xml to use this artifact, replacing `x.y.z` with t
5858

5959
# News and noteworthy
6060

61-
* v2.4.0 - 2025-05-04
62-
* Requires ph-ebinterface 7.1.1
63-
* Requires ebinterface-ubl-mapping 5.3.0
64-
* v2.3.1 - 2024-10-17
65-
* Using XRechnung 3.0.2 validation rules
66-
* v2.3.0 - 2024-10-10
67-
* Updated to phive 10.x
68-
* v2.2.3 - 2024-07-13
69-
* Updated to ebinterface-ubl-mapping 5.2.2
70-
* Updated to cii2ubl 2.2.4
71-
* v2.2.2 - 2024-04-02
72-
* Updated to ebinterface-ubl-mapping 5.2.0
73-
* Ensured Java 21 compatibility
74-
* v2.2.1 - 2023-11-10
75-
* Updated to ebinterface-ubl-mapping 5.1.2
76-
* v2.2.0 - 2023-09-26
77-
* Updated to phive 9.x
78-
* Updated to ebinterface-ubl-mapping 5.1.1
79-
* Setting UBL XRechnung Profile ID to a default value
80-
* Added support for XRechnung 3.0
81-
* v2.1.0 - 2023-04-30
82-
* Updated to ph-ubl 8.x
83-
* v2.0.0 - 2023-03-03
84-
* Using Java 11 as the baseline
85-
* Updated to ph-commons 11
86-
* Using JAXB 4.0 as the baseline
87-
* Added support for XRechnung 2.3
88-
* v1.4.0 - 2022-10-12
89-
* Added support for XRechnung 2.2
90-
* Added support for ebInterface 6.1
91-
* v1.3.0 - 2021-05-02
92-
* Updated to ph-commons 10.1
93-
* v1.2.0 - 2021-03-22
94-
* Updated to ph-commons 10
95-
* v1.1.2 - 2021-01-11
96-
* Updated to conform to EN16931 rules 1.3.3
97-
* Updated to en16931-cii2ubl 1.3.0
98-
* v1.1.1 - 2020-11-26
99-
* Version updates
100-
* v1.1.0 - 2020-11-06
101-
* Added support for creating XRechnung 2.0.0 documents
102-
* v1.0.9 - 2020-09-17
103-
* Updated to Jakarta JAXB 2.3.3
104-
* v1.0.8 - 2020-08-30
105-
* Updated to ph-ubl 6.4.0
106-
* Updated to ph-ebinterface 6.2.0
107-
* Updated to ebinterface-ubl-mapping 4.6.0
108-
* v1.0.7 - 2020-06-08
109-
* Updated to ph-bdve 6.0.0
110-
* v1.0.6 - 2020-05-27
111-
* Updated to new Maven groupIds
112-
* v1.0.5 - 2020-05-14
113-
* Added support for ebInterface 6.0
114-
* Made ebInterface customizer customizable
115-
* v1.0.4 - 2020-04-01
116-
* Updated to ebinterface-ubl-mapping 4.5.4
117-
* Updated to en16931-cii2ubl 1.2.0
118-
* v1.0.3 - 2020-02-07
119-
* Updated to peppol-commons 8.x
120-
* v1.0.2 - 2020-01-13
121-
* Updated to support the XRechnung 1.2.2 document type
122-
* v1.0.1 - 2019-10-14
123-
* Updated to ebinterface-ubl-mapping 4.5.1
124-
* v1.0.0 - 2019-10-01
125-
* Changed all package names to `at.austriapro`
126-
* Changed the Maven group `at.austriapro`
127-
* v0.9.0 - 2019-09-18
128-
* Initial version using ebinterface-ubl-mapping v4.0.0 and cii2ubl v1.1.5
61+
v3.0.0 - 2025-08-29
62+
* Requires Java 17 as the minimum version
63+
* Updated to ph-commons 12.0.0
64+
65+
v2.4.0 - 2025-05-04
66+
* Requires ph-ebinterface 7.1.1
67+
* Requires ebinterface-ubl-mapping 5.3.0
68+
69+
v2.3.1 - 2024-10-17
70+
* Using XRechnung 3.0.2 validation rules
71+
72+
v2.3.0 - 2024-10-10
73+
* Updated to phive 10.x
74+
75+
v2.2.3 - 2024-07-13
76+
* Updated to ebinterface-ubl-mapping 5.2.2
77+
* Updated to cii2ubl 2.2.4
78+
79+
v2.2.2 - 2024-04-02
80+
* Updated to ebinterface-ubl-mapping 5.2.0
81+
* Ensured Java 21 compatibility
82+
83+
v2.2.1 - 2023-11-10
84+
* Updated to ebinterface-ubl-mapping 5.1.2
85+
86+
v2.2.0 - 2023-09-26
87+
* Updated to phive 9.x
88+
* Updated to ebinterface-ubl-mapping 5.1.1
89+
* Setting UBL XRechnung Profile ID to a default value
90+
* Added support for XRechnung 3.0
91+
92+
v2.1.0 - 2023-04-30
93+
* Updated to ph-ubl 8.x
94+
95+
v2.0.0 - 2023-03-03
96+
* Using Java 11 as the baseline
97+
* Updated to ph-commons 11
98+
* Using JAXB 4.0 as the baseline
99+
* Added support for XRechnung 2.3
100+
101+
v1.4.0 - 2022-10-12
102+
* Added support for XRechnung 2.2
103+
* Added support for ebInterface 6.1
104+
105+
v1.3.0 - 2021-05-02
106+
* Updated to ph-commons 10.1
107+
108+
v1.2.0 - 2021-03-22
109+
* Updated to ph-commons 10
110+
111+
v1.1.2 - 2021-01-11
112+
* Updated to conform to EN16931 rules 1.3.3
113+
* Updated to en16931-cii2ubl 1.3.0
114+
115+
v1.1.1 - 2020-11-26
116+
117+
version updates
118+
119+
v1.1.0 - 2020-11-06
120+
* Added support for creating XRechnung 2.0.0 documents
121+
122+
v1.0.9 - 2020-09-17
123+
* Updated to Jakarta JAXB 2.3.3
124+
125+
v1.0.8 - 2020-08-30
126+
* Updated to ph-ubl 6.4.0
127+
* Updated to ph-ebinterface 6.2.0
128+
* Updated to ebinterface-ubl-mapping 4.6.0
129+
130+
v1.0.7 - 2020-06-08
131+
* Updated to ph-bdve 6.0.0
132+
133+
v1.0.6 - 2020-05-27
134+
* Updated to new Maven groupIds
135+
136+
v1.0.5 - 2020-05-14
137+
* Added support for ebInterface 6.0
138+
* Made ebInterface customizer customizable
139+
140+
v1.0.4 - 2020-04-01
141+
* Updated to ebinterface-ubl-mapping 4.5.4
142+
* Updated to en16931-cii2ubl 1.2.0
143+
144+
v1.0.3 - 2020-02-07
145+
* Updated to peppol-commons 8.x
146+
147+
v1.0.2 - 2020-01-13
148+
* Updated to support the XRechnung 1.2.2 document type
149+
150+
v1.0.1 - 2019-10-14
151+
* Updated to ebinterface-ubl-mapping 4.5.1
152+
153+
v1.0.0 - 2019-10-01
154+
* Changed all package names to `at.austriapro`
155+
* Changed the Maven group `at.austriapro`
156+
157+
v0.9.0 - 2019-09-18
158+
* Initial version using ebinterface-ubl-mapping v4.0.0 and cii2ubl v1.1.5
129159

130160
---
131161

‎pom.xml‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<parent>
2222
<groupId>com.helger</groupId>
2323
<artifactId>parent-pom</artifactId>
24-
<version>2.1.4</version>
24+
<version>3.0.1</version>
2525
</parent>
2626
<groupId>at.austriapro</groupId>
2727
<artifactId>ebinterface-xrechnung-mapping</artifactId>
28-
<version>2.4.1-SNAPSHOT</version>
28+
<version>3.0.0-SNAPSHOT</version>
2929
<packaging>bundle</packaging>
3030
<name>ebinterface-xrechnung-mapping</name>
3131
<inceptionYear>2019</inceptionYear>
@@ -65,68 +65,64 @@
6565
<dependency>
6666
<groupId>com.helger.commons</groupId>
6767
<artifactId>ph-commons-parent-pom</artifactId>
68-
<version>11.2.6</version>
68+
<version>12.0.0</version>
6969
<type>pom</type>
7070
<scope>import</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.helger.masterdata</groupId>
7474
<artifactId>ph-masterdata-parent-pom</artifactId>
75-
<version>7.0.2</version>
75+
<version>8.0.0</version>
7676
<type>pom</type>
7777
<scope>import</scope>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.helger</groupId>
8181
<artifactId>ph-ebinterface</artifactId>
82-
<version>7.1.1</version>
82+
<version>8.0.0</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>com.helger.ubl</groupId>
8686
<artifactId>ph-ubl-parent-pom</artifactId>
87-
<version>9.0.3</version>
87+
<version>10.0.0</version>
8888
<type>pom</type>
8989
<scope>import</scope>
9090
</dependency>
9191
<dependency>
9292
<groupId>com.helger.peppol</groupId>
9393
<artifactId>peppol-commons-parent-pom</artifactId>
94-
<version>11.0.3</version>
94+
<version>12.0.1</version>
9595
<type>pom</type>
9696
<scope>import</scope>
9797
</dependency>
9898
<dependency>
9999
<groupId>at.austriapro</groupId>
100100
<artifactId>ebinterface-ubl-mapping</artifactId>
101-
<version>5.3.4</version>
101+
<version>6.0.0</version>
102102
</dependency>
103103
<dependency>
104104
<groupId>com.helger.phive</groupId>
105105
<artifactId>phive-parent-pom</artifactId>
106-
<version>10.1.1</version>
106+
<version>11.0.0</version>
107107
<type>pom</type>
108108
<scope>import</scope>
109109
</dependency>
110110
<dependency>
111111
<groupId>com.helger.phive.rules</groupId>
112112
<artifactId>phive-rules-parent-pom</artifactId>
113-
<version>3.2.14</version>
113+
<version>4.0.0</version>
114114
<type>pom</type>
115115
<scope>import</scope>
116116
</dependency>
117117
<dependency>
118118
<groupId>com.helger</groupId>
119119
<artifactId>en16931-cii2ubl</artifactId>
120-
<version>2.3.1</version>
120+
<version>3.0.0</version>
121121
</dependency>
122122
</dependencies>
123123
</dependencyManagement>
124124

125125
<dependencies>
126-
<dependency>
127-
<groupId>com.helger.commons</groupId>
128-
<artifactId>ph-commons</artifactId>
129-
</dependency>
130126
<dependency>
131127
<groupId>com.helger.commons</groupId>
132128
<artifactId>ph-jaxb</artifactId>
@@ -189,6 +185,11 @@
189185
<artifactId>jaxb-impl</artifactId>
190186
<scope>test</scope>
191187
</dependency>
188+
<dependency>
189+
<groupId>com.helger.commons</groupId>
190+
<artifactId>ph-unittest-support-ext</artifactId>
191+
<scope>test</scope>
192+
</dependency>
192193
</dependencies>
193194

194195
<build>
@@ -201,17 +202,10 @@
201202
<instructions>
202203
<Automatic-Module-Name>at.austriapro.ebinterface.xrechnung</Automatic-Module-Name>
203204
<Export-Package>at.austriapro.ebinterface.xrechnung.*</Export-Package>
204-
<Import-Package>!javax.annotation.*,*</Import-Package>
205+
<Import-Package>!jakarta.annotation.*,*</Import-Package>
205206
</instructions>
206207
</configuration>
207208
</plugin>
208-
<plugin>
209-
<groupId>org.apache.maven.plugins</groupId>
210-
<artifactId>maven-javadoc-plugin</artifactId>
211-
<configuration>
212-
<source>8</source>
213-
</configuration>
214-
</plugin>
215209
</plugins>
216210
</build>
217211
</project>

‎src/main/java/at/austriapro/ebinterface/xrechnung/AbstractEbInterfaceXRechnungConverter.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
import java.util.Locale;
1919

20-
import javax.annotation.Nonnegative;
21-
import javax.annotation.Nonnull;
22-
import javax.annotation.Nullable;
20+
import com.helger.annotation.Nonempty;
21+
import com.helger.annotation.Nonnegative;
22+
import com.helger.annotation.misc.Translatable;
23+
import com.helger.base.enforce.ValueEnforcer;
24+
import com.helger.diagnostics.error.level.EErrorLevel;
25+
import com.helger.diagnostics.error.list.IErrorList;
26+
import com.helger.text.IMultilingualText;
27+
import com.helger.text.display.IHasDisplayTextWithArgs;
28+
import com.helger.text.resolve.DefaultTextResolver;
29+
import com.helger.text.util.TextHelper;
2330

24-
import com.helger.commons.ValueEnforcer;
25-
import com.helger.commons.annotation.Nonempty;
26-
import com.helger.commons.annotation.Translatable;
27-
import com.helger.commons.error.level.EErrorLevel;
28-
import com.helger.commons.error.list.IErrorList;
29-
import com.helger.commons.text.IMultilingualText;
30-
import com.helger.commons.text.display.IHasDisplayTextWithArgs;
31-
import com.helger.commons.text.resolve.DefaultTextResolver;
32-
import com.helger.commons.text.util.TextHelper;
31+
import jakarta.annotation.Nonnull;
32+
import jakarta.annotation.Nullable;
3333

3434
/**
3535
* Abstract base class for converter between XRechnung to ebInterface (in both

‎src/main/java/at/austriapro/ebinterface/xrechnung/EXRechnungVersion.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
*/
1616
package at.austriapro.ebinterface.xrechnung;
1717

18-
import javax.annotation.Nonnull;
19-
20-
import com.helger.commons.annotation.Nonempty;
18+
import com.helger.annotation.Nonempty;
2119
import com.helger.diver.api.coord.DVRCoordinate;
2220
import com.helger.phive.xrechnung.XRechnungValidation;
2321

22+
import jakarta.annotation.Nonnull;
23+
2424
/**
2525
* XRechnung version specifics.
2626
*

‎src/main/java/at/austriapro/ebinterface/xrechnung/from/AbstractXRechnungToEbInterfaceConverter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
import java.util.Locale;
1919

20-
import javax.annotation.Nonnull;
21-
2220
import at.austriapro.ebinterface.ubl.from.ToEbinterfaceSettings;
2321
import at.austriapro.ebinterface.xrechnung.AbstractEbInterfaceXRechnungConverter;
22+
import jakarta.annotation.Nonnull;
2423

2524
/**
2625
* Abstract base class to convert XRechnung to ebInterface.

0 commit comments

Comments
 (0)