From 46c933e0d5920fdf4d5abbcdb290babcc3f9825d Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Mar 2023 17:29:09 +0100
Subject: [PATCH] Move crypto to selectable A2 (FIPS or full)

---
 repackage/Makefile                                            | 4 ++--
 .../org.argeo.tp.crypto}/bouncycastle/bc-fips.bnd.disabled    | 0
 .../fips/org.argeo.tp.crypto}/bouncycastle/bc-noncert.bnd     | 0
 .../fips/org.argeo.tp.crypto}/bouncycastle/bcmail-fips.bnd    | 0
 .../fips/org.argeo.tp.crypto}/bouncycastle/bcpg-fips.bnd      | 0
 .../fips/org.argeo.tp.crypto}/bouncycastle/bcpkix-fips.bnd    | 0
 .../fips/org.argeo.tp.crypto}/bouncycastle/bctls-fips.bnd     | 0
 .../fips/org.argeo.tp.crypto}/bouncycastle/common.bnd         | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/bcmail.bnd         | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/bcpg.bnd           | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd         | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/bcprov.bnd         | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/bctls.bnd          | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/bcutil.bnd         | 0
 .../full}/org.argeo.tp.crypto/bouncycastle/common.bnd         | 0
 .../full}/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd        | 0
 repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd            | 2 +-
 sdk/argeo-build                                               | 2 +-
 sdk/output-argeo-tp-minimal.target                            | 1 +
 19 files changed, 5 insertions(+), 4 deletions(-)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/bc-fips.bnd.disabled (100%)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/bc-noncert.bnd (100%)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/bcmail-fips.bnd (100%)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/bcpg-fips.bnd (100%)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/bcpkix-fips.bnd (100%)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/bctls-fips.bnd (100%)
 rename repackage/{org.argeo.tp.fips => crypto/fips/org.argeo.tp.crypto}/bouncycastle/common.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/bcmail.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/bcpg.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/bcprov.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/bctls.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/bcutil.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/bouncycastle/common.bnd (100%)
 rename repackage/{ => crypto/full}/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd (100%)

diff --git a/repackage/Makefile b/repackage/Makefile
index 799cbfd..bfee248 100644
--- a/repackage/Makefile
+++ b/repackage/Makefile
@@ -16,13 +16,13 @@ lib/macosx/x86_64/swt/rcp/org.argeo.tp.swt.workbench \
 swt/rcp/org.argeo.tp.swt \
 swt/rcp/org.argeo.tp.swt.workbench \
 org.argeo.tp \
-org.argeo.tp.crypto \
 org.argeo.tp.jetty \
 org.argeo.tp.utils \
 org.argeo.tp.jcr \
 org.argeo.tp.poi \
 org.argeo.tp.gis \
-org.argeo.tp.fips \
+crypto/full/org.argeo.tp.crypto \
+crypto/fips/org.argeo.tp.crypto \
 
 # NOTE: FIPS support is experimental, in order to preapre for the 2.0.0 stream
 # see https://www.bouncycastle.org/fips_java_roadmap.html
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/bc-fips.bnd.disabled b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/bc-fips.bnd.disabled
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-fips.bnd.disabled
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/bc-noncert.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/bc-noncert.bnd
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bc-noncert.bnd
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/bcmail-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcmail-fips.bnd
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/bcmail-fips.bnd
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcmail-fips.bnd
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/bcpg-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpg-fips.bnd
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/bcpg-fips.bnd
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpg-fips.bnd
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/bcpkix-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpkix-fips.bnd
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/bcpkix-fips.bnd
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bcpkix-fips.bnd
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/bctls-fips.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/bctls-fips.bnd
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/bctls-fips.bnd
diff --git a/repackage/org.argeo.tp.fips/bouncycastle/common.bnd b/repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
similarity index 100%
rename from repackage/org.argeo.tp.fips/bouncycastle/common.bnd
rename to repackage/crypto/fips/org.argeo.tp.crypto/bouncycastle/common.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcmail.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpg.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcpkix.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcprov.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bctls.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bctls.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/bctls.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bctls.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/bcutil.bnd
diff --git a/repackage/org.argeo.tp.crypto/bouncycastle/common.bnd b/repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/bouncycastle/common.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/bouncycastle/common.bnd
diff --git a/repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd b/repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
similarity index 100%
rename from repackage/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
rename to repackage/crypto/full/org.argeo.tp.crypto/net.i2p.crypto.eddsa.bnd
diff --git a/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd b/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd
index a8e02bb..7bffea2 100644
--- a/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd
+++ b/repackage/osgi/api/org.argeo.tp.osgi/osgi.core.bnd
@@ -1,3 +1,3 @@
-Argeo-Origin-M2: org.osgi:osgi.core:7.0.0
+Argeo-Origin-M2: org.osgi:osgi.core:8.0.0
 Argeo-Origin-NoMetadataGeneration: true
 SPDX-License-Identifier: Apache-2.0
diff --git a/sdk/argeo-build b/sdk/argeo-build
index 949c81c..fd34494 160000
--- a/sdk/argeo-build
+++ b/sdk/argeo-build
@@ -1 +1 @@
-Subproject commit 949c81c657e02d1dde8a83f5651000f39db53b4d
+Subproject commit fd3449421a3d3e61756cc1ed8bd6e698ecd9eb11
diff --git a/sdk/output-argeo-tp-minimal.target b/sdk/output-argeo-tp-minimal.target
index b15e79b..9a0cdca 100644
--- a/sdk/output-argeo-tp-minimal.target
+++ b/sdk/output-argeo-tp-minimal.target
@@ -7,6 +7,7 @@
 		<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.jetty" type="Directory"/>
 		<location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
+		<location path="${project_loc:argeo-tp}/../output/a2/crypto/fips/org.argeo.tp.crypto" 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