commit 5a53034b4c359d89dcabb726882af311be5da322
author hs536 <sawamura.hiroki@fujitsu.com> Wed May 13 13:22:12 2020 +0900
committer hs536 <sawamura.hiroki@fujitsu.com> Mon May 18 10:27:53 2020 +0900
tree 0a816c6fae6e390aa2d82a95c673e76cfc5f890b
parent 62c9ae97b7fc39412f3671afde2b5a2b1555a02e

remove duplicate import

Signed-off-by: hs536 <sawamura.hiroki@fujitsu.com>

appserver/admingui/war/pom.xml

diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml
index 41f064b..17d29f2 100644
--- a/appserver/admingui/war/pom.xml
+++ b/appserver/admingui/war/pom.xml
@@ -47,7 +47,7 @@
                             <archive>
                                 <manifestEntries>
                                     <Glassfish-require-services>org.glassfish.api.admingui.ConsoleProvider</Glassfish-require-services>
-                                    <HK2-Import-Bundles>org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client, jakarta.servlet-api, jakarta.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider</HK2-Import-Bundles>
+                                    <HK2-Import-Bundles>org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client, jakarta.servlet-api, com.sun.el.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider</HK2-Import-Bundles>
                                 </manifestEntries>
                             </archive>
                         </configuration>
@@ -78,7 +78,7 @@
                                <jar jarfile="target/admingui.war" basedir="target/temp">
                                     <manifest>
                                       <attribute name="Glassfish-require-services" value="org.glassfish.api.admingui.ConsoleProvider" />
-                                      <attribute name="HK2-Import-Bundles" value="org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client, jakarta.servlet-api, jakarta.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider" />
+                                      <attribute name="HK2-Import-Bundles" value="org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client, jakarta.servlet-api, com.sun.el.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider" />
                                     </manifest>
                                 </jar>
                                 <delete dir="target/temp" />

appserver/admingui/war/src/main/webapp/META-INF/MANIFEST.MF

diff --git a/appserver/admingui/war/src/main/webapp/META-INF/MANIFEST.MF b/appserver/admingui/war/src/main/webapp/META-INF/MANIFEST.MF
index a70d35f..d20f351 100644
--- a/appserver/admingui/war/src/main/webapp/META-INF/MANIFEST.MF
+++ b/appserver/admingui/war/src/main/webapp/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@
 Glassfish-require-repository: console-plugins=${com.sun.aas.installRoo
  t}/lib/console-plugins
 Glassfish-require-services: org.glassfish.api.admingui.ConsoleProvider
-HK2-Import-Bundles: org.glassfish.admingui.console-common,com.sun.enterprise.hk2,org.glassfish.admingui.console-plugin-service, org.glassfish.deployment.deployment-client, org.glassfish.javax.servlet, jakarta.servlet.jsp, org.glassfish.jsftemplating, org.glassfish.admingui.dataprovider
+HK2-Import-Bundles: org.glassfish.admingui.console-common,com.sun.enterprise.hk2,org.glassfish.admingui.console-plugin-service, org.glassfish.deployment.deployment-client, org.glassfish.javax.servlet, org.glassfish.jsftemplating, org.glassfish.admingui.dataprovider
 s