PAYARA-2463 move java ee ctx util impl to web connector master (payar…

…a#2369) * moved JavaEE Context Implementation to gf-web-conncetor from payara-micro-services to be included in embedded * import cleanup Conflicts: appserver/payara-appserver-modules/payara-micro-service/pom.xml
Pandrex247 · Feb 12, 2018 · dddf728 · dddf728
1 parent 1c9b6d6
commit dddf728
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/appserver/payara-appserver-modules/payara-micro-service/pom.xml b/appserver/payara-appserver-modules/payara-micro-service/pom.xml
@@ -55,12 +55,6 @@
             <version>${project.version}</version>
             <type>jar</type>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.common</groupId>
-            <artifactId>internal-api</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-        </dependency>
         <dependency>
             <groupId>org.glassfish.main.core</groupId>
             <artifactId>glassfish</artifactId>
@@ -101,23 +95,7 @@
             <type>jar</type>
         </dependency>
         <dependency>
-            <groupId>org.jboss.weld</groupId>
-            <artifactId>weld-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.main.deployment</groupId>
-            <artifactId>dol</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-   	        <groupId>org.glassfish.main.web</groupId>
+            <groupId>org.glassfish.main.web</groupId>
             <artifactId>web-glue</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

diff --git a/appserver/web/gf-web-connector/pom.xml b/appserver/web/gf-web-connector/pom.xml
@@ -92,5 +92,27 @@
             <artifactId>deployment-common</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.weld</groupId>
+            <artifactId>weld-api</artifactId>
+            <version>${weld-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.deployment</groupId>
+            <artifactId>dol</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.main.common</groupId>
+            <artifactId>container-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...payara/appserver/context/ContextImpl.java → ...payara/appserver/context/ContextImpl.java b/...payara/appserver/context/ContextImpl.java → ...payara/appserver/context/ContextImpl.java
diff --git a/...server/context/JavaEEContextUtilImpl.java → ...server/context/JavaEEContextUtilImpl.java b/...server/context/JavaEEContextUtilImpl.java → ...server/context/JavaEEContextUtilImpl.java