Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit 91e504f

Browse files
ankathurvinayvishal
ankathur
authored and
vinayvishal
committed
PR:Hk2 groupid change (#22603)
* group-id change for hk2 components * group-id change for hk2 components
1 parent 22d10dd commit 91e504f

File tree

13 files changed

+33
-34
lines changed

13 files changed

+33
-34
lines changed

‎appserver/extras/embedded/all/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@
704704
<optional>true</optional>
705705
</dependency>
706706
<dependency>
707-
<groupId>org.glassfish.hk2</groupId>
707+
<groupId>org.glassfish.main.hk2</groupId>
708708
<artifactId>hk2-config</artifactId>
709709
<version>${project.version}</version>
710710
<optional>true</optional>
@@ -1107,7 +1107,7 @@
11071107
<optional>true</optional>
11081108
</dependency>
11091109
<dependency>
1110-
<groupId>org.glassfish.hk2</groupId>
1110+
<groupId>org.glassfish.main.hk2</groupId>
11111111
<artifactId>config-types</artifactId>
11121112
<version>${project.version}</version>
11131113
<optional>true</optional>
@@ -1733,7 +1733,7 @@
17331733
<optional>true</optional>
17341734
</dependency>
17351735
<dependency>
1736-
<groupId>org.glassfish.hk2</groupId>
1736+
<groupId>org.glassfish.main.hk2</groupId>
17371737
<artifactId>tiger-types</artifactId>
17381738
<version>${project.version}</version>
17391739
<optional>true</optional>

‎appserver/extras/embedded/nucleus/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<optional>true</optional>
140140
</dependency>
141141
<dependency>
142-
<groupId>org.glassfish.hk2</groupId>
142+
<groupId>org.glassfish.main.hk2</groupId>
143143
<artifactId>hk2-config</artifactId>
144144
<version>${project.version}</version>
145145
<optional>true</optional>
@@ -251,7 +251,7 @@
251251
<optional>true</optional>
252252
</dependency>
253253
<dependency>
254-
<groupId>org.glassfish.hk2</groupId>
254+
<groupId>org.glassfish.main.hk2</groupId>
255255
<artifactId>config-types</artifactId>
256256
<version>${project.version}</version>
257257
<optional>true</optional>

‎appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
<optional>true</optional>
535535
</dependency>
536536
<dependency>
537-
<groupId>org.glassfish.hk2</groupId>
537+
<groupId>org.glassfish.main.hk2</groupId>
538538
<artifactId>hk2-config</artifactId>
539539
<version>${project.version}</version>
540540
<optional>true</optional>
@@ -930,7 +930,7 @@
930930
<optional>true</optional>
931931
</dependency>
932932
<dependency>
933-
<groupId>org.glassfish.hk2</groupId>
933+
<groupId>org.glassfish.main.hk2</groupId>
934934
<artifactId>config-types</artifactId>
935935
<version>${project.version}</version>
936936
<optional>true</optional>

‎appserver/extras/embedded/web/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<optional>true</optional>
142142
</dependency>
143143
<dependency>
144-
<groupId>org.glassfish.hk2</groupId>
144+
<groupId>org.glassfish.main.hk2</groupId>
145145
<artifactId>hk2-config</artifactId>
146146
<version>${project.version}</version>
147147
<optional>true</optional>
@@ -261,7 +261,7 @@
261261
<optional>true</optional>
262262
</dependency>
263263
<dependency>
264-
<groupId>org.glassfish.hk2</groupId>
264+
<groupId>org.glassfish.main.hk2</groupId>
265265
<artifactId>config-types</artifactId>
266266
<version>${project.version}</version>
267267
<optional>true</optional>
@@ -1396,7 +1396,7 @@
13961396
<optional>true</optional>
13971397
</dependency>
13981398
<dependency>
1399-
<groupId>org.glassfish.hk2</groupId>
1399+
<groupId>org.glassfish.main.hk2</groupId>
14001400
<artifactId>tiger-types</artifactId>
14011401
<version>${project.version}</version>
14021402
<optional>true</optional>

‎nucleus/common/internal-api/pom.xml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
<artifactId>nucleus-common</artifactId>
4949
<version>5.0.1-SNAPSHOT</version>
5050
<relativePath>../pom.xml</relativePath>
51-
</parent>
51+
</parent>
5252
<artifactId>internal-api</artifactId>
5353
<packaging>glassfish-jar</packaging>
54-
54+
5555
<name>Private APIs of Glassfish</name>
5656

5757
<build>
@@ -92,7 +92,7 @@
9292
<artifactId>hk2</artifactId>
9393
</dependency>
9494
<dependency>
95-
<groupId>org.glassfish.hk2</groupId>
95+
<groupId>org.glassfish.main.hk2</groupId>
9696
<artifactId>config-types</artifactId>
9797
<version>${project.version}</version>
9898
</dependency>
@@ -111,20 +111,20 @@
111111
<groupId>org.glassfish.main.admin</groupId>
112112
<artifactId>config-api</artifactId>
113113
<version>${project.version}</version>
114-
</dependency>
114+
</dependency>
115115
<dependency>
116116
<groupId>org.glassfish.main.common</groupId>
117117
<artifactId>common-util</artifactId>
118118
<version>${project.version}</version>
119-
</dependency>
119+
</dependency>
120120
<dependency>
121121
<groupId>org.glassfish.main.grizzly</groupId>
122122
<artifactId>nucleus-grizzly-all</artifactId>
123123
<version>${project.version}</version>
124124
<!-- grizzly was bringing in the following old hk2 jar that we don't want on the classpath -->
125125
<exclusions>
126126
<exclusion>
127-
<groupId>org.glassfish.hk2</groupId>
127+
<groupId>org.glassfish.main.hk2</groupId>
128128
<artifactId>config-types</artifactId>
129129
</exclusion>
130130
</exclusions>
@@ -136,4 +136,3 @@
136136
</dependency>
137137
</dependencies>
138138
</project>
139-

‎nucleus/featuresets/atomic/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
</exclusions>
207207
</dependency>
208208
<dependency>
209-
<groupId>org.glassfish.hk2</groupId>
209+
<groupId>org.glassfish.main.hk2</groupId>
210210
<artifactId>hk2-config</artifactId>
211211
<version>${project.version}</version>
212212
<exclusions>
@@ -227,7 +227,7 @@
227227
</exclusions>
228228
</dependency>
229229
<dependency>
230-
<groupId>org.glassfish.hk2</groupId>
230+
<groupId>org.glassfish.main.hk2</groupId>
231231
<artifactId>tiger-types</artifactId>
232232
<version>${project.version}</version>
233233
<exclusions>
@@ -516,7 +516,7 @@
516516
</exclusions>
517517
</dependency>
518518
<dependency>
519-
<groupId>org.glassfish.hk2</groupId>
519+
<groupId>org.glassfish.main.hk2</groupId>
520520
<artifactId>config-types</artifactId>
521521
<version>${project.version}</version>
522522
<exclusions>

‎nucleus/grizzly/config/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<useSystemClassLoader>true</useSystemClassLoader>
6767
<forkMode>always</forkMode>
6868
</configuration>
69-
</plugin>
69+
</plugin>
7070
</plugins>
7171
</build>
7272
<dependencies>
@@ -98,12 +98,12 @@
9898
<artifactId>hk2</artifactId>
9999
</dependency>
100100
<dependency>
101-
<groupId>org.glassfish.hk2</groupId>
101+
<groupId>org.glassfish.main.hk2</groupId>
102102
<artifactId>hk2-config</artifactId>
103103
<version>${project.version}</version>
104104
</dependency>
105105
<dependency>
106-
<groupId>org.glassfish.hk2</groupId>
106+
<groupId>org.glassfish.main.hk2</groupId>
107107
<artifactId>config-types</artifactId>
108108
<version>${project.version}</version>
109109
</dependency>

‎nucleus/hk2/config-generator/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<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">
4545
<modelVersion>4.0.0</modelVersion>
4646
<parent>
47-
<groupId>org.glassfish.hk2</groupId>
47+
<groupId>org.glassfish.main.hk2</groupId>
4848
<artifactId>glassfish-nucleus-hk2</artifactId>
4949
<version>5.0.1-SNAPSHOT</version>
5050
</parent>
@@ -81,7 +81,7 @@
8181
<version>${hk2.version}</version>
8282
</dependency>
8383
<dependency>
84-
<groupId>org.glassfish.hk2</groupId>
84+
<groupId>org.glassfish.main.hk2</groupId>
8585
<artifactId>hk2-config</artifactId>
8686
<version>${project.version}</version>
8787
</dependency>

‎nucleus/hk2/config-types/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@
4343
<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">
4444
<modelVersion>4.0.0</modelVersion>
4545
<parent>
46-
<groupId>org.glassfish.hk2</groupId>
46+
<groupId>org.glassfish.main.hk2</groupId>
4747
<artifactId>glassfish-nucleus-hk2</artifactId>
4848
<version>5.0.1-SNAPSHOT</version>
4949
</parent>
5050

5151
<artifactId>config-types</artifactId>
5252
<name>HK2 config types</name>
5353
<packaging>glassfish-jar</packaging>
54-
54+
5555
<build>
5656
<plugins>
5757
<plugin>
@@ -68,7 +68,7 @@
6868
</executions>
6969
</plugin>
7070
<plugin>
71-
<groupId>org.glassfish.hk2</groupId>
71+
<groupId>org.glassfish.main.hk2</groupId>
7272
<artifactId>config-generator</artifactId>
7373
<version>${project.version}</version>
7474
<configuration>
@@ -99,7 +99,7 @@
9999

100100
<dependencies>
101101
<dependency>
102-
<groupId>org.glassfish.hk2</groupId>
102+
<groupId>org.glassfish.main.hk2</groupId>
103103
<artifactId>hk2-config</artifactId>
104104
<version>${project.version}</version>
105105
</dependency>

‎nucleus/hk2/hk2-config/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<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">
4545
<modelVersion>4.0.0</modelVersion>
4646
<parent>
47-
<groupId>org.glassfish.hk2</groupId>
47+
<groupId>org.glassfish.main.hk2</groupId>
4848
<artifactId>glassfish-nucleus-hk2</artifactId>
4949
<version>5.0.1-SNAPSHOT</version>
5050
</parent>
@@ -132,7 +132,7 @@
132132
<version>${hk2.version}</version>
133133
</dependency>
134134
<dependency>
135-
<groupId>org.glassfish.hk2</groupId>
135+
<groupId>org.glassfish.main.hk2</groupId>
136136
<artifactId>tiger-types</artifactId>
137137
<version>${project.version}</version>
138138
</dependency>

0 commit comments

Comments
 (0)