Move CDI integration tests to a common CDI-Integration module (#4280)

Signed-off-by: Jan Supol <jan.supol@oracle.com>
eclipse-ee4j · Oct 15, 2019 · a68bea0 · a68bea0
1 parent 05a64a2
commit a68bea0
Show file tree

Hide file tree

Showing 199 changed files with 71 additions and 60 deletions.
diff --git a/...gration/cdi-beanvalidation-webapp/pom.xml → ...gration/cdi-beanvalidation-webapp/pom.xml b/...gration/cdi-beanvalidation-webapp/pom.xml → ...gration/cdi-beanvalidation-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2015, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...h/jersey/tests/cdi/bv/CdiApplication.java → ...h/jersey/tests/cdi/bv/CdiApplication.java b/...h/jersey/tests/cdi/bv/CdiApplication.java → ...h/jersey/tests/cdi/bv/CdiApplication.java
diff --git a/...ests/cdi/bv/CdiFieldInjectedResource.java → ...ests/cdi/bv/CdiFieldInjectedResource.java b/...ests/cdi/bv/CdiFieldInjectedResource.java → ...ests/cdi/bv/CdiFieldInjectedResource.java
diff --git a/...tests/cdi/bv/CdiOldFashionedResource.java → ...tests/cdi/bv/CdiOldFashionedResource.java b/...tests/cdi/bv/CdiOldFashionedResource.java → ...tests/cdi/bv/CdiOldFashionedResource.java
diff --git a/...ests/cdi/bv/CdiParamInjectedResource.java → ...ests/cdi/bv/CdiParamInjectedResource.java b/...ests/cdi/bv/CdiParamInjectedResource.java → ...ests/cdi/bv/CdiParamInjectedResource.java
diff --git a/...s/cdi/bv/CdiPropertyInjectedResource.java → ...s/cdi/bv/CdiPropertyInjectedResource.java b/...s/cdi/bv/CdiPropertyInjectedResource.java → ...s/cdi/bv/CdiPropertyInjectedResource.java
diff --git a/...ests/cdi/bv/CdiValidationInterceptor.java → ...ests/cdi/bv/CdiValidationInterceptor.java b/...ests/cdi/bv/CdiValidationInterceptor.java → ...ests/cdi/bv/CdiValidationInterceptor.java
diff --git a/...sey/tests/cdi/bv/CdiValidationResult.java → ...sey/tests/cdi/bv/CdiValidationResult.java b/...sey/tests/cdi/bv/CdiValidationResult.java → ...sey/tests/cdi/bv/CdiValidationResult.java
diff --git a/...sts/cdi/bv/CdiValidationResultBinder.java → ...sts/cdi/bv/CdiValidationResultBinder.java b/...sts/cdi/bv/CdiValidationResultBinder.java → ...sts/cdi/bv/CdiValidationResultBinder.java
diff --git a/...h/jersey/tests/cdi/bv/Hk2Application.java → ...h/jersey/tests/cdi/bv/Hk2Application.java b/...h/jersey/tests/cdi/bv/Hk2Application.java → ...h/jersey/tests/cdi/bv/Hk2Application.java
diff --git a/...ests/cdi/bv/Hk2FieldInjectedResource.java → ...ests/cdi/bv/Hk2FieldInjectedResource.java b/...ests/cdi/bv/Hk2FieldInjectedResource.java → ...ests/cdi/bv/Hk2FieldInjectedResource.java
diff --git a/...tests/cdi/bv/Hk2OldFashionedResource.java → ...tests/cdi/bv/Hk2OldFashionedResource.java b/...tests/cdi/bv/Hk2OldFashionedResource.java → ...tests/cdi/bv/Hk2OldFashionedResource.java
diff --git a/...ests/cdi/bv/Hk2ParamInjectedResource.java → ...ests/cdi/bv/Hk2ParamInjectedResource.java b/...ests/cdi/bv/Hk2ParamInjectedResource.java → ...ests/cdi/bv/Hk2ParamInjectedResource.java
diff --git a/...s/cdi/bv/Hk2PropertyInjectedResource.java → ...s/cdi/bv/Hk2PropertyInjectedResource.java b/...s/cdi/bv/Hk2PropertyInjectedResource.java → ...s/cdi/bv/Hk2PropertyInjectedResource.java
diff --git a/...ests/cdi/bv/Hk2ValidationInterceptor.java → ...ests/cdi/bv/Hk2ValidationInterceptor.java b/...ests/cdi/bv/Hk2ValidationInterceptor.java → ...ests/cdi/bv/Hk2ValidationInterceptor.java
diff --git a/...sey/tests/cdi/bv/Hk2ValidationResult.java → ...sey/tests/cdi/bv/Hk2ValidationResult.java b/...sey/tests/cdi/bv/Hk2ValidationResult.java → ...sey/tests/cdi/bv/Hk2ValidationResult.java
diff --git a/...y/tests/cdi/bv/NonJaxRsValidatedBean.java → ...y/tests/cdi/bv/NonJaxRsValidatedBean.java b/...y/tests/cdi/bv/NonJaxRsValidatedBean.java → ...y/tests/cdi/bv/NonJaxRsValidatedBean.java
diff --git a/...jersey/tests/cdi/bv/ValidationResult.java → ...jersey/tests/cdi/bv/ValidationResult.java b/...jersey/tests/cdi/bv/ValidationResult.java → ...jersey/tests/cdi/bv/ValidationResult.java
diff --git a/...ey/tests/cdi/bv/ValidationResultUtil.java → ...ey/tests/cdi/bv/ValidationResultUtil.java b/...ey/tests/cdi/bv/ValidationResultUtil.java → ...ey/tests/cdi/bv/ValidationResultUtil.java
diff --git a/...app/src/main/resources/META-INF/beans.xml → ...app/src/main/resources/META-INF/beans.xml b/...app/src/main/resources/META-INF/beans.xml → ...app/src/main/resources/META-INF/beans.xml
diff --git a/...ces/javax.enterprise.inject.spi.Extension → ...ces/javax.enterprise.inject.spi.Extension b/...ces/javax.enterprise.inject.spi.Extension → ...ces/javax.enterprise.inject.spi.Extension
diff --git a/...sfish.jersey.server.spi.ComponentProvider → ...sfish.jersey.server.spi.ComponentProvider b/...sfish.jersey.server.spi.ComponentProvider → ...sfish.jersey.server.spi.ComponentProvider
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...rsey/tests/cdi/bv/BaseValidationTest.java → ...rsey/tests/cdi/bv/BaseValidationTest.java b/...rsey/tests/cdi/bv/BaseValidationTest.java → ...rsey/tests/cdi/bv/BaseValidationTest.java
diff --git a/...ish/jersey/tests/cdi/bv/CombinedTest.java → ...ish/jersey/tests/cdi/bv/CombinedTest.java b/...ish/jersey/tests/cdi/bv/CombinedTest.java → ...ish/jersey/tests/cdi/bv/CombinedTest.java
diff --git a/...sfish/jersey/tests/cdi/bv/RawCdiTest.java → ...sfish/jersey/tests/cdi/bv/RawCdiTest.java b/...sfish/jersey/tests/cdi/bv/RawCdiTest.java → ...sfish/jersey/tests/cdi/bv/RawCdiTest.java
diff --git a/...sfish/jersey/tests/cdi/bv/RawHk2Test.java → ...sfish/jersey/tests/cdi/bv/RawHk2Test.java b/...sfish/jersey/tests/cdi/bv/RawHk2Test.java → ...sfish/jersey/tests/cdi/bv/RawHk2Test.java
diff --git a/...s/integration/cdi-ejb-test-webapp/pom.xml → ...i-integration/cdi-ejb-test-webapp/pom.xml b/...s/integration/cdi-ejb-test-webapp/pom.xml → ...i-integration/cdi-ejb-test-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...ersey/tests/cdi/resources/BasicTimer.java → ...ersey/tests/cdi/resources/BasicTimer.java b/...ersey/tests/cdi/resources/BasicTimer.java → ...ersey/tests/cdi/resources/BasicTimer.java
diff --git a/...ests/cdi/resources/CdiAppScopedTimer.java → ...ests/cdi/resources/CdiAppScopedTimer.java b/...ests/cdi/resources/CdiAppScopedTimer.java → ...ests/cdi/resources/CdiAppScopedTimer.java
diff --git a/...i/resources/CdiRequestScopedResource.java → ...i/resources/CdiRequestScopedResource.java b/...i/resources/CdiRequestScopedResource.java → ...i/resources/CdiRequestScopedResource.java
diff --git a/.../cdi/resources/CdiRequestScopedTimer.java → .../cdi/resources/CdiRequestScopedTimer.java b/.../cdi/resources/CdiRequestScopedTimer.java → .../cdi/resources/CdiRequestScopedTimer.java
diff --git a/...s/cdi/resources/EjbSingletonResource.java → ...s/cdi/resources/EjbSingletonResource.java b/...s/cdi/resources/EjbSingletonResource.java → ...s/cdi/resources/EjbSingletonResource.java
diff --git a/...ests/cdi/resources/EjbSingletonTimer.java → ...ests/cdi/resources/EjbSingletonTimer.java b/...ests/cdi/resources/EjbSingletonTimer.java → ...ests/cdi/resources/EjbSingletonTimer.java
diff --git a/...ts/cdi/resources/EjbStatefulResource.java → ...ts/cdi/resources/EjbStatefulResource.java b/...ts/cdi/resources/EjbStatefulResource.java → ...ts/cdi/resources/EjbStatefulResource.java
diff --git a/...s/cdi/resources/EjbStatelessResource.java → ...s/cdi/resources/EjbStatelessResource.java b/...s/cdi/resources/EjbStatelessResource.java → ...s/cdi/resources/EjbStatelessResource.java
diff --git a/...ests/cdi/resources/EjbStatelessTimer.java → ...ests/cdi/resources/EjbStatelessTimer.java b/...ests/cdi/resources/EjbStatelessTimer.java → ...ests/cdi/resources/EjbStatelessTimer.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...st-webapp/src/main/webapp/WEB-INF/web.xml → ...st-webapp/src/main/webapp/WEB-INF/web.xml b/...st-webapp/src/main/webapp/WEB-INF/web.xml → ...st-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/...y/tests/cdi/resources/CdiIntoEjbTest.java → ...y/tests/cdi/resources/CdiIntoEjbTest.java b/...y/tests/cdi/resources/CdiIntoEjbTest.java → ...y/tests/cdi/resources/CdiIntoEjbTest.java
diff --git a/...y/tests/cdi/resources/EjbIntoCdiTest.java → ...y/tests/cdi/resources/EjbIntoCdiTest.java b/...y/tests/cdi/resources/EjbIntoCdiTest.java → ...y/tests/cdi/resources/EjbIntoCdiTest.java
diff --git a/.../jersey/tests/cdi/resources/TestBase.java → .../jersey/tests/cdi/resources/TestBase.java b/.../jersey/tests/cdi/resources/TestBase.java → .../jersey/tests/cdi/resources/TestBase.java
diff --git a/...e-with-non-jaxrs-impl-test-webapp/pom.xml → ...e-with-non-jaxrs-impl-test-webapp/pom.xml b/...e-with-non-jaxrs-impl-test-webapp/pom.xml → ...e-with-non-jaxrs-impl-test-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...h/jersey/tests/cdi/resources/CdiEcho.java → ...h/jersey/tests/cdi/resources/CdiEcho.java b/...h/jersey/tests/cdi/resources/CdiEcho.java → ...h/jersey/tests/cdi/resources/CdiEcho.java
diff --git a/...fish/jersey/tests/cdi/resources/Echo.java → ...fish/jersey/tests/cdi/resources/Echo.java b/...fish/jersey/tests/cdi/resources/Echo.java → ...fish/jersey/tests/cdi/resources/Echo.java
diff --git a/...sey/tests/cdi/resources/EchoResource.java → ...sey/tests/cdi/resources/EchoResource.java b/...sey/tests/cdi/resources/EchoResource.java → ...sey/tests/cdi/resources/EchoResource.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...st-webapp/src/main/webapp/WEB-INF/web.xml → ...st-webapp/src/main/webapp/WEB-INF/web.xml b/...st-webapp/src/main/webapp/WEB-INF/web.xml → ...st-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/...tests/cdi/resources/EchoResourceTest.java → ...tests/cdi/resources/EchoResourceTest.java b/...tests/cdi/resources/EchoResourceTest.java → ...tests/cdi/resources/EchoResourceTest.java
diff --git a/tests/integration/cdi-log-check/pom.xml → ...ion/cdi-integration/cdi-log-check/pom.xml b/tests/integration/cdi-log-check/pom.xml → ...ion/cdi-integration/cdi-log-check/pom.xml
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...jersey/tests/cdi/resources/ClassBean.java → ...jersey/tests/cdi/resources/ClassBean.java b/...jersey/tests/cdi/resources/ClassBean.java → ...jersey/tests/cdi/resources/ClassBean.java
diff --git a/...sey/tests/cdi/resources/EchoResource.java → ...sey/tests/cdi/resources/EchoResource.java b/...sey/tests/cdi/resources/EchoResource.java → ...sey/tests/cdi/resources/EchoResource.java
diff --git a/...y/tests/cdi/resources/FooInterceptor.java → ...y/tests/cdi/resources/FooInterceptor.java b/...y/tests/cdi/resources/FooInterceptor.java → ...y/tests/cdi/resources/FooInterceptor.java
diff --git a/...ish/jersey/tests/cdi/resources/Fooed.java → ...ish/jersey/tests/cdi/resources/Fooed.java b/...ish/jersey/tests/cdi/resources/Fooed.java → ...ish/jersey/tests/cdi/resources/Fooed.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...sey/tests/cdi/resources/WarningClass.java → ...sey/tests/cdi/resources/WarningClass.java b/...sey/tests/cdi/resources/WarningClass.java → ...sey/tests/cdi/resources/WarningClass.java
diff --git a/.../tests/cdi/resources/WarningResource.java → .../tests/cdi/resources/WarningResource.java b/.../tests/cdi/resources/WarningResource.java → .../tests/cdi/resources/WarningResource.java
diff --git a/...eck/src/main/resources/META-INF/beans.xml → ...eck/src/main/resources/META-INF/beans.xml b/...eck/src/main/resources/META-INF/beans.xml → ...eck/src/main/resources/META-INF/beans.xml
diff --git a/...log-check/src/main/webapp/WEB-INF/web.xml → ...log-check/src/main/webapp/WEB-INF/web.xml b/...log-check/src/main/webapp/WEB-INF/web.xml → ...log-check/src/main/webapp/WEB-INF/web.xml
diff --git a/...rces/CdiComponentProviderWarningTest.java → ...rces/CdiComponentProviderWarningTest.java b/...rces/CdiComponentProviderWarningTest.java → ...rces/CdiComponentProviderWarningTest.java
diff --git a/...s/integration/cdi-multimodule/ear/pom.xml → ...i-integration/cdi-multimodule/ear/pom.xml b/...s/integration/cdi-multimodule/ear/pom.xml → ...i-integration/cdi-multimodule/ear/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2015, 2019 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
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -45,15 +45,15 @@
                     <defaultLibBundleDir>APP-INF/lib</defaultLibBundleDir>
                     <modules>
                         <webModule>
-                            <groupId>org.glassfish.jersey.tests.integration</groupId>
+                            <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
                             <artifactId>cdi-multimodule-war1</artifactId>
                         </webModule>
                          <webModule>
-                            <groupId>org.glassfish.jersey.tests.integration</groupId>
+                            <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
                             <artifactId>cdi-multimodule-war2</artifactId>
                         </webModule>
                         <jarModule>
-                            <groupId>org.glassfish.jersey.tests.integration</groupId>
+                            <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
                             <artifactId>cdi-multimodule-lib</artifactId>
                         </jarModule>
                     </modules>
@@ -64,19 +64,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.jersey.tests.integration</groupId>
+            <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
             <artifactId>cdi-multimodule-war1</artifactId>
             <type>war</type>
             <version>${project.version}</version>
         </dependency>
          <dependency>
-            <groupId>org.glassfish.jersey.tests.integration</groupId>
+            <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
             <artifactId>cdi-multimodule-war2</artifactId>
             <type>war</type>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.jersey.tests.integration</groupId>
+            <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
             <artifactId>cdi-multimodule-lib</artifactId>
             <type>jar</type>
             <version>${project.version}</version>

diff --git a/...s/integration/cdi-multimodule/lib/pom.xml → ...i-integration/cdi-multimodule/lib/pom.xml b/...s/integration/cdi-multimodule/lib/pom.xml → ...i-integration/cdi-multimodule/lib/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2015, 2019 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
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/...e/cdi/lib/JaxRsInjectedDependentBean.java → ...e/cdi/lib/JaxRsInjectedDependentBean.java b/...e/cdi/lib/JaxRsInjectedDependentBean.java → ...e/cdi/lib/JaxRsInjectedDependentBean.java
diff --git a/...i/lib/JaxRsInjectedRequestScopedBean.java → ...i/lib/JaxRsInjectedRequestScopedBean.java b/...i/lib/JaxRsInjectedRequestScopedBean.java → ...i/lib/JaxRsInjectedRequestScopedBean.java
diff --git a/...lib/src/main/resources/META-INF/beans.xml → ...lib/src/main/resources/META-INF/beans.xml b/...lib/src/main/resources/META-INF/beans.xml → ...lib/src/main/resources/META-INF/beans.xml
diff --git a/tests/integration/cdi-multimodule/pom.xml → ...n/cdi-integration/cdi-multimodule/pom.xml b/tests/integration/cdi-multimodule/pom.xml → ...n/cdi-integration/cdi-multimodule/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2015, 2019 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
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 
@@ -35,9 +35,9 @@
     </description>
 
     <modules>
-        <module>ear</module>
         <module>lib</module>
         <module>war1</module>
         <module>war2</module>
+        <module>ear</module>
     </modules>
 </project>
diff --git a/.../integration/cdi-multimodule/war1/pom.xml → ...-integration/cdi-multimodule/war1/pom.xml b/.../integration/cdi-multimodule/war1/pom.xml → ...-integration/cdi-multimodule/war1/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 2019 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
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/...dule/cdi/web1/AppScopedJaxRsResource.java → ...dule/cdi/web1/AppScopedJaxRsResource.java b/...dule/cdi/web1/AppScopedJaxRsResource.java → ...dule/cdi/web1/AppScopedJaxRsResource.java
diff --git a/...ration/multimodule/cdi/web1/JaxRsApp.java → ...ration/multimodule/cdi/web1/JaxRsApp.java b/...ration/multimodule/cdi/web1/JaxRsApp.java → ...ration/multimodule/cdi/web1/JaxRsApp.java
diff --git a/.../cdi/web1/RequestScopedJaxRsResource.java → .../cdi/web1/RequestScopedJaxRsResource.java b/.../cdi/web1/RequestScopedJaxRsResource.java → .../cdi/web1/RequestScopedJaxRsResource.java
diff --git a/...ultimodule/war1/src/main/webapp/index.jsp → ...ultimodule/war1/src/main/webapp/index.jsp b/...ultimodule/war1/src/main/webapp/index.jsp → ...ultimodule/war1/src/main/webapp/index.jsp
diff --git a/...ule/cdi/web1/JaxRsCdiIntegrationTest.java → ...ule/cdi/web1/JaxRsCdiIntegrationTest.java b/...ule/cdi/web1/JaxRsCdiIntegrationTest.java → ...ule/cdi/web1/JaxRsCdiIntegrationTest.java
diff --git a/.../integration/cdi-multimodule/war2/pom.xml → ...-integration/cdi-multimodule/war2/pom.xml b/.../integration/cdi-multimodule/war2/pom.xml → ...-integration/cdi-multimodule/war2/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 2019 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
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/...ion/multimodule/cdi/web2/JaxRsAppOne.java → ...ion/multimodule/cdi/web2/JaxRsAppOne.java b/...ion/multimodule/cdi/web2/JaxRsAppOne.java → ...ion/multimodule/cdi/web2/JaxRsAppOne.java
diff --git a/...ion/multimodule/cdi/web2/JaxRsAppTwo.java → ...ion/multimodule/cdi/web2/JaxRsAppTwo.java b/...ion/multimodule/cdi/web2/JaxRsAppTwo.java → ...ion/multimodule/cdi/web2/JaxRsAppTwo.java
diff --git a/...di/web2/SharedAppScopedJaxRsResource.java → ...di/web2/SharedAppScopedJaxRsResource.java b/...di/web2/SharedAppScopedJaxRsResource.java → ...di/web2/SharedAppScopedJaxRsResource.java
diff --git a/...eb2/SharedRequestScopedJaxRsResource.java → ...eb2/SharedRequestScopedJaxRsResource.java b/...eb2/SharedRequestScopedJaxRsResource.java → ...eb2/SharedRequestScopedJaxRsResource.java
diff --git a/...ultimodule/war2/src/main/webapp/index.jsp → ...ultimodule/war2/src/main/webapp/index.jsp b/...ultimodule/war2/src/main/webapp/index.jsp → ...ultimodule/war2/src/main/webapp/index.jsp
diff --git a/...ule/cdi/web2/JaxRsCdiIntegrationTest.java → ...ule/cdi/web2/JaxRsCdiIntegrationTest.java b/...ule/cdi/web2/JaxRsCdiIntegrationTest.java → ...ule/cdi/web2/JaxRsCdiIntegrationTest.java
diff --git a/.../integration/cdi-multipart-webapp/pom.xml → ...-integration/cdi-multipart-webapp/pom.xml b/.../integration/cdi-multipart-webapp/pom.xml → ...-integration/cdi-multipart-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...sey/tests/cdi/resources/EchoResource.java → ...sey/tests/cdi/resources/EchoResource.java b/...sey/tests/cdi/resources/EchoResource.java → ...sey/tests/cdi/resources/EchoResource.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...s/cdi/resources/MultipartFeatureTest.java → ...s/cdi/resources/MultipartFeatureTest.java b/...s/cdi/resources/MultipartFeatureTest.java → ...s/cdi/resources/MultipartFeatureTest.java
diff --git a/tests/integration/cdi-test-webapp/pom.xml → ...n/cdi-integration/cdi-test-webapp/pom.xml b/tests/integration/cdi-test-webapp/pom.xml → ...n/cdi-integration/cdi-test-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2013, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...esources/ConstructorInjectedResource.java → ...esources/ConstructorInjectedResource.java b/...esources/ConstructorInjectedResource.java → ...esources/ConstructorInjectedResource.java
diff --git a/.../tests/cdi/resources/CounterResource.java → .../tests/cdi/resources/CounterResource.java b/.../tests/cdi/resources/CounterResource.java → .../tests/cdi/resources/CounterResource.java
diff --git a/...ests/cdi/resources/CustomCdiProducer.java → ...ests/cdi/resources/CustomCdiProducer.java b/...ests/cdi/resources/CustomCdiProducer.java → ...ests/cdi/resources/CustomCdiProducer.java
diff --git a/.../tests/cdi/resources/CustomExtension.java → .../tests/cdi/resources/CustomExtension.java b/.../tests/cdi/resources/CustomExtension.java → .../tests/cdi/resources/CustomExtension.java
diff --git a/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java b/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java
diff --git a/...ests/cdi/resources/FieldProducedBean.java → ...ests/cdi/resources/FieldProducedBean.java b/...ests/cdi/resources/FieldProducedBean.java → ...ests/cdi/resources/FieldProducedBean.java
diff --git a/...es/FirstNonJaxRsBeanInjectedResource.java → ...es/FirstNonJaxRsBeanInjectedResource.java b/...es/FirstNonJaxRsBeanInjectedResource.java → ...es/FirstNonJaxRsBeanInjectedResource.java
diff --git a/...ces/JCDIBeanDependentExceptionMapper.java → ...ces/JCDIBeanDependentExceptionMapper.java b/...ces/JCDIBeanDependentExceptionMapper.java → ...ces/JCDIBeanDependentExceptionMapper.java
diff --git a/.../JCDIBeanDependentPerRequestResource.java → .../JCDIBeanDependentPerRequestResource.java b/.../JCDIBeanDependentPerRequestResource.java → .../JCDIBeanDependentPerRequestResource.java
diff --git a/.../resources/JCDIBeanDependentResource.java → .../resources/JCDIBeanDependentResource.java b/.../resources/JCDIBeanDependentResource.java → .../resources/JCDIBeanDependentResource.java
diff --git a/...s/JCDIBeanDependentSingletonResource.java → ...s/JCDIBeanDependentSingletonResource.java b/...s/JCDIBeanDependentSingletonResource.java → ...s/JCDIBeanDependentSingletonResource.java
diff --git a/...di/resources/JCDIBeanExceptionMapper.java → ...di/resources/JCDIBeanExceptionMapper.java b/...di/resources/JCDIBeanExceptionMapper.java → ...di/resources/JCDIBeanExceptionMapper.java
diff --git a/...resources/JCDIBeanPerRequestResource.java → ...resources/JCDIBeanPerRequestResource.java b/...resources/JCDIBeanPerRequestResource.java → ...resources/JCDIBeanPerRequestResource.java
diff --git a/...resources/JCDIBeanRequestScopedTimer.java → ...resources/JCDIBeanRequestScopedTimer.java b/...resources/JCDIBeanRequestScopedTimer.java → ...resources/JCDIBeanRequestScopedTimer.java
diff --git a/.../resources/JCDIBeanSingletonResource.java → .../resources/JCDIBeanSingletonResource.java b/.../resources/JCDIBeanSingletonResource.java → .../resources/JCDIBeanSingletonResource.java
diff --git a/...resources/JDCIBeanDependentException.java → ...resources/JDCIBeanDependentException.java b/...resources/JDCIBeanDependentException.java → ...resources/JDCIBeanDependentException.java
diff --git a/...ests/cdi/resources/JDCIBeanException.java → ...ests/cdi/resources/JDCIBeanException.java b/...ests/cdi/resources/JDCIBeanException.java → ...ests/cdi/resources/JDCIBeanException.java
diff --git a/...ests/cdi/resources/JaxRsInjectedBean.java → ...ests/cdi/resources/JaxRsInjectedBean.java b/...ests/cdi/resources/JaxRsInjectedBean.java → ...ests/cdi/resources/JaxRsInjectedBean.java
diff --git a/.../tests/cdi/resources/MainApplication.java → .../tests/cdi/resources/MainApplication.java b/.../tests/cdi/resources/MainApplication.java → .../tests/cdi/resources/MainApplication.java
diff --git a/...sts/cdi/resources/MethodProducedBean.java → ...sts/cdi/resources/MethodProducedBean.java b/...sts/cdi/resources/MethodProducedBean.java → ...sts/cdi/resources/MethodProducedBean.java
diff --git a/...tests/cdi/resources/ProducerResource.java → ...tests/cdi/resources/ProducerResource.java b/...tests/cdi/resources/ProducerResource.java → ...tests/cdi/resources/ProducerResource.java
diff --git a/...y/tests/cdi/resources/ResponseFilter.java → ...y/tests/cdi/resources/ResponseFilter.java b/...y/tests/cdi/resources/ResponseFilter.java → ...y/tests/cdi/resources/ResponseFilter.java
diff --git a/...rsey/tests/cdi/resources/ReverseEcho.java → ...rsey/tests/cdi/resources/ReverseEcho.java b/...rsey/tests/cdi/resources/ReverseEcho.java → ...rsey/tests/cdi/resources/ReverseEcho.java
diff --git a/...jersey/tests/cdi/resources/Reversing.java → ...jersey/tests/cdi/resources/Reversing.java b/...jersey/tests/cdi/resources/Reversing.java → ...jersey/tests/cdi/resources/Reversing.java
diff --git a/.../cdi/resources/ReversingEchoResource.java → .../cdi/resources/ReversingEchoResource.java b/.../cdi/resources/ReversingEchoResource.java → .../cdi/resources/ReversingEchoResource.java
diff --git a/...s/SecondNonJaxRsBeanInjectedResource.java → ...s/SecondNonJaxRsBeanInjectedResource.java b/...s/SecondNonJaxRsBeanInjectedResource.java → ...s/SecondNonJaxRsBeanInjectedResource.java
diff --git a/...s/cdi/resources/SecondaryApplication.java → ...s/cdi/resources/SecondaryApplication.java b/...s/cdi/resources/SecondaryApplication.java → ...s/cdi/resources/SecondaryApplication.java
diff --git a/...ersey/tests/cdi/resources/Stuttering.java → ...ersey/tests/cdi/resources/Stuttering.java b/...ersey/tests/cdi/resources/Stuttering.java → ...ersey/tests/cdi/resources/Stuttering.java
diff --git a/...y/tests/cdi/resources/StutteringEcho.java → ...y/tests/cdi/resources/StutteringEcho.java b/...y/tests/cdi/resources/StutteringEcho.java → ...y/tests/cdi/resources/StutteringEcho.java
diff --git a/...cdi/resources/StutteringEchoResource.java → ...cdi/resources/StutteringEchoResource.java b/...cdi/resources/StutteringEchoResource.java → ...cdi/resources/StutteringEchoResource.java
diff --git a/...rsey/tests/cdi/resources/ValueHolder.java → ...rsey/tests/cdi/resources/ValueHolder.java b/...rsey/tests/cdi/resources/ValueHolder.java → ...rsey/tests/cdi/resources/ValueHolder.java
diff --git a/...app/src/main/resources/META-INF/beans.xml → ...app/src/main/resources/META-INF/beans.xml b/...app/src/main/resources/META-INF/beans.xml → ...app/src/main/resources/META-INF/beans.xml
diff --git a/...ces/javax.enterprise.inject.spi.Extension → ...ces/javax.enterprise.inject.spi.Extension b/...ces/javax.enterprise.inject.spi.Extension → ...ces/javax.enterprise.inject.spi.Extension
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...st-webapp/src/main/webapp/WEB-INF/web.xml → ...st-webapp/src/main/webapp/WEB-INF/web.xml b/...st-webapp/src/main/webapp/WEB-INF/web.xml → ...st-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java b/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java
diff --git a/...i/resources/ConstructorInjectionTest.java → ...i/resources/ConstructorInjectionTest.java b/...i/resources/ConstructorInjectionTest.java → ...i/resources/ConstructorInjectionTest.java
diff --git a/...rsey/tests/cdi/resources/CounterTest.java → ...rsey/tests/cdi/resources/CounterTest.java b/...rsey/tests/cdi/resources/CounterTest.java → ...rsey/tests/cdi/resources/CounterTest.java
diff --git a/...i/resources/JaxRsInjectedCdiBeanTest.java → ...i/resources/JaxRsInjectedCdiBeanTest.java b/...i/resources/JaxRsInjectedCdiBeanTest.java → ...i/resources/JaxRsInjectedCdiBeanTest.java
diff --git a/...urces/NonJaxRsBeanJaxRsInjectionTest.java → ...urces/NonJaxRsBeanJaxRsInjectionTest.java b/...urces/NonJaxRsBeanJaxRsInjectionTest.java → ...urces/NonJaxRsBeanJaxRsInjectionTest.java
diff --git a/...sts/cdi/resources/PerRequestBeanTest.java → ...sts/cdi/resources/PerRequestBeanTest.java b/...sts/cdi/resources/PerRequestBeanTest.java → ...sts/cdi/resources/PerRequestBeanTest.java
diff --git a/...esources/PerRequestDependentBeanTest.java → ...esources/PerRequestDependentBeanTest.java b/...esources/PerRequestDependentBeanTest.java → ...esources/PerRequestDependentBeanTest.java
diff --git a/...sey/tests/cdi/resources/ProducerTest.java → ...sey/tests/cdi/resources/ProducerTest.java b/...sey/tests/cdi/resources/ProducerTest.java → ...sey/tests/cdi/resources/ProducerTest.java
diff --git a/...sources/QualifiedInjectionSetGetTest.java → ...sources/QualifiedInjectionSetGetTest.java b/...sources/QualifiedInjectionSetGetTest.java → ...sources/QualifiedInjectionSetGetTest.java
diff --git a/.../tests/cdi/resources/ReverseEchoTest.java → .../tests/cdi/resources/ReverseEchoTest.java b/.../tests/cdi/resources/ReverseEchoTest.java → .../tests/cdi/resources/ReverseEchoTest.java
diff --git a/...urces/SecondJaxRsInjectedCdiBeanTest.java → ...urces/SecondJaxRsInjectedCdiBeanTest.java b/...urces/SecondJaxRsInjectedCdiBeanTest.java → ...urces/SecondJaxRsInjectedCdiBeanTest.java
diff --git a/...ests/cdi/resources/SingletonBeanTest.java → ...ests/cdi/resources/SingletonBeanTest.java b/...ests/cdi/resources/SingletonBeanTest.java → ...ests/cdi/resources/SingletonBeanTest.java
diff --git a/...resources/SingletonDependentBeanTest.java → ...resources/SingletonDependentBeanTest.java b/...resources/SingletonDependentBeanTest.java → ...resources/SingletonDependentBeanTest.java
diff --git a/.../tests/cdi/resources/StutterEchoTest.java → .../tests/cdi/resources/StutterEchoTest.java b/.../tests/cdi/resources/StutterEchoTest.java → .../tests/cdi/resources/StutterEchoTest.java
diff --git a/...jersey/tests/cdi/resources/TimerTest.java → ...jersey/tests/cdi/resources/TimerTest.java b/...jersey/tests/cdi/resources/TimerTest.java → ...jersey/tests/cdi/resources/TimerTest.java
diff --git a/...ersey-injection-custom-cfg-webapp/pom.xml → ...ersey-injection-custom-cfg-webapp/pom.xml b/...ersey-injection-custom-cfg-webapp/pom.xml → ...ersey-injection-custom-cfg-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 2019 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
@@ -21,8 +21,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...h/jersey/tests/cdi/resources/AppEcho.java → ...h/jersey/tests/cdi/resources/AppEcho.java b/...h/jersey/tests/cdi/resources/AppEcho.java → ...h/jersey/tests/cdi/resources/AppEcho.java
diff --git a/...ources/AppScopedCtorInjectedResource.java → ...ources/AppScopedCtorInjectedResource.java b/...ources/AppScopedCtorInjectedResource.java → ...ources/AppScopedCtorInjectedResource.java
diff --git a/...urces/AppScopedFieldInjectedResource.java → ...urces/AppScopedFieldInjectedResource.java b/...urces/AppScopedFieldInjectedResource.java → ...urces/AppScopedFieldInjectedResource.java
diff --git a/...rsey/tests/cdi/resources/AppSpecific.java → ...rsey/tests/cdi/resources/AppSpecific.java b/...rsey/tests/cdi/resources/AppSpecific.java → ...rsey/tests/cdi/resources/AppSpecific.java
diff --git a/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java b/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java
diff --git a/.../tests/cdi/resources/Hk2InjectedType.java → .../tests/cdi/resources/Hk2InjectedType.java b/.../tests/cdi/resources/Hk2InjectedType.java → .../tests/cdi/resources/Hk2InjectedType.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...sts/cdi/resources/MyHk2TypesProvider.java → ...sts/cdi/resources/MyHk2TypesProvider.java b/...sts/cdi/resources/MyHk2TypesProvider.java → ...sts/cdi/resources/MyHk2TypesProvider.java
diff --git a/...rsey/tests/cdi/resources/RequestEcho.java → ...rsey/tests/cdi/resources/RequestEcho.java b/...rsey/tests/cdi/resources/RequestEcho.java → ...rsey/tests/cdi/resources/RequestEcho.java
diff --git a/...es/RequestScopedCtorInjectedResource.java → ...es/RequestScopedCtorInjectedResource.java b/...es/RequestScopedCtorInjectedResource.java → ...es/RequestScopedCtorInjectedResource.java
diff --git a/...s/RequestScopedFieldInjectedResource.java → ...s/RequestScopedFieldInjectedResource.java b/...s/RequestScopedFieldInjectedResource.java → ...s/RequestScopedFieldInjectedResource.java
diff --git a/.../tests/cdi/resources/RequestSpecific.java → .../tests/cdi/resources/RequestSpecific.java b/.../tests/cdi/resources/RequestSpecific.java → .../tests/cdi/resources/RequestSpecific.java
diff --git a/...ext.cdi1x.spi.Hk2CustomBoundTypesProvider → ...ext.cdi1x.spi.Hk2CustomBoundTypesProvider b/...ext.cdi1x.spi.Hk2CustomBoundTypesProvider → ...ext.cdi1x.spi.Hk2CustomBoundTypesProvider
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...fg-webapp/src/main/webapp/WEB-INF/web.xml → ...fg-webapp/src/main/webapp/WEB-INF/web.xml b/...fg-webapp/src/main/webapp/WEB-INF/web.xml → ...fg-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java b/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java
diff --git a/...ts/cdi/resources/CustomInjectionTest.java → ...ts/cdi/resources/CustomInjectionTest.java b/...ts/cdi/resources/CustomInjectionTest.java → ...ts/cdi/resources/CustomInjectionTest.java
diff --git a/...s/cdi/resources/ExceptionMappersTest.java → ...s/cdi/resources/ExceptionMappersTest.java b/...s/cdi/resources/ExceptionMappersTest.java → ...s/cdi/resources/ExceptionMappersTest.java
diff --git a/...y/tests/cdi/resources/MonitoringTest.java → ...y/tests/cdi/resources/MonitoringTest.java b/...y/tests/cdi/resources/MonitoringTest.java → ...y/tests/cdi/resources/MonitoringTest.java
diff --git a/...s/cdi/resources/RequestSensitiveTest.java → ...s/cdi/resources/RequestSensitiveTest.java b/...s/cdi/resources/RequestSensitiveTest.java → ...s/cdi/resources/RequestSensitiveTest.java
diff --git a/...njection-custom-hk2-banned-webapp/pom.xml → ...njection-custom-hk2-banned-webapp/pom.xml b/...njection-custom-hk2-banned-webapp/pom.xml → ...njection-custom-hk2-banned-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...h/jersey/tests/cdi/resources/AppEcho.java → ...h/jersey/tests/cdi/resources/AppEcho.java b/...h/jersey/tests/cdi/resources/AppEcho.java → ...h/jersey/tests/cdi/resources/AppEcho.java
diff --git a/...ources/AppScopedCtorInjectedResource.java → ...ources/AppScopedCtorInjectedResource.java b/...ources/AppScopedCtorInjectedResource.java → ...ources/AppScopedCtorInjectedResource.java
diff --git a/...urces/AppScopedFieldInjectedResource.java → ...urces/AppScopedFieldInjectedResource.java b/...urces/AppScopedFieldInjectedResource.java → ...urces/AppScopedFieldInjectedResource.java
diff --git a/...rsey/tests/cdi/resources/AppSpecific.java → ...rsey/tests/cdi/resources/AppSpecific.java b/...rsey/tests/cdi/resources/AppSpecific.java → ...rsey/tests/cdi/resources/AppSpecific.java
diff --git a/.../tests/cdi/resources/CdiInjectedType.java → .../tests/cdi/resources/CdiInjectedType.java b/.../tests/cdi/resources/CdiInjectedType.java → .../tests/cdi/resources/CdiInjectedType.java
diff --git a/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java b/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...rsey/tests/cdi/resources/RequestEcho.java → ...rsey/tests/cdi/resources/RequestEcho.java b/...rsey/tests/cdi/resources/RequestEcho.java → ...rsey/tests/cdi/resources/RequestEcho.java
diff --git a/...es/RequestScopedCtorInjectedResource.java → ...es/RequestScopedCtorInjectedResource.java b/...es/RequestScopedCtorInjectedResource.java → ...es/RequestScopedCtorInjectedResource.java
diff --git a/...s/RequestScopedFieldInjectedResource.java → ...s/RequestScopedFieldInjectedResource.java b/...s/RequestScopedFieldInjectedResource.java → ...s/RequestScopedFieldInjectedResource.java
diff --git a/.../tests/cdi/resources/RequestSpecific.java → .../tests/cdi/resources/RequestSpecific.java b/.../tests/cdi/resources/RequestSpecific.java → .../tests/cdi/resources/RequestSpecific.java
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...ed-webapp/src/main/webapp/WEB-INF/web.xml → ...ed-webapp/src/main/webapp/WEB-INF/web.xml b/...ed-webapp/src/main/webapp/WEB-INF/web.xml → ...ed-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java b/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java
diff --git a/...ts/cdi/resources/CustomInjectionTest.java → ...ts/cdi/resources/CustomInjectionTest.java b/...ts/cdi/resources/CustomInjectionTest.java → ...ts/cdi/resources/CustomInjectionTest.java
diff --git a/...s/cdi/resources/ExceptionMappersTest.java → ...s/cdi/resources/ExceptionMappersTest.java b/...s/cdi/resources/ExceptionMappersTest.java → ...s/cdi/resources/ExceptionMappersTest.java
diff --git a/...y/tests/cdi/resources/MonitoringTest.java → ...y/tests/cdi/resources/MonitoringTest.java b/...y/tests/cdi/resources/MonitoringTest.java → ...y/tests/cdi/resources/MonitoringTest.java
diff --git a/...s/cdi/resources/RequestSensitiveTest.java → ...s/cdi/resources/RequestSensitiveTest.java b/...s/cdi/resources/RequestSensitiveTest.java → ...s/cdi/resources/RequestSensitiveTest.java
diff --git a/.../cdi-with-jersey-injection-webapp/pom.xml → .../cdi-with-jersey-injection-webapp/pom.xml b/.../cdi-with-jersey-injection-webapp/pom.xml → .../cdi-with-jersey-injection-webapp/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2014, 2019 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
@@ -20,8 +20,8 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.glassfish.jersey.tests.integration</groupId>
-        <artifactId>project</artifactId>
+        <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
+        <artifactId>cdi-integration-project</artifactId>
         <version>2.30-SNAPSHOT</version>
     </parent>
 

diff --git a/...h/jersey/tests/cdi/resources/AppEcho.java → ...h/jersey/tests/cdi/resources/AppEcho.java b/...h/jersey/tests/cdi/resources/AppEcho.java → ...h/jersey/tests/cdi/resources/AppEcho.java
diff --git a/...ources/AppScopedCtorInjectedResource.java → ...ources/AppScopedCtorInjectedResource.java b/...ources/AppScopedCtorInjectedResource.java → ...ources/AppScopedCtorInjectedResource.java
diff --git a/...urces/AppScopedFieldInjectedResource.java → ...urces/AppScopedFieldInjectedResource.java b/...urces/AppScopedFieldInjectedResource.java → ...urces/AppScopedFieldInjectedResource.java
diff --git a/...rsey/tests/cdi/resources/AppSpecific.java → ...rsey/tests/cdi/resources/AppSpecific.java b/...rsey/tests/cdi/resources/AppSpecific.java → ...rsey/tests/cdi/resources/AppSpecific.java
diff --git a/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java b/...rsey/tests/cdi/resources/EchoService.java → ...rsey/tests/cdi/resources/EchoService.java
diff --git a/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java b/...ey/tests/cdi/resources/MyApplication.java → ...ey/tests/cdi/resources/MyApplication.java
diff --git a/...sts/cdi/resources/MyHk2TypesProvider.java → ...sts/cdi/resources/MyHk2TypesProvider.java b/...sts/cdi/resources/MyHk2TypesProvider.java → ...sts/cdi/resources/MyHk2TypesProvider.java
diff --git a/...rsey/tests/cdi/resources/RequestEcho.java → ...rsey/tests/cdi/resources/RequestEcho.java b/...rsey/tests/cdi/resources/RequestEcho.java → ...rsey/tests/cdi/resources/RequestEcho.java
diff --git a/...es/RequestScopedCtorInjectedResource.java → ...es/RequestScopedCtorInjectedResource.java b/...es/RequestScopedCtorInjectedResource.java → ...es/RequestScopedCtorInjectedResource.java
diff --git a/...s/RequestScopedFieldInjectedResource.java → ...s/RequestScopedFieldInjectedResource.java b/...s/RequestScopedFieldInjectedResource.java → ...s/RequestScopedFieldInjectedResource.java
diff --git a/.../tests/cdi/resources/RequestSpecific.java → .../tests/cdi/resources/RequestSpecific.java b/.../tests/cdi/resources/RequestSpecific.java → .../tests/cdi/resources/RequestSpecific.java
diff --git a/...ext.cdi1x.spi.Hk2CustomBoundTypesProvider → ...ext.cdi1x.spi.Hk2CustomBoundTypesProvider b/...ext.cdi1x.spi.Hk2CustomBoundTypesProvider → ...ext.cdi1x.spi.Hk2CustomBoundTypesProvider
diff --git a/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml b/...-webapp/src/main/webapp/WEB-INF/beans.xml → ...-webapp/src/main/webapp/WEB-INF/beans.xml
diff --git a/...on-webapp/src/main/webapp/WEB-INF/web.xml → ...on-webapp/src/main/webapp/WEB-INF/web.xml b/...on-webapp/src/main/webapp/WEB-INF/web.xml → ...on-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java b/...h/jersey/tests/cdi/resources/CdiTest.java → ...h/jersey/tests/cdi/resources/CdiTest.java
diff --git a/...ts/cdi/resources/CustomInjectionTest.java → ...ts/cdi/resources/CustomInjectionTest.java b/...ts/cdi/resources/CustomInjectionTest.java → ...ts/cdi/resources/CustomInjectionTest.java
diff --git a/...s/cdi/resources/ExceptionMappersTest.java → ...s/cdi/resources/ExceptionMappersTest.java b/...s/cdi/resources/ExceptionMappersTest.java → ...s/cdi/resources/ExceptionMappersTest.java
diff --git a/...y/tests/cdi/resources/MonitoringTest.java → ...y/tests/cdi/resources/MonitoringTest.java b/...y/tests/cdi/resources/MonitoringTest.java → ...y/tests/cdi/resources/MonitoringTest.java
diff --git a/...s/cdi/resources/RequestSensitiveTest.java → ...s/cdi/resources/RequestSensitiveTest.java b/...s/cdi/resources/RequestSensitiveTest.java → ...s/cdi/resources/RequestSensitiveTest.java
diff --git a/tests/integration/cdi-integration/pom.xml b/tests/integration/cdi-integration/pom.xml
@@ -25,13 +25,34 @@
         <version>2.30-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
 
     <groupId>org.glassfish.jersey.tests.integration.cdi</groupId>
     <artifactId>cdi-integration-project</artifactId>
     <name>cdi-integration-project</name>
     <modules>
+        <module>cdi-beanvalidation-webapp</module>
+        <module>cdi-ejb-test-webapp</module>
+        <module>cdi-iface-with-non-jaxrs-impl-test-webapp</module>
         <module>cdi-manually-bound</module>
+        <module>cdi-log-check</module>
+        <module>cdi-multimodule</module>
+        <module>cdi-multipart-webapp</module>
+        <module>cdi-test-webapp</module>
+        <module>cdi-with-jersey-injection-custom-cfg-webapp</module>
+        <module>cdi-with-jersey-injection-custom-hk2-banned-webapp</module>
+        <module>cdi-with-jersey-injection-webapp</module>
     </modules>
-    <packaging>pom</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-install-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
@@ -35,20 +35,10 @@
     <modules>
         <module>asm</module>
         <module>async-jersey-filter</module>
-        <module>cdi-beanvalidation-webapp</module>
-        <module>cdi-ejb-test-webapp</module>
-        <module>cdi-iface-with-non-jaxrs-impl-test-webapp</module>
         <module>cdi-integration</module>
-        <module>cdi-log-check</module>
-        <module>cdi-multimodule</module>
-        <module>ejb-multimodule-reload</module>
-        <module>cdi-multipart-webapp</module>
-        <module>cdi-test-webapp</module>
-        <module>cdi-with-jersey-injection-custom-cfg-webapp</module>
-        <module>cdi-with-jersey-injection-custom-hk2-banned-webapp</module>
-        <module>cdi-with-jersey-injection-webapp</module>
         <module>client-connector-provider</module>
         <module>ejb-multimodule</module>
+        <module>ejb-multimodule-reload</module>
         <module>ejb-test-webapp</module>
         <module>j-376</module>
         <module>j-441</module>