build: exclude org.deegree bundle from hale.product and tests.product

ING-3267
halestudio · Nov 18, 2022 · 44aef1d · 44aef1d
1 parent 28ec257
commit 44aef1d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/build/build.gradle b/build/build.gradle
@@ -131,7 +131,12 @@ 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',
+		'eu.esdihumboldt.hale.io.feature.deegree'
 	]
 
 	// bundles or fragments that are required additionally for compilation

diff --git 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
@@ -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
@@ -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"/>