Uptake Jakarta Dependencies: istack commons, GF, Copyright plugin & mimepull (#4002)
Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
index 76d8d9f..8cf5d2b 100644
--- a/containers/glassfish/jersey-gf-ejb/pom.xml
+++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -97,7 +97,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -114,6 +114,7 @@
<!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 5.x-->
<Import-Package>
com.sun.*;version="[4.0,6)",
+ javax.annotation.*;version="!",
org.glassfish.ejb.*;version="[4.0,6)",
org.glassfish.internal.*;version="[4.0,6)",
*
diff --git a/containers/grizzly2-http/pom.xml b/containers/grizzly2-http/pom.xml
index 67a6cd4..62da89e 100644
--- a/containers/grizzly2-http/pom.xml
+++ b/containers/grizzly2-http/pom.xml
@@ -47,7 +47,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/jdk-http/pom.xml b/containers/jdk-http/pom.xml
index 41c87bd..f9c3531 100644
--- a/containers/jdk-http/pom.xml
+++ b/containers/jdk-http/pom.xml
@@ -44,7 +44,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
diff --git a/containers/jersey-servlet-core/pom.xml b/containers/jersey-servlet-core/pom.xml
index 2cc2f48..66d184a 100644
--- a/containers/jersey-servlet-core/pom.xml
+++ b/containers/jersey-servlet-core/pom.xml
@@ -53,7 +53,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/jersey-servlet/pom.xml b/containers/jersey-servlet/pom.xml
index 31f63d1..ece557d 100644
--- a/containers/jersey-servlet/pom.xml
+++ b/containers/jersey-servlet/pom.xml
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/jetty-http/pom.xml b/containers/jetty-http/pom.xml
index 58d9ce2..ef109fb 100644
--- a/containers/jetty-http/pom.xml
+++ b/containers/jetty-http/pom.xml
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/netty-http/pom.xml b/containers/netty-http/pom.xml
index 0faf9d2..49dd223 100644
--- a/containers/netty-http/pom.xml
+++ b/containers/netty-http/pom.xml
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
diff --git a/containers/simple-http/pom.xml b/containers/simple-http/pom.xml
index 5642f10..40de25e 100644
--- a/containers/simple-http/pom.xml
+++ b/containers/simple-http/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>com.sun.istack</groupId>
- <artifactId>maven-istack-commons-plugin</artifactId>
+ <artifactId>istack-commons-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
