Use standard pom.xml structure (#4414) Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/tests/integration/microprofile/config/helidon/pom.xml b/tests/integration/microprofile/config/helidon/pom.xml index ae6af54..5d2970e 100644 --- a/tests/integration/microprofile/config/helidon/pom.xml +++ b/tests/integration/microprofile/config/helidon/pom.xml
@@ -20,10 +20,9 @@ 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"> <parent> - <artifactId>project</artifactId> - <groupId>org.glassfish.jersey.tests.integration</groupId> + <artifactId>microprofile-config-project</artifactId> + <groupId>org.glassfish.jersey.tests.integration.microprofile</groupId> <version>3.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -32,7 +31,7 @@ <dependencies> <dependency> - <groupId>org.glassfish.jersey.tests.integration</groupId> + <groupId>org.glassfish.jersey.tests.integration.microprofile</groupId> <artifactId>config-webapp</artifactId> <version>${project.version}</version> <scope>test</scope>
diff --git a/tests/integration/microprofile/config/pom.xml b/tests/integration/microprofile/config/pom.xml new file mode 100644 index 0000000..b6b1210 --- /dev/null +++ b/tests/integration/microprofile/config/pom.xml
@@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 2020 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> +<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"> + <parent> + <artifactId>microprofile-integration-project</artifactId> + <groupId>org.glassfish.jersey.tests.integration.microprofile</groupId> + <version>2.31-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + + <artifactId>microprofile-config-project</artifactId> + <name>microprofile-config-project</name> + <modules> + <module>helidon</module> + <module>webapp</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file
diff --git a/tests/integration/microprofile/config/webapp/pom.xml b/tests/integration/microprofile/config/webapp/pom.xml index 62354b0..796497b 100644 --- a/tests/integration/microprofile/config/webapp/pom.xml +++ b/tests/integration/microprofile/config/webapp/pom.xml
@@ -20,10 +20,9 @@ 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"> <parent> - <artifactId>project</artifactId> - <groupId>org.glassfish.jersey.tests.integration</groupId> + <artifactId>microprofile-config-project</artifactId> + <groupId>org.glassfish.jersey.tests.integration.microprofile</groupId> <version>3.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/tests/integration/microprofile/pom.xml b/tests/integration/microprofile/pom.xml new file mode 100644 index 0000000..7637be3 --- /dev/null +++ b/tests/integration/microprofile/pom.xml
@@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (c) 2020 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 + http://www.eclipse.org/legal/epl-2.0. + + This Source Code may also be made available under the following Secondary + Licenses when the conditions for such availability set forth in the + Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + version 2 with the GNU Classpath Exception, which is available at + https://www.gnu.org/software/classpath/license.html. + + SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + +--> +<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"> + <parent> + <artifactId>project</artifactId> + <groupId>org.glassfish.jersey.tests.integration</groupId> + <version>2.31-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <packaging>pom</packaging> + + <groupId>org.glassfish.jersey.tests.integration.microprofile</groupId> + <artifactId>microprofile-integration-project</artifactId> + <name>microprofile-integration-project</name> + <modules> + <module>config</module> + <module>rest-client</module> + </modules> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file
diff --git a/tests/integration/microprofile/rest-client/pom.xml b/tests/integration/microprofile/rest-client/pom.xml index 30986ad..937569a 100644 --- a/tests/integration/microprofile/rest-client/pom.xml +++ b/tests/integration/microprofile/rest-client/pom.xml
@@ -16,15 +16,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 --> - <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"> <parent> - <artifactId>project</artifactId> - <groupId>org.glassfish.jersey.tests.integration</groupId> + <artifactId>microprofile-integration-project</artifactId> + <groupId>org.glassfish.jersey.tests.integration.microprofile</groupId> <version>3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml index f254b01..3a86fb2 100644 --- a/tests/integration/pom.xml +++ b/tests/integration/pom.xml
@@ -86,6 +86,9 @@ <module>jersey-4321</module> <!-- <module>portability-jersey-1</module>--> <!-- <module>portability-jersey-2</module>--> + <module>microprofile</module> + <module>portability-jersey-1</module> + <module>portability-jersey-2</module> <module>property-check</module> <module>security-digest</module> <module>servlet-2.5-autodiscovery-1</module> @@ -127,9 +130,6 @@ <module>spring4</module> <module>spring5</module> <module>tracing-support</module> - <module>microprofile/config/helidon</module> - <module>microprofile/config/webapp</module> -<!-- <module>microprofile/rest-client</module>--> </modules> <profiles>