From f2dda6565727560aa85c25abeaa1c297b6a9093b Mon Sep 17 00:00:00 2001
From: Rune Flobakk <flobakk@gmail.com>
Date: Fri, 5 May 2023 11:07:52 +0200
Subject: [PATCH] Make Hibernate Validator optional dependency

Not needed to use the library with digipost-api-client-java, and should
be provided yourself if you wish to perform Bean validation on the
created instances.
---
 NOTICE  |  5 +++--
 pom.xml | 31 ++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/NOTICE b/NOTICE
index 81ea620..ffe5cf0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -12,16 +12,17 @@ specific language governing permissions and limitations
 under the License.
 
 This project includes:
+  Bean Validation API under Apache License 2.0
   ClassMate under The Apache Software License, Version 2.0
   Digipost Data Types under The Apache Software License, Version 2.0
   Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0
+  Expression Language 3.0 API under CDDL + GPLv2 with classpath exception
   Hibernate Validator Engine under Apache License 2.0
   Jackson datatype: JSR310 under The Apache Software License, Version 2.0
   Jackson-annotations under The Apache Software License, Version 2.0
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
-  Jakarta Bean Validation API under Apache License 2.0
-  Jakarta Expression Language 3.0 under EPL 2.0 or GPL2 w/ CPE
+  Jakarta Expression Language 3.0 Implementation under EPL 2.0 or GPL2 w/ CPE
   JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
   jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JBoss Logging 3 under Apache License, version 2.0
diff --git a/pom.xml b/pom.xml
index 2a13df6..15a06bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,21 +68,42 @@
             <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-            <version>2.0.2</version>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <version>6.1.5.Final</version>
             <scope>runtime</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.validation</groupId>
+                    <artifactId>jakarta.validation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.el</artifactId>
+            <groupId>com.sun.el</groupId>
+            <artifactId>el-ri</artifactId>
             <version>3.0.4</version>
             <scope>runtime</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.el</groupId>
+                    <artifactId>jakarta.el-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.el</groupId>
+            <artifactId>javax.el-api</artifactId>
+            <version>3.0.0</version>
+            <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>