HK2 groupId change. (#22684)
* HK2 groupId change.
* solving build failure.
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 01cd7ca..583dbec 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -680,7 +680,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -1083,7 +1083,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -1709,7 +1709,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>tiger-types</artifactId>
<version>${project.version}</version>
<optional>true</optional>
diff --git a/appserver/extras/embedded/nucleus/pom.xml b/appserver/extras/embedded/nucleus/pom.xml
index fe1951b..29860e5 100644
--- a/appserver/extras/embedded/nucleus/pom.xml
+++ b/appserver/extras/embedded/nucleus/pom.xml
@@ -115,7 +115,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -227,7 +227,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
<optional>true</optional>
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index 6020242..22fe502 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -510,7 +510,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -906,7 +906,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
<optional>true</optional>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index d03b53b..739bc25 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -117,7 +117,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -237,7 +237,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -1372,7 +1372,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>tiger-types</artifactId>
<version>${project.version}</version>
<optional>true</optional>
diff --git a/nucleus/common/internal-api/pom.xml b/nucleus/common/internal-api/pom.xml
index 3dd975f..6c8e52a 100644
--- a/nucleus/common/internal-api/pom.xml
+++ b/nucleus/common/internal-api/pom.xml
@@ -24,10 +24,10 @@
<artifactId>nucleus-common</artifactId>
<version>5.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
- </parent>
+ </parent>
<artifactId>internal-api</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>Private APIs of Glassfish</name>
<build>
@@ -68,7 +68,7 @@
<artifactId>hk2</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
</dependency>
@@ -87,12 +87,12 @@
<groupId>org.glassfish.main.admin</groupId>
<artifactId>config-api</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.main.common</groupId>
<artifactId>common-util</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.main.grizzly</groupId>
<artifactId>nucleus-grizzly-all</artifactId>
@@ -100,7 +100,7 @@
<!-- grizzly was bringing in the following old hk2 jar that we don't want on the classpath -->
<exclusions>
<exclusion>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
</exclusion>
</exclusions>
@@ -112,4 +112,3 @@
</dependency>
</dependencies>
</project>
-
diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml
index 0a655da..7b15495 100644
--- a/nucleus/featuresets/atomic/pom.xml
+++ b/nucleus/featuresets/atomic/pom.xml
@@ -182,7 +182,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -203,7 +203,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>tiger-types</artifactId>
<version>${project.version}</version>
<exclusions>
@@ -492,7 +492,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/nucleus/grizzly/config/pom.xml b/nucleus/grizzly/config/pom.xml
index 09bb1cc..9e40597 100644
--- a/nucleus/grizzly/config/pom.xml
+++ b/nucleus/grizzly/config/pom.xml
@@ -42,7 +42,7 @@
<useSystemClassLoader>true</useSystemClassLoader>
<forkMode>always</forkMode>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -74,12 +74,12 @@
<artifactId>hk2</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-types</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/nucleus/hk2/config-generator/pom.xml b/nucleus/hk2/config-generator/pom.xml
index ca0b488..6991028 100644
--- a/nucleus/hk2/config-generator/pom.xml
+++ b/nucleus/hk2/config-generator/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>glassfish-nucleus-hk2</artifactId>
<version>5.0.1-SNAPSHOT</version>
</parent>
@@ -57,7 +57,7 @@
<version>${hk2.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/nucleus/hk2/config-types/pom.xml b/nucleus/hk2/config-types/pom.xml
index f4d223c..9fb03cd 100644
--- a/nucleus/hk2/config-types/pom.xml
+++ b/nucleus/hk2/config-types/pom.xml
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>glassfish-nucleus-hk2</artifactId>
<version>5.0.1-SNAPSHOT</version>
</parent>
@@ -27,7 +27,7 @@
<artifactId>config-types</artifactId>
<name>HK2 config types</name>
<packaging>glassfish-jar</packaging>
-
+
<build>
<plugins>
<plugin>
@@ -44,7 +44,7 @@
</executions>
</plugin>
<plugin>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-generator</artifactId>
<version>${project.version}</version>
<configuration>
@@ -75,7 +75,7 @@
<dependencies>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>hk2-config</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml
index 65a0822..d057b60 100644
--- a/nucleus/hk2/hk2-config/pom.xml
+++ b/nucleus/hk2/hk2-config/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>glassfish-nucleus-hk2</artifactId>
<version>5.0.1-SNAPSHOT</version>
</parent>
@@ -108,7 +108,7 @@
<version>${hk2.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>tiger-types</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/nucleus/hk2/pom.xml b/nucleus/hk2/pom.xml
index 0726b87..d3c67d8 100755
--- a/nucleus/hk2/pom.xml
+++ b/nucleus/hk2/pom.xml
@@ -25,7 +25,7 @@
<version>5.0.1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>glassfish-nucleus-hk2</artifactId>
<packaging>pom</packaging>
<name>Glassfish Nucleus HK2 Modules</name>
diff --git a/nucleus/hk2/tiger-types/pom.xml b/nucleus/hk2/tiger-types/pom.xml
index 99ae9c5..1921621 100644
--- a/nucleus/hk2/tiger-types/pom.xml
+++ b/nucleus/hk2/tiger-types/pom.xml
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>glassfish-nucleus-hk2</artifactId>
<version>5.0.1-SNAPSHOT</version>
</parent>
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index 6019123..5370e1c 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -31,7 +31,7 @@
<version>5.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GlassFish Nucleus Project</name>
-
+
<description>Glassfish Nucleus Project</description>
<url>https://projects.eclipse.org/projects/ee4j.glassfish</url>
@@ -93,7 +93,7 @@
<pluginManagement>
<plugins>
<plugin>
- <groupId>org.glassfish.hk2</groupId>
+ <groupId>org.glassfish.main.hk2</groupId>
<artifactId>config-generator</artifactId>
<version>${project.version}</version>
</plugin>
@@ -124,6 +124,7 @@
<plugin>
<groupId>org.glassfish.hk2</groupId>
<artifactId>config-generator</artifactId>
+ <version>2.5.0-b53</version>
<configuration>
<excludes>**/.ade_path/**</excludes>
<supportedProjectTypes>jar,glassfish-jar</supportedProjectTypes>
