diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index dd2b4ad7c2..e6838a2b28 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/packinfolder.app.launch b/org.adempiere.base-feature/packinfolder.app.launch
index 1acbdd9d81..d2edb0562b 100644
--- a/org.adempiere.base-feature/packinfolder.app.launch
+++ b/org.adempiere.base-feature/packinfolder.app.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/sign.database.build.launch b/org.adempiere.base-feature/sign.database.build.launch
index 40ad67d03e..b51d6c63ee 100644
--- a/org.adempiere.base-feature/sign.database.build.launch
+++ b/org.adempiere.base-feature/sign.database.build.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/synchronize-terminology.app.launch b/org.adempiere.base-feature/synchronize-terminology.app.launch
index b6a07d8a08..cb7b16e30a 100644
--- a/org.adempiere.base-feature/synchronize-terminology.app.launch
+++ b/org.adempiere.base-feature/synchronize-terminology.app.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.base-feature/translation.app.launch b/org.adempiere.base-feature/translation.app.launch
index c29f1e6368..94581fd6b1 100644
--- a/org.adempiere.base-feature/translation.app.launch
+++ b/org.adempiere.base-feature/translation.app.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index eb36e3b5a9..22b2f87cb5 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -462,20 +462,6 @@
version="0.0.0"
unpack="false"/>
-
-
-
-
- Conscrypt
+
/
diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product
index dfde27e5f0..c34a365055 100644
--- a/org.adempiere.server-feature/server.product
+++ b/org.adempiere.server-feature/server.product
@@ -51,7 +51,6 @@
-
diff --git a/org.adempiere.server-feature/server.product.functionaltest.launch b/org.adempiere.server-feature/server.product.functionaltest.launch
index be6cf991a3..2e019a0a94 100644
--- a/org.adempiere.server-feature/server.product.functionaltest.launch
+++ b/org.adempiere.server-feature/server.product.functionaltest.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 86e2e61e14..b94458220f 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.adempiere.ui.swing-feature/swingclient.product.launch b/org.adempiere.ui.swing-feature/swingclient.product.launch
index a3b8a67a46..fc005e5bf5 100644
--- a/org.adempiere.ui.swing-feature/swingclient.product.launch
+++ b/org.adempiere.ui.swing-feature/swingclient.product.launch
@@ -27,7 +27,7 @@
-
+
diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
index f4c672f4d5..178c389d63 100644
--- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
+++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml
@@ -19,7 +19,6 @@
1.2.5
2.5.3
1.60
- 1.4.2
2.9.8
3.1.4
1.1.0.Final
@@ -390,26 +389,11 @@
false
-
- org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version}
-
- false
-
org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}
false
-
- org.conscrypt:conscrypt-openjdk-uber:jar:${jetty.conscrypt.openjdk.uber.version}
-
- false
-
- org.conscrypt;version="${jetty.conscrypt.openjdk.uber.version}"
- org.idempiere.org.conscrypt.openjdk-uber
- org.idempiere.org.conscrypt.openjdk-uber
-
-
org.slf4j:slf4j-api:jar:${slf4j.version}
@@ -1398,11 +1382,6 @@
true
-
- org.eclipse.jetty:jetty-alpn-conscrypt-server:jar:${jetty.version}
-
- false
-
org.eclipse.jetty:jetty-alpn-openjdk8-server:jar:${jetty.version}
diff --git a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
index a1bdb60755..3ec518e83e 100644
--- a/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
+++ b/org.idempiere.p2.targetplatform/org.idempiere.p2.targetplatform.target
@@ -1128,8 +1128,6 @@
-
-
@@ -1214,8 +1212,6 @@
-
-
diff --git a/org.idempiere.p2/server.product b/org.idempiere.p2/server.product
index 4d428a7067..755bef987c 100644
--- a/org.idempiere.p2/server.product
+++ b/org.idempiere.p2/server.product
@@ -51,7 +51,6 @@
-