This is an automated email from the ASF dual-hosted git repository. johndament pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 78391d887bba28d6224bda6fe72d4be2fb63fac9 Author: John D. Ament <[email protected]> AuthorDate: Tue Dec 19 14:49:22 2017 -0500 [CXF-7579] Upgrading to final release, refactoring dependencies. --- parent/pom.xml | 19 +++++++++++ rt/rs/microprofile-client/pom.xml | 33 ------------------- systests/microprofile/client/weld/pom.xml | 55 +++++++++---------------------- 3 files changed, 34 insertions(+), 73 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e27c8a5..5a674eb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -237,6 +237,8 @@ <cxf.pmd.eclipse.ruleset.ext /> <cxf.resources.base.path /> <cxf.reactor.version>3.1.0.RELEASE</cxf.reactor.version> + <cxf.microprofile.rest.client.version>1.0</cxf.microprofile.rest.client.version> + <cxf.microprofile.config.version>1.1</cxf.microprofile.config.version> </properties> <build> <resources> @@ -1029,6 +1031,23 @@ <optional>true</optional> </dependency> <dependency> + <groupId>org.eclipse.microprofile.rest.client</groupId> + <artifactId>microprofile-rest-client-api</artifactId> + <version>${cxf.microprofile.rest.client.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.microprofile.rest.client</groupId> + <artifactId>microprofile-rest-client-tck</artifactId> + <version>${cxf.microprofile.rest.client.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.microprofile.config</groupId> + <artifactId>microprofile-config-api</artifactId> + <version>${cxf.microprofile.config.version}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <version>${cxf.slf4j.version}</version> diff --git a/rt/rs/microprofile-client/pom.xml b/rt/rs/microprofile-client/pom.xml index fa7644a..beb8514 100644 --- a/rt/rs/microprofile-client/pom.xml +++ b/rt/rs/microprofile-client/pom.xml @@ -97,7 +97,6 @@ <dependency> <groupId>org.eclipse.microprofile.rest.client</groupId> <artifactId>microprofile-rest-client-api</artifactId> - <version>1.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> @@ -112,29 +111,15 @@ <dependency> <groupId>org.eclipse.microprofile.rest.client</groupId> <artifactId>microprofile-rest-client-tck</artifactId> - <version>1.0-SNAPSHOT</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.microprofile.config</groupId> <artifactId>microprofile-config-api</artifactId> - <version>1.1</version> - <scope>provided</scope> - <optional>true</optional> </dependency> <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> - <version>1.2</version> <scope>provided</scope> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jcache_1.0_spec</artifactId> - <version>1.0-alpha-1</version> - <scope>provided</scope> - <optional>true</optional> </dependency> <dependency> <groupId>cglib</groupId> @@ -173,24 +158,6 @@ </dependencies> <profiles> <profile> - <id>release-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>mp-rest-client</id> - <url>https://oss.sonatype.org/content/repositories/orgeclipsemicroprofile-1037/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - <profile> <id>java9</id> <activation> <jdk>9</jdk> diff --git a/systests/microprofile/client/weld/pom.xml b/systests/microprofile/client/weld/pom.xml index 5e22ae4..ee731b2 100644 --- a/systests/microprofile/client/weld/pom.xml +++ b/systests/microprofile/client/weld/pom.xml @@ -29,15 +29,19 @@ <artifactId>cxf-systests-microprofile-weld</artifactId> <name>Apache CXF System Tests - MicroProfile Rest Client TCK</name> <properties> - <microprofile.rest.client.version>1.0-SNAPSHOT</microprofile.rest.client.version> - <geronimo.config.version>1.0</geronimo.config.version> - <wiremock.params>--port=8765</wiremock.params> + <cxf.geronimo.config.version>1.0</cxf.geronimo.config.version> + <cxf.wiremock.params>--port=8765</cxf.wiremock.params> + <cxf.weld.se.version>2.4.5.Final</cxf.weld.se.version> + <cxf.arquillian.weld.container.version>2.0.0.Final</cxf.arquillian.weld.container.version> + <cxf.johnzon.tck.version>1.1.3</cxf.johnzon.tck.version> + <cxf.json.api.1.1.version>1.1</cxf.json.api.1.1.version> + <cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version> </properties> <dependencies> <dependency> <groupId>org.jboss.arquillian.testng</groupId> <artifactId>arquillian-testng-container</artifactId> - <version>1.1.14.Final</version> + <version>${cxf.arquillian.version}</version> <scope>test</scope> </dependency> <dependency> @@ -48,49 +52,40 @@ <dependency> <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> - <version>2.4.5.Final</version> + <version>${cxf.weld.se.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.arquillian.container</groupId> <artifactId>arquillian-weld-embedded</artifactId> - <version>2.0.0.Final</version> + <version>${cxf.arquillian.weld.container.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.eclipse.microprofile.rest.client</groupId> <artifactId>microprofile-rest-client-tck</artifactId> - <version>${microprofile.rest.client.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.johnzon</groupId> - <artifactId>johnzon-core</artifactId> - <version>1.1.3</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-core</artifactId> - <version>1.1.3</version> + <version>${cxf.johnzon.tck.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>javax.json</groupId> <artifactId>javax.json-api</artifactId> - <version>1.1</version> + <version>${cxf.json.api.1.1.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.7.25</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.geronimo.config</groupId> <artifactId>geronimo-config-impl</artifactId> - <version>1.0</version> + <version>${cxf.geronimo.config.version}</version> <scope>test</scope> </dependency> <dependency> @@ -102,7 +97,7 @@ <dependency> <groupId>org.apache.johnzon</groupId> <artifactId>johnzon-jsonb</artifactId> - <version>1.1.3</version> + <version>${cxf.johnzon.tck.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -120,7 +115,7 @@ </goals> <configuration> <dir>target/classes</dir> - <params>${wiremock.params}</params> + <params>${cxf.wiremock.params}</params> </configuration> </execution> </executions> @@ -139,24 +134,4 @@ </plugin> </plugins> </build> - <profiles> - <profile> - <id>release-repo</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <repositories> - <repository> - <id>mp-rest-client</id> - <url>https://oss.sonatype.org/content/repositories/orgeclipsemicroprofile-1037/</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </repository> - </repositories> - </profile> - </profiles> </project> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
