diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddd6d1c..0f383ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: name: Deploy snapshot steps: - uses: actions/checkout@v4 - - 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 }} @@ -64,7 +64,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@1.3.2 with: sonatype_secrets: ${{ secrets.sonatype_secrets }} release_version: ${{ needs.makeversion.outputs.version }} diff --git a/.mvn/maven.config b/.mvn/maven.config index 75848f4..4223876 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1 +1 @@ --Pbuild-sources-and-javadoc +-P build-sources-and-javadoc,dependency-analyze,include-NOTICE diff --git a/NOTICE b/NOTICE index a0162b8..95afb47 100644 --- a/NOTICE +++ b/NOTICE @@ -1,17 +1,13 @@ -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: +Peppol BIS Billing 3 generator -http://www.apache.org/licenses/LICENSE-2.0 +Copyright 2024 Posten Bring AS. All Rights Reserved. -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. +This product includes software developed by Posten Bring AS. - https://www.posten.no/ +Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html + + +This software includes third party software subject to the following licenses: -This project includes: Eaxy Easy XML library under The Apache Licence, version 2.0 jsr305 under GNU Lesser Public License peppol-bis-billing-3-generator-api under Apache License, Version 2.0 diff --git a/api/NOTICE b/api/NOTICE index e5c0287..bcf9e83 100644 --- a/api/NOTICE +++ b/api/NOTICE @@ -1,17 +1,13 @@ -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: +Peppol BIS Billing 3 generator -http://www.apache.org/licenses/LICENSE-2.0 +Copyright 2024 Posten Bring AS. All Rights Reserved. -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. +This product includes software developed by Posten Bring AS. - https://www.posten.no/ +Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html + + +This software includes third party software subject to the following licenses: -This project includes: Eaxy Easy XML library under The Apache Licence, version 2.0 jsr305 under GNU Lesser Public License peppol-bis-billing-3-generator-api under Apache License, Version 2.0 diff --git a/domain/NOTICE b/domain/NOTICE index e21fbd4..1c64cc7 100644 --- a/domain/NOTICE +++ b/domain/NOTICE @@ -1,17 +1,13 @@ -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: +Peppol BIS Billing 3 generator -http://www.apache.org/licenses/LICENSE-2.0 +Copyright 2024 Posten Bring AS. All Rights Reserved. -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. +This product includes software developed by Posten Bring AS. - https://www.posten.no/ +Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html + + +This software includes third party software subject to the following licenses: -This project includes: Eaxy Easy XML library under The Apache Licence, version 2.0 jsr305 under GNU Lesser Public License peppol-bis-billing-3-generator-domain under Apache License, Version 2.0 diff --git a/pom.xml b/pom.xml index cf7c3de..e10cc47 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ no.digipost digipost-open-super-pom - 7 + 13 peppol-bis-billing-3-generator-parent @@ -34,6 +34,7 @@ UTF-8 11 11 + 11 @@ -41,7 +42,7 @@ org.junit junit-bom - 5.5.2 + 5.10.3 pom import @@ -53,12 +54,12 @@ org.slf4j slf4j-api - 1.7.30 + 2.0.16 org.hamcrest hamcrest - 2.2-rc1 + 3.0 test @@ -68,185 +69,38 @@ - maven-clean-plugin - 3.1.0 - - - maven-resources-plugin - 3.1.0 + maven-deploy-plugin + 3.1.1 - maven-enforcer-plugin - 3.0.0-M2 + maven-clean-plugin + 3.3.1 - - - 3.3.1 - - + + + . - javax.servlet + dependency-reduced-pom.xml - - javax.* - org.hamcrest:hamcrest-core - - - + + - maven-surefire-plugin - 3.0.0-M3 - - -Djava.util.logging.config.file=/logging.properties - - - - org.apache.felix - maven-bundle-plugin - 2.4.0 - true - - - org.apache.maven.plugins maven-dependency-plugin - 3.1.1 - - - maven-jar-plugin - 3.1.2 + 3.6.0 maven-install-plugin - 3.0.0-M1 - - - maven-deploy-plugin - 3.0.0-M1 + 3.1.1 org.codehaus.mojo versions-maven-plugin - 2.7 - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - com.github.siom79.japicmp - japicmp-maven-plugin - 0.14.1 - - - - ${project.build.directory}/${project.build.finalName}.${project.packaging} - - - - true - true - - no.digipost - - - + 2.16.1 - - - maven-compiler-plugin - 3.8.1 - - ${maven.compiler.source} - ${maven.compiler.target} - - - - maven-dependency-plugin - 3.1.2 - - - - analyze-only - - - true - true - - - - - - com.mycila - license-maven-plugin - 3.0 - -
domain/src/main/license-header.txt
- true - - LICENCE* - NOTICE - .github/**/*.yml - **/*.html - **/*.xml - **/*.log - **/*.txt - **/*.pem - **/*.cer - **/*.response - **/logging.properties - .editorconfig - .java-version - .drone.yml - .mvn/maven.config - - - - - check-license-header - - check - - test - - - - - org.jasig.maven - maven-notice-plugin - 1.1.0 - - true - - test - - - - - - generate - - generate-resources - - - - - jakarta.xml.bind - jakarta.xml.bind-api - 2.3.2 - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - diff --git a/src/NOTICE.template b/src/NOTICE.template new file mode 100644 index 0000000..71d4300 --- /dev/null +++ b/src/NOTICE.template @@ -0,0 +1,11 @@ +Peppol BIS Billing 3 generator + +Copyright 2024 Posten Bring AS. All Rights Reserved. + +This product includes software developed by Posten Bring AS. - https://www.posten.no/ +Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html + + +This software includes third party software subject to the following licenses: + +#GENERATED_NOTICES# diff --git a/validation/NOTICE b/validation/NOTICE index 2ad3a6d..9f291c1 100644 --- a/validation/NOTICE +++ b/validation/NOTICE @@ -1,30 +1,27 @@ -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: +Peppol BIS Billing 3 generator -http://www.apache.org/licenses/LICENSE-2.0 +Copyright 2024 Posten Bring AS. All Rights Reserved. -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. +This product includes software developed by Posten Bring AS. - https://www.posten.no/ +Licensed under Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.html + + +This software includes third party software subject to the following licenses: -This project includes: Apache Commons Codec under Apache License, Version 2.0 Apache HttpClient under Apache License, Version 2.0 Apache HttpComponents Core HTTP/1.1 under Apache License, Version 2.0 Apache HttpComponents Core HTTP/2 under Apache License, Version 2.0 Eaxy Easy XML library under The Apache Licence, version 2.0 FindBugs-jsr305 under The Apache Software License, Version 2.0 - Jakarta Activation API jar under EDL 1.0 + Jakarta Activation API under EDL 1.0 Jakarta XML Binding API under Eclipse Distribution License - v 1.0 jsr305 under GNU Lesser Public License peppol-bis-billing-3-generator-domain under Apache License, Version 2.0 peppol-bis-billing-3-generator-validation under Apache License, Version 2.0 ph-cii-d16b under Apache 2 ph-commons under Apache 2 + ph-diver-api under Apache 2 ph-jaxb under Apache 2 ph-jaxb-adapter under Apache 2 ph-schematron-api under Apache 2 @@ -32,6 +29,7 @@ This project includes: ph-schematron-schxslt under Apache 2 ph-schematron-xslt under Apache 2 ph-ubl21 under Apache 2 + ph-ubl23 under Apache 2 ph-xml under Apache 2 ph-xsds-ccts-cct-schemamodule under Apache 2 ph-xsds-xades132 under Apache 2 @@ -39,11 +37,10 @@ This project includes: ph-xsds-xml under Apache 2 ph-xsds-xmldsig under Apache 2 phive-api under Apache 2 - phive-engine under Apache 2 phive-rules-peppol under Apache 2 + phive-xml under Apache 2 Saxon-HE under Mozilla Public License Version 2.0 SchXslt Core under MIT License SLF4J API Module under MIT License - XML Commons External Components XML APIs under The Apache Software License, Version 2.0 or The SAX License or The W3C License XML Resolver under Apache License version 2.0 diff --git a/validation/pom.xml b/validation/pom.xml index 868e54f..07f79c3 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -21,23 +21,28 @@ com.helger.commons ph-commons - 11.0.1 + 11.1.6 com.helger.phive.rules phive-rules-peppol - 2.1.18 + 3.1.12 compile + + com.helger.diver + ph-diver-api + 1.2.0 + com.helger.phive - phive-engine - 7.2.4 + phive-xml + 9.2.2 com.helger.phive phive-api - 7.2.4 + 9.2.2 org.eaxy diff --git a/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java b/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java index c6afa35..9a67315 100644 --- a/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java +++ b/validation/src/main/java/peppol/bis/invoice3/validation/DefaultPeppolBilling3Validation.java @@ -17,16 +17,16 @@ import com.helger.commons.error.list.ErrorList; import com.helger.commons.io.resource.inmemory.ReadableResourceString; +import com.helger.diver.api.version.VESID; import com.helger.phive.api.execute.ValidationExecutionManager; import com.helger.phive.api.executorset.IValidationExecutorSet; -import com.helger.phive.api.executorset.VESID; +import com.helger.phive.api.executorset.IValidationExecutorSetRegistry; import com.helger.phive.api.executorset.ValidationExecutorSetRegistry; import com.helger.phive.api.result.ValidationResultList; -import com.helger.phive.engine.source.IValidationSourceXML; -import com.helger.phive.engine.source.ValidationSourceXML; import com.helger.phive.peppol.PeppolValidation; -import com.helger.phive.peppol.PeppolValidation3_14_0; -import com.helger.phive.peppol.PeppolValidation3_15_0; +import com.helger.phive.peppol.PeppolValidation2024_05; +import com.helger.phive.xml.source.IValidationSourceXML; +import com.helger.phive.xml.source.ValidationSourceXML; import org.eaxy.Document; import peppol.bis.invoice3.domain.BillingCommon; import peppol.bis.invoice3.domain.CreditNote; @@ -41,15 +41,15 @@ public class DefaultPeppolBilling3Validation implements PeppolBilling3Validation { - private static ValidationExecutorSetRegistry validationExecutorSetRegistry; + private static IValidationExecutorSetRegistry validationExecutorSetRegistry; private static VESID vesid_invoice; private static VESID vesid_creditNote; { if (vesid_invoice == null) - DefaultPeppolBilling3Validation.setVesid_invoice(PeppolValidation3_15_0.VID_OPENPEPPOL_INVOICE_UBL_V3); + DefaultPeppolBilling3Validation.setVesid_invoice(PeppolValidation2024_05.VID_OPENPEPPOL_INVOICE_UBL_V3); if (vesid_creditNote == null) - DefaultPeppolBilling3Validation.setVesid_creditNote(PeppolValidation3_15_0.VID_OPENPEPPOL_CREDIT_NOTE_UBL_V3); + DefaultPeppolBilling3Validation.setVesid_creditNote(PeppolValidation2024_05.VID_OPENPEPPOL_CREDIT_NOTE_UBL_V3); } @Override @@ -86,7 +86,7 @@ public ValidationResult isValid(Document billingDocument) { private ValidationResult doValidation(IValidationExecutorSet aVES, String s) { // Shortcut introduced in v6 - final ValidationSourceXML validationSourceXML = ValidationSourceXML.create(new ReadableResourceString(s, StandardCharsets.UTF_8)); + final IValidationSourceXML validationSourceXML = ValidationSourceXML.create(new ReadableResourceString(s, StandardCharsets.UTF_8)); final ValidationResultList vResult = ValidationExecutionManager.executeValidation(aVES, validationSourceXML); if (vResult.containsAtLeastOneError()) {