Unify microprofile modules structure (#4176)
* Unify microprofile modules structure
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/bom/pom.xml b/bom/pom.xml
index 5b02437..72e51dc 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -149,7 +149,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
+ <groupId>org.glassfish.jersey.ext.microprofile</groupId>
<artifactId>jersey-mp-config</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/ext/microprofile/config/pom.xml b/ext/microprofile/mp-config/pom.xml
similarity index 96%
rename from ext/microprofile/config/pom.xml
rename to ext/microprofile/mp-config/pom.xml
index 39d5029..2083908 100644
--- a/ext/microprofile/config/pom.xml
+++ b/ext/microprofile/mp-config/pom.xml
@@ -22,9 +22,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>project</artifactId>
- <groupId>org.glassfish.jersey.ext</groupId>
+ <groupId>org.glassfish.jersey.ext.microprofile</groupId>
<version>2.29-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ext/microprofile/config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationModel.java b/ext/microprofile/mp-config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationModel.java
similarity index 100%
rename from ext/microprofile/config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationModel.java
rename to ext/microprofile/mp-config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationModel.java
diff --git a/ext/microprofile/config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationProvider.java b/ext/microprofile/mp-config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationProvider.java
similarity index 100%
rename from ext/microprofile/config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationProvider.java
rename to ext/microprofile/mp-config/src/main/java/org/glassfish/jersey/microprofile/config/ConfigurationProvider.java
diff --git a/ext/microprofile/config/src/main/java/org/glassfish/jersey/microprofile/config/package-info.java b/ext/microprofile/mp-config/src/main/java/org/glassfish/jersey/microprofile/config/package-info.java
similarity index 100%
rename from ext/microprofile/config/src/main/java/org/glassfish/jersey/microprofile/config/package-info.java
rename to ext/microprofile/mp-config/src/main/java/org/glassfish/jersey/microprofile/config/package-info.java
diff --git a/ext/microprofile/config/src/main/resources/META-INF/services/org.glassfish.jersey.spi.ExternalConfigurationProvider b/ext/microprofile/mp-config/src/main/resources/META-INF/services/org.glassfish.jersey.spi.ExternalConfigurationProvider
similarity index 100%
rename from ext/microprofile/config/src/main/resources/META-INF/services/org.glassfish.jersey.spi.ExternalConfigurationProvider
rename to ext/microprofile/mp-config/src/main/resources/META-INF/services/org.glassfish.jersey.spi.ExternalConfigurationProvider
diff --git a/ext/microprofile/config/src/test/java/org/glassfish/jersey/microprofile/config/ExternalPropertiesConfigurationFactoryTest.java b/ext/microprofile/mp-config/src/test/java/org/glassfish/jersey/microprofile/config/ExternalPropertiesConfigurationFactoryTest.java
similarity index 100%
rename from ext/microprofile/config/src/test/java/org/glassfish/jersey/microprofile/config/ExternalPropertiesConfigurationFactoryTest.java
rename to ext/microprofile/mp-config/src/test/java/org/glassfish/jersey/microprofile/config/ExternalPropertiesConfigurationFactoryTest.java
diff --git a/ext/microprofile/config/src/test/resources/META-INF/microprofile-config.properties b/ext/microprofile/mp-config/src/test/resources/META-INF/microprofile-config.properties
similarity index 100%
rename from ext/microprofile/config/src/test/resources/META-INF/microprofile-config.properties
rename to ext/microprofile/mp-config/src/test/resources/META-INF/microprofile-config.properties
diff --git a/ext/microprofile/pom.xml b/ext/microprofile/pom.xml
index 3cac0c8..e723857 100644
--- a/ext/microprofile/pom.xml
+++ b/ext/microprofile/pom.xml
@@ -15,7 +15,8 @@
<modules>
<module>mp-rest-client</module>
+ <module>mp-config</module>
</modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/ext/pom.xml b/ext/pom.xml
index df0ccd7..c61dca1 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -44,7 +44,6 @@
<module>cdi</module>
<module>entity-filtering</module>
<module>metainf-services</module>
- <module>microprofile/config</module>
<module>mvc</module>
<module>mvc-bean-validation</module>
<module>mvc-freemarker</module>
diff --git a/tests/integration/microprofile/config/helidon/pom.xml b/tests/integration/microprofile/config/helidon/pom.xml
index 84f0d84..b623698 100644
--- a/tests/integration/microprofile/config/helidon/pom.xml
+++ b/tests/integration/microprofile/config/helidon/pom.xml
@@ -38,7 +38,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
+ <groupId>org.glassfish.jersey.ext.microprofile</groupId>
<artifactId>jersey-mp-config</artifactId>
<scope>test</scope>
</dependency>
@@ -90,4 +90,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
