From 6a9f12d5ea87aaa869297c25aceec2c8be91477c Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Tue, 20 Dec 2022 17:58:04 +0100
Subject: [PATCH] bundles fixes

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 bundles/apidocs/pom.xml  | 18 ++++++++++++++++++
 bundles/examples/pom.xml |  2 +-
 docs/pom.xml             |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bundles/apidocs/pom.xml b/bundles/apidocs/pom.xml
index 539ca85c1b..ade60fc797 100644
--- a/bundles/apidocs/pom.xml
+++ b/bundles/apidocs/pom.xml
@@ -35,6 +35,12 @@
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>jakarta.activation</groupId>
+                    <artifactId>jakarta.activation-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
@@ -57,6 +63,12 @@
             <groupId>org.glassfish.jersey.connectors</groupId>
             <artifactId>jersey-apache-connector</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>
@@ -67,6 +79,12 @@
             <groupId>org.glassfish.jersey.connectors</groupId>
             <artifactId>jersey-grizzly-connector</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.connectors</groupId>
diff --git a/bundles/examples/pom.xml b/bundles/examples/pom.xml
index 63b1e4e238..c72f75ab36 100644
--- a/bundles/examples/pom.xml
+++ b/bundles/examples/pom.xml
@@ -735,7 +735,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>
diff --git a/docs/pom.xml b/docs/pom.xml
index 6af661940f..1a4d3791b5 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -154,7 +154,7 @@
                         <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                     </execution>
                 </executions>