From 5af30011225bf4fecec9d75f58ad35a4ea2c7211 Mon Sep 17 00:00:00 2001 From: Douglas Palmer Date: Tue, 18 Jun 2024 12:54:00 -0700 Subject: [PATCH] Check if OSGI metadata can be removed entirely Closes #29104 Signed-off-by: Douglas Palmer --- adapters/spi/adapter-spi/pom.xml | 44 ----------------- adapters/spi/undertow-adapter-spi/pom.xml | 46 ------------------ authz/client/pom.xml | 48 ------------------- common/pom.xml | 40 ---------------- core/pom.xml | 40 ---------------- .../release_notes/topics/26_0_0.adoc | 4 ++ pom.xml | 35 -------------- 7 files changed, 4 insertions(+), 253 deletions(-) diff --git a/adapters/spi/adapter-spi/pom.xml b/adapters/spi/adapter-spi/pom.xml index cad99b9e45..8c2206c57d 100755 --- a/adapters/spi/adapter-spi/pom.xml +++ b/adapters/spi/adapter-spi/pom.xml @@ -33,13 +33,6 @@ 11 - - org.keycloak.adapters.spi.* - - - org.keycloak.*;version="${project.version}", - *;resolution:=optional - @@ -59,41 +52,4 @@ test - - - - - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - bundle-manifest - process-classes - - manifest - - - - - - . - ${project.name} - ${project.groupId}.${project.artifactId} - ${keycloak.osgi.import} - ${keycloak.osgi.export} - - - - - - diff --git a/adapters/spi/undertow-adapter-spi/pom.xml b/adapters/spi/undertow-adapter-spi/pom.xml index 2b66f60cd9..15c552398f 100755 --- a/adapters/spi/undertow-adapter-spi/pom.xml +++ b/adapters/spi/undertow-adapter-spi/pom.xml @@ -33,14 +33,6 @@ 11 - - org.keycloak.adapters.undertow.* - - - io.undertow.*;version="[1.4,3)", - *;resolution:=optional - - ${project.groupId}.keycloak-undertow-adapter @@ -78,42 +70,4 @@ test - - - - - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - bundle-manifest - process-classes - - manifest - - - - - - . - ${project.name} - ${project.groupId}.${project.artifactId} - ${keycloak.osgi.import} - ${keycloak.osgi.export} - ${keycloak.osgi.fragment} - - - - - - diff --git a/authz/client/pom.xml b/authz/client/pom.xml index 342294ebed..c7558dca65 100644 --- a/authz/client/pom.xml +++ b/authz/client/pom.xml @@ -17,16 +17,6 @@ Keycloak Authz: Client API KeyCloak AuthZ: Client API - - - org.keycloak.authorization.client.* - - - org.keycloak.*;version="${project.version}", - *;resolution:=optional - - - org.keycloak @@ -62,42 +52,4 @@ provided - - - - - - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - bundle-manifest - process-classes - - manifest - - - - - - . - ${project.name} - ${project.groupId}.${project.artifactId} - ${keycloak.osgi.import} - ${keycloak.osgi.export} - - - - - - diff --git a/common/pom.xml b/common/pom.xml index 84ba888537..5f9f4b628e 100755 --- a/common/pom.xml +++ b/common/pom.xml @@ -36,12 +36,6 @@ 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm - - org.keycloak.common.* - - - *;resolution:=optional - @@ -72,40 +66,6 @@ true - - - - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - org.apache.felix - maven-bundle-plugin - true - - - bundle-manifest - process-classes - - manifest - - - - - - . - ${project.name} - ${project.groupId}.${project.artifactId} - ${keycloak.osgi.import} - ${keycloak.osgi.export} - - - - diff --git a/core/pom.xml b/core/pom.xml index 04643f931c..ad6d1a04b1 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -36,12 +36,6 @@ 11 ${maven.build.timestamp} yyyy-MM-dd HH:mm - - org.keycloak.* - - - *;resolution:=optional - @@ -103,15 +97,6 @@ - - org.apache.felix - maven-bundle-plugin - - - <_fixupmessages>"Classes found in the wrong directory";is:=warning - - - @@ -125,12 +110,10 @@ - maven-jar-plugin - ${project.build.outputDirectory}/META-INF/MANIFEST.MF true @@ -144,29 +127,6 @@ - - org.apache.felix - maven-bundle-plugin - true - - - bundle-manifest - process-classes - - manifest - - - - - - . - ${project.name} - ${project.groupId}.${project.artifactId} - ${keycloak.osgi.import} - ${keycloak.osgi.export} - - - diff --git a/docs/documentation/release_notes/topics/26_0_0.adoc b/docs/documentation/release_notes/topics/26_0_0.adoc index d155c749ce..82b6009f2d 100644 --- a/docs/documentation/release_notes/topics/26_0_0.adoc +++ b/docs/documentation/release_notes/topics/26_0_0.adoc @@ -9,6 +9,10 @@ to different organizations. When creating a social broker, you should now provide an `Alias` and optionally a `Display name` just like any other broker. += Removal of OSGi metadata + +Since all of the Java adapters that used OSGi metadata have been removed we have stopped generating OSGi metadata for our jars. + = Infinispan marshalling changes to Infinispan Protostream Marshalling is the process of converting Java objects into bytes to send them across the network between {project_name} servers. diff --git a/pom.xml b/pom.xml index 056a7b45f0..e856977551 100644 --- a/pom.xml +++ b/pom.xml @@ -152,10 +152,6 @@ 1.1 4.25.1 - - 6.0.0 - 5.0.0 - 7.4.6 1.0.2.Final 2.0.0.Final 4.1.2 @@ -194,7 +190,6 @@ 7.5.Final 1.9.0 1.0.4 - 5.1.8 5.0.0.Final 1.6.13 1.15.0 @@ -891,31 +886,6 @@ - - org.osgi - osgi.core - ${osgi.version} - - - org.osgi - org.osgi.enterprise - ${osgi.enterprise.version} - - - org.ops4j.pax.web - pax-web-runtime - ${pax.web.version} - - - org.ops4j.pax.web - pax-web-api - ${pax.web.version} - - - org.ops4j.pax.web - pax-web-spi - ${pax.web.version} - @@ -1638,11 +1608,6 @@ target/verifier/verifications.xml - - org.apache.felix - maven-bundle-plugin - ${osgi.bundle.plugin.version} - org.apache.maven.plugins maven-clean-plugin