From 163f5b9f412436d06d047da8998702e92305d5ee Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 14 Mar 2023 07:42:39 +0100
Subject: [PATCH] Adapt to changes in Argeo Build

---
 repackage/Makefile                                            | 3 +--
 repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd.disabled      | 3 ---
 .../org.eclipse.jdt.core.compiler.batch.bnd.disabled          | 4 ----
 sdk/argeo-build                                               | 2 +-
 sdk/output-argeo-tp-backend.target                            | 1 -
 sdk/output-argeo-tp-minimal.target                            | 2 +-
 6 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd.disabled
 delete mode 100644 repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd.disabled

diff --git a/repackage/Makefile b/repackage/Makefile
index eb92d8a..3f9bafd 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -26,7 +26,6 @@ org.argeo.tp \
 org.argeo.tp.crypto \
 org.argeo.tp.jetty \
 org.argeo.tp.utils \
-org.argeo.tp.sql \
 org.argeo.tp.jcr \
 org.argeo.tp.poi \
 org.argeo.tp.gis \
@@ -42,7 +41,7 @@ all: $(BUILD_BASE)/repackaged
 $(BUILD_BASE)/repackaged : CATEGORIES_TO_REPACKAGE = $(subst $(abspath $(BUILD_BASE))/,, $(subst to-repackage,, $?))
 $(BUILD_BASE)/repackaged : $(TODOS_REPACKAGE)
 	# TODO make it more configurable / centralise in Argeo Build
-	$(JVM) -cp $(A2_OUTPUT)/org.argeo.tp.log/org.argeo.tp.syslogger.2.3.jar:$(A2_OUTPUT)/org.argeo.tp.build/biz.aQute.bndlib.5.3.jar \
+	$(JVM) -cp $(A2_OUTPUT)/org.argeo.tp/org.argeo.tp.syslogger.2.3.jar:$(A2_OUTPUT)/org.argeo.tp.sdk/biz.aQute.bndlib.5.3.jar \
 	 $(SDK_SRC_BASE)/sdk/argeo-build/src/org/argeo/build/Repackage.java $(A2_OUTPUT) $(CATEGORIES_TO_REPACKAGE)
 	touch $(BUILD_BASE)/repackaged
 
diff --git a/repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd.disabled b/repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd.disabled
deleted file mode 100644
index 0fa851b..0000000
--- a/repackage/org.argeo.tp.sdk/biz.aQute.bndlib.bnd.disabled
+++ /dev/null
@@ -1,3 +0,0 @@
-Bundle-License: Apache-2.0
-SLC-Origin-M2: biz.aQute.bnd:biz.aQute.bndlib:5.3.0
-SLC-Origin-ManifestNotModified: true
diff --git a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd.disabled b/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd.disabled
deleted file mode 100644
index a6efcf8..0000000
--- a/repackage/org.argeo.tp.sdk/org.eclipse.jdt.core.compiler.batch.bnd.disabled
+++ /dev/null
@@ -1,4 +0,0 @@
-Bundle-License: EPL-2.0
-SLC-Origin-M2: org.eclipse.jdt:ecj:3.32.0
-SLC-Origin-ManifestNotModified: true
-Main-Class: org.eclipse.jdt.internal.compiler.batch.Main
\ No newline at end of file
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 02f40a2..00cb05e 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 02f40a2134db52ae2f19e1afb8d536de8f62a1f1
+Subproject commit 00cb05eb3acc5b6900320cc672ecd865114612a5
diff --git a/sdk/output-argeo-tp-backend.target b/sdk/output-argeo-tp-backend.target
index b5d3081..4b17b77 100644
--- a/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@ -7,7 +7,6 @@
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
-		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.build" type="Directory"/>
 		<location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
 	</locations>
diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target
index aebc112..1d96d16 100644
--- a/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@ -3,11 +3,11 @@
 <target name="argeo-tp-minimal">
 	<locations>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp" type="Directory"/>
-		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.log" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.osgi" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.crypto" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 	</locations>
 	<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
\ No newline at end of file
-- 
2.30.2