From c43cefd0c94bb457241e17bc0d1f8ef7a6e540a5 Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Tue, 26 Oct 2021 23:53:44 +0800
Subject: [PATCH] IDEMPIERE-5016 idempiere-rest plugin doesn't start with
 iDempiere 8.2z (master) #83  (#949)

* IDEMPIERE-5016 idempiere-rest plugin doesn't start with iDempiere 8.2z (master) #83

* IDEMPIERE-5016 idempiere-rest plugin doesn't start with iDempiere 8.2z (master) #83
---
 org.adempiere.server-feature/feature.xml                  | 7 +++++++
 org.adempiere.server-feature/server.product.launch        | 3 ++-
 org.idempiere.p2.targetplatform/maven.locations.xml       | 6 ++++++
 .../org.idempiere.p2.targetplatform.target                | 8 +++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 9ee12cd0e9..6d60298445 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -645,4 +645,11 @@
          fragment="true"
          unpack="false"/>
 
+   <plugin
+         id="jakarta.validation.jakarta.validation-api"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 06c4f87296..d1e4f62fbc 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -105,7 +105,6 @@
         <setEntry value="com.google.zxing.core@default:default"/>
         <setEntry value="com.ibm.icu@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.barbecue@default:default"/>
-        <setEntry value="org.apache.commons.digester@default:default"/>
         <setEntry value="com.jaspersoft.studio.bundles.itext@default:default"/>
         <setEntry value="com.sun.activation.jakarta.activation@default:default"/>
         <setEntry value="com.sun.istack.commons-runtime@default:default"/>
@@ -131,6 +130,7 @@
         <setEntry value="jakarta.jws-api@default:default"/>
         <setEntry value="jakarta.persistence-api@default:default"/>
         <setEntry value="jakarta.transaction-api@default:default"/>
+        <setEntry value="jakarta.validation.jakarta.validation-api@default:default"/>
         <setEntry value="jakarta.ws.rs-api@default:default"/>
         <setEntry value="jakarta.xml.bind-api@default:default"/>
         <setEntry value="jakarta.xml.soap-api@default:default"/>
@@ -158,6 +158,7 @@
         <setEntry value="org.apache.commons.commons-io@default:default"/>
         <setEntry value="org.apache.commons.commons-net@default:default"/>
         <setEntry value="org.apache.commons.commons-text@default:default"/>
+        <setEntry value="org.apache.commons.digester@default:default"/>
         <setEntry value="org.apache.commons.discovery@default:default"/>
         <setEntry value="org.apache.commons.lang3@default:default"/>
         <setEntry value="org.apache.commons.lang@default:default"/>
diff --git a/org.idempiere.p2.targetplatform/maven.locations.xml b/org.idempiere.p2.targetplatform/maven.locations.xml
index a76d6ba4d6..dc2cbd4e34 100644
--- a/org.idempiere.p2.targetplatform/maven.locations.xml
+++ b/org.idempiere.p2.targetplatform/maven.locations.xml
@@ -337,6 +337,12 @@ Export-Package:        *;-noimport:=true
       <artifactId>jakarta.xml.bind-api</artifactId>
       <version>2.3.3</version>
 	  <type>jar</type>
+    </location>
+    <location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>2.0.2</version>
+	  <type>jar</type>
     </location>				
 	<!-- org.bouncycastle -->
 	<location includeSource="true" missingManifest="generate" type="Maven">
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index a930945ff9..40fff5c98a 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="idempiere-210901" sequenceNumber="1633490563">
+<target name="idempiere-210901" sequenceNumber="1635250903">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="zcommon" version="9.6.0.1"/>
@@ -469,6 +469,12 @@ Export-Package:        *;-noimport:=true
       <artifactId>jakarta.xml.bind-api</artifactId>
       <version>2.3.3</version>
 	  <type>jar</type>
+    </location>
+    <location includeSource="true" missingManifest="generate" type="Maven">
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>2.0.2</version>
+	  <type>jar</type>
     </location>				
 	<!-- org.bouncycastle -->
 	<location includeSource="true" missingManifest="generate" type="Maven">