#23455: javaee.jar should be renamed to jakartaee.jar
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 760920b..64463af 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -2,7 +2,7 @@
<!--
Copyright (c) 2021 Contributors to Eclipse Foundation.
- Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -1594,7 +1594,7 @@
<dependency>
<groupId>org.glassfish.main.extras</groupId>
- <artifactId>javaee-frag</artifactId>
+ <artifactId>jakartaee-frag</artifactId>
<version>${project.version}</version>
<type>zip</type>
<optional>true</optional>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index 50b61fa..2cce91a 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -2,7 +2,7 @@
<!--
Copyright (c) 2021 Contributors to Eclipse Foundation.
- Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -546,7 +546,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
- <artifactId>javaee-frag</artifactId>
+ <artifactId>jakartaee-frag</artifactId>
<version>${project.version}</version>
<type>zip</type>
<optional>true</optional>
diff --git a/appserver/extras/javaee/dist-frag/pom.xml b/appserver/extras/jakartaee/dist-frag/pom.xml
similarity index 92%
rename from appserver/extras/javaee/dist-frag/pom.xml
rename to appserver/extras/jakartaee/dist-frag/pom.xml
index ef785b8..0bdef17 100644
--- a/appserver/extras/javaee/dist-frag/pom.xml
+++ b/appserver/extras/jakartaee/dist-frag/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -22,11 +22,11 @@
<parent>
<groupId>org.glassfish.main.extras</groupId>
- <artifactId>javaee-pom</artifactId>
+ <artifactId>jakartaee-pom</artifactId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <artifactId>javaee-frag</artifactId>
+ <artifactId>jakartaee-frag</artifactId>
<packaging>distribution-fragment</packaging>
<name>GlassFish javaee.jar distribution fragment</name>
@@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
- <artifactId>javaee</artifactId>
+ <artifactId>jakartaee</artifactId>
<version>${project.version}</version>
<optional>true</optional>
</dependency>
diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/jakartaee/manifest-jar/pom.xml
similarity index 96%
rename from appserver/extras/javaee/manifest-jar/pom.xml
rename to appserver/extras/jakartaee/manifest-jar/pom.xml
index a36e616..bfbda66 100644
--- a/appserver/extras/javaee/manifest-jar/pom.xml
+++ b/appserver/extras/jakartaee/manifest-jar/pom.xml
@@ -22,11 +22,11 @@
<parent>
<groupId>org.glassfish.main.extras</groupId>
- <artifactId>javaee-pom</artifactId>
+ <artifactId>jakartaee-pom</artifactId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <artifactId>javaee</artifactId>
+ <artifactId>jakartaee</artifactId>
<name>GlassFish javaee.jar </name>
diff --git a/appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF b/appserver/extras/jakartaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF
rename to appserver/extras/jakartaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF
diff --git a/appserver/extras/javaee/pom.xml b/appserver/extras/jakartaee/pom.xml
similarity index 92%
rename from appserver/extras/javaee/pom.xml
rename to appserver/extras/jakartaee/pom.xml
index 9277e20..111b9b8 100644
--- a/appserver/extras/javaee/pom.xml
+++ b/appserver/extras/jakartaee/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>javaee-pom</artifactId>
+ <artifactId>jakartaee-pom</artifactId>
<packaging>pom</packaging>
<name>GlassFish JavaEE Manifest pom</name>
diff --git a/appserver/extras/pom.xml b/appserver/extras/pom.xml
index a201ae8..a0a1307 100755
--- a/appserver/extras/pom.xml
+++ b/appserver/extras/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,7 @@
<name>GlassFish Extras modules</name>
<modules>
- <module>javaee</module>
+ <module>jakartaee</module>
<module>appserv-rt</module>
</modules>
diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml
index a3df966..4f7d8fc 100644
--- a/appserver/featuresets/web/pom.xml
+++ b/appserver/featuresets/web/pom.xml
@@ -2,7 +2,7 @@
<!--
Copyright (c) 2021, 2022 Contributors to Eclipse Foundation.
- Copyright (c) 2015, 2021 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2015, 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -523,7 +523,7 @@
</dependency>
<dependency>
<groupId>org.glassfish.main.extras</groupId>
- <artifactId>javaee</artifactId>
+ <artifactId>jakartaee</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
