diff --git a/resteasy-client/jaxrs20/pom.xml b/resteasy-client/jaxrs20/pom.xml
index 5137a13e5a2..03543376a6a 100644
--- a/resteasy-client/jaxrs20/pom.xml
+++ b/resteasy-client/jaxrs20/pom.xml
@@ -20,14 +20,8 @@
org.jboss.resteasy
- resteasy-jaxrs
+ resteasy-jaxrs-20
${project.version}
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.1_spec
-
-
org.jboss.spec.javax.ws.rs
diff --git a/resteasy-client/pom.xml b/resteasy-client/pom.xml
index 758d6f38191..4cca928a3a8 100755
--- a/resteasy-client/pom.xml
+++ b/resteasy-client/pom.xml
@@ -17,17 +17,14 @@
junit
junit
-
+
+ org.jboss.spec.javax.ws.rs
+ jboss-jaxrs-api_2.1_spec
+
org.jboss.resteasy
resteasy-jaxrs
${project.version}
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.1_spec
-
-
org.jboss.logging
@@ -56,98 +53,33 @@
provided
-
-
- jaxrs20
-
-
- jaxrs20
-
-
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.0_spec
-
-
-
- target/jaxrs20
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- add-jaxrs20-sources
- generate-sources
-
- add-source
-
- false
-
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ add-jaxrs21-sources
+ generate-sources
+
+ add-source
+
+ false
- jaxrs20
+
+
+
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
- jaxrs20-sources
-
-
-
-
-
-
- jaxrs21
-
-
- !jaxrs20
-
-
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.1_spec
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- add-jaxrs21-sources
- generate-sources
-
- add-source
-
- false
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
i18n
diff --git a/resteasy-jaxrs/jaxrs20/pom.xml b/resteasy-jaxrs/jaxrs20/pom.xml
index d9436ecf8de..4a21a88bbaf 100644
--- a/resteasy-jaxrs/jaxrs20/pom.xml
+++ b/resteasy-jaxrs/jaxrs20/pom.xml
@@ -20,6 +20,7 @@
org.jboss.spec.javax.ws.rs
jboss-jaxrs-api_2.1_spec
+ provided
diff --git a/resteasy-jaxrs/pom.xml b/resteasy-jaxrs/pom.xml
index d6968bbbbbd..74b6574bfa7 100755
--- a/resteasy-jaxrs/pom.xml
+++ b/resteasy-jaxrs/pom.xml
@@ -127,7 +127,6 @@
org.jboss.logging
jboss-logging-processor
-
org.eclipse.microprofile.rest.client
microprofile-rest-client-api
@@ -145,110 +144,34 @@
com.atlassian.maven.plugins
clover-maven-plugin
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 3.0.0
+
+
+ add-jaxrs21-resources
+ generate-resources
+
+ add-resource
+
+ false
+
+
+
+ ${basedir}/src/main/resources-jaxrs21/
+
+ **/junk/**
+
+
+
+
+
+
+
-
- jaxrs20
-
-
- jaxrs20
-
-
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.0_spec
-
-
-
- target/jaxrs20
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- add-jaxrs20-resources
- generate-resources
-
- add-resource
-
- false
-
-
-
- ${basedir}/src/main/resources-jaxrs20/
-
- **/junk/**
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
- jaxrs20
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
- jaxrs20-sources
-
-
-
-
-
-
- jaxrs21
-
-
- !jaxrs20
-
-
-
-
- org.jboss.spec.javax.ws.rs
- jboss-jaxrs-api_2.1_spec
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 3.0.0
-
-
- add-jaxrs21-resources
- generate-resources
-
- add-resource
-
- false
-
-
-
- ${basedir}/src/main/resources-jaxrs21/
-
- **/junk/**
-
-
-
-
-
-
-
-
-
-
exclude-known-tests-failures