Skip to content

Commit

Permalink
[RESTEASY-1843] More fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@asoldano
asoldano committed Apr 13, 2018
1 parent 2663b24 commit f39aa0f
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 206 deletions.
8 changes: 1 addition & 7 deletions resteasy-client/jaxrs20/pom.xml
View file
Expand Up @@ -20,14 +20,8 @@

<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<artifactId>resteasy-jaxrs-20</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
Expand Down
126 changes: 29 additions & 97 deletions resteasy-client/pom.xml
View file
Expand Up @@ -17,17 +17,14 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down Expand Up @@ -56,98 +53,33 @@
<scope>provided</scope>
</dependency>
</dependencies>
<profiles>
<profile>
<id>jaxrs20</id>
<activation>
<property>
<name>jaxrs20</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
</dependency>
</dependencies>
<build>
<directory>target/jaxrs20</directory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-jaxrs20-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<inherited>false</inherited>
<configuration>
<sources>
<source>${basedir}/src/main/jaxrs20/</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>

<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-jaxrs21-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<inherited>false</inherited>
<configuration>
<classifier>jaxrs20</classifier>
<sources>
<source>${basedir}/src/main/jaxrs21/</source>
</sources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<classifier>jaxrs20-sources</classifier>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jaxrs21</id>
<activation>
<property>
<name>!jaxrs20</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-jaxrs21-sources</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<inherited>false</inherited>
<configuration>
<sources>
<source>${basedir}/src/main/jaxrs21/</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>i18n</id>
<activation>
Expand Down
1 change: 1 addition & 0 deletions resteasy-jaxrs/jaxrs20/pom.xml
View file
Expand Up @@ -20,6 +20,7 @@
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
127 changes: 25 additions & 102 deletions resteasy-jaxrs/pom.xml
View file
Expand Up @@ -127,7 +127,6 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-processor</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.microprofile.rest.client</groupId>
<artifactId>microprofile-rest-client-api</artifactId>
Expand All @@ -145,110 +144,34 @@
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>clover-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-jaxrs21-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<inherited>false</inherited>
<configuration>
<resources>
<resource>
<directory>${basedir}/src/main/resources-jaxrs21/</directory>
<excludes>
<exclude>**/junk/**</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jaxrs20</id>
<activation>
<property>
<name>jaxrs20</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
</dependency>
</dependencies>
<build>
<directory>target/jaxrs20</directory>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-jaxrs20-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<inherited>false</inherited>
<configuration>
<resources>
<resource>
<directory>${basedir}/src/main/resources-jaxrs20/</directory>
<excludes>
<exclude>**/junk/**</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<classifier>jaxrs20</classifier>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
<classifier>jaxrs20-sources</classifier>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jaxrs21</id>
<activation>
<property>
<name>!jaxrs20</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.spec.javax.ws.rs</groupId>
<artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>add-jaxrs21-resources</id>
<phase>generate-resources</phase>
<goals>
<goal>add-resource</goal>
</goals>
<inherited>false</inherited>
<configuration>
<resources>
<resource>
<directory>${basedir}/src/main/resources-jaxrs21/</directory>
<excludes>
<exclude>**/junk/**</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<!-- exclude integrations tests which are known to fail -->
<id>exclude-known-tests-failures</id>
Expand Down

0 comments on commit f39aa0f

Please sign in to comment.