From ecbfd42e82bf830abdb619238ef65931b404f852 Mon Sep 17 00:00:00 2001
From: kapil-agnihotri <kapil.agnihotri@wetransform.to>
Date: Fri, 18 Nov 2022 12:12:48 +0100
Subject: [PATCH] build: exclude org.deegree bundle from hale.product and
 tests.product

ING-3267
---
 build/build.gradle                                          | 6 +++++-
 build/gradle/commitAndProductionStage.gradle                | 1 -
 .../plugins/eu.esdihumboldt.hale.common.test/Tests.product  | 2 --
 ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/build.gradle b/build/build.gradle
index f7083cff1d..231152bfb0 100644
--- a/build/build.gradle
+++ b/build/build.gradle
@@ -131,7 +131,11 @@ ext {
 		'eu.esdihumboldt.hale.common.cache.test',
 		'eu.esdihumboldt.util.blueprints.entities.test',
 		'eu.esdihumboldt.hale.io.oml',
-		'eu.esdihumboldt.hale.io.oml.test'
+		'eu.esdihumboldt.hale.io.oml.test',
+		// exclude them because org.deegree needs to be updated with jaxb dependencies
+		'eu.esdihumboldt.hale.io.deegree',
+		'eu.esdihumboldt.hale.io.deegree.ui',
+		'eu.esdihumboldt.hale.io.deegree.test'
 	]
 
 	// bundles or fragments that are required additionally for compilation
diff --git a/build/gradle/commitAndProductionStage.gradle b/build/gradle/commitAndProductionStage.gradle
index 85053d4b38..829108a0f6 100644
--- a/build/gradle/commitAndProductionStage.gradle
+++ b/build/gradle/commitAndProductionStage.gradle
@@ -1107,7 +1107,6 @@ task packageProduct(dependsOn: buildProduct) {
  */
 def runTests(args = []) {
 	def productOutputPath = new File(buildDir, getProductUid())
-	//def launcherName = project.ext.testProductLauncher?:'eclipse'
 	def launcherName = project.ext.testProductLauncher?:'eclipse'
 	def testReportDir = project.file('target/testReports')
 	testReportDir.mkdirs()
diff --git a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
index c31c3b1a40..a01c7a35aa 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
+++ b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
@@ -219,8 +219,6 @@
       <plugin id="eu.esdihumboldt.hale.io.codelist.xml.test" fragment="true"/>
       <plugin id="eu.esdihumboldt.hale.io.csv"/>
       <plugin id="eu.esdihumboldt.hale.io.csv.test" fragment="true"/>
-      <plugin id="eu.esdihumboldt.hale.io.deegree"/>
-      <plugin id="eu.esdihumboldt.hale.io.deegree.test" fragment="true"/>
       <plugin id="eu.esdihumboldt.hale.io.geopackage"/>
       <plugin id="eu.esdihumboldt.hale.io.geopackage.test"/>
       <plugin id="eu.esdihumboldt.hale.io.gml"/>
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product b/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product
index 2c5bad9d2c..dbe9838101 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product
@@ -100,7 +100,6 @@ https://www.wetransform.to/services/support/
       <feature id="eu.esdihumboldt.hale.ui.feature.updates"/>
       <feature id="eu.esdihumboldt.hale.io.feature.msaccess"/>
       <feature id="eu.esdihumboldt.hale.io.feature.mssql"/>
-      <feature id="eu.esdihumboldt.hale.io.feature.deegree"/>
       <feature id="org.eclipse.equinox.core.sdk"/>
       <feature id="org.eclipse.equinox.p2.core.feature"/>
       <feature id="org.eclipse.ecf.core.feature"/>