Loading pom.xml +96 −36 Original line number Diff line number Diff line Loading @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.inteligr8</groupId> <artifactId>common-rest-api</artifactId> <version>1.1-SNAPSHOT</version> <version>2.0-SNAPSHOT</version> <name>ReST API Client for Java</name> <properties> Loading Loading @@ -39,11 +39,6 @@ <artifactId>jackson-datatype-jsr310</artifactId> <version>2.12.2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> Loading @@ -54,36 +49,6 @@ <artifactId>jakarta.ws.rs-api</artifactId> <version>2.1.6</version> </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> <version>${jersey.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${jersey.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> Loading @@ -106,6 +71,37 @@ <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>3.2.0</version> <executions> <execution> <id>add-jaxrs-src</id> <goals><goal>add-source</goal></goals> <configuration> <sources> <source>src/main/${jaxrs.impl}</source> </sources> </configuration> </execution> <execution> <id>add-test-src</id> <goals><goal>add-test-source</goal></goals> <configuration> <sources> <source>src/test/${jaxrs.impl}</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <classifier>${jaxrs.impl}</classifier> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>3.0.0-M5</version> Loading Loading @@ -144,6 +140,70 @@ </plugins> </build> <profiles> <profile> <id>jaxrs-jersey</id> <activation> <activeByDefault>true</activeByDefault> <property> <name>jaxrs.impl</name> <value>jersey</value> </property> </activation> <properties> <jaxrs.impl>jersey</jaxrs.impl> </properties> <dependencies> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> <id>jaxrs-cxf</id> <activation> <property> <name>jaxrs.impl</name> <value>cxf</value> </property> </activation> <properties> <jaxrs.impl>cxf</jaxrs.impl> </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> </dependency> </dependencies> </profile> </profiles> <pluginRepositories> <pluginRepository> <id>inteligr8-public</id> Loading src/main/java/com/inteligr8/rs/ClientCxfConfiguration.java→src/main/cxf/com/inteligr8/rs/ClientCxfConfiguration.java +0 −0 File moved. View file src/main/java/com/inteligr8/rs/ClientCxfImpl.java→src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java +0 −0 File moved. View file src/main/java/com/inteligr8/rs/CxfLoggingFilter.java→src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java +0 −0 File moved. View file src/main/java/com/inteligr8/rs/CxfMultipartProvider.java→src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java +0 −0 File moved. View file Loading
pom.xml +96 −36 Original line number Diff line number Diff line Loading @@ -4,7 +4,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.inteligr8</groupId> <artifactId>common-rest-api</artifactId> <version>1.1-SNAPSHOT</version> <version>2.0-SNAPSHOT</version> <name>ReST API Client for Java</name> <properties> Loading Loading @@ -39,11 +39,6 @@ <artifactId>jackson-datatype-jsr310</artifactId> <version>2.12.2</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> Loading @@ -54,36 +49,6 @@ <artifactId>jakarta.ws.rs-api</artifactId> <version>2.1.6</version> </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> <version>${jersey.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${jersey.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> Loading @@ -106,6 +71,37 @@ <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <version>3.2.0</version> <executions> <execution> <id>add-jaxrs-src</id> <goals><goal>add-source</goal></goals> <configuration> <sources> <source>src/main/${jaxrs.impl}</source> </sources> </configuration> </execution> <execution> <id>add-test-src</id> <goals><goal>add-test-source</goal></goals> <configuration> <sources> <source>src/test/${jaxrs.impl}</source> </sources> </configuration> </execution> </executions> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <classifier>${jaxrs.impl}</classifier> </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>3.0.0-M5</version> Loading Loading @@ -144,6 +140,70 @@ </plugins> </build> <profiles> <profile> <id>jaxrs-jersey</id> <activation> <activeByDefault>true</activeByDefault> <property> <name>jaxrs.impl</name> <value>jersey</value> </property> </activation> <properties> <jaxrs.impl>jersey</jaxrs.impl> </properties> <dependencies> <dependency> <groupId>org.glassfish.jersey.ext</groupId> <artifactId>jersey-proxy-client</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-multipart</artifactId> <version>${jersey.version}</version> </dependency> <dependency> <groupId>org.glassfish.jersey.inject</groupId> <artifactId>jersey-hk2</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey.version}</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> <id>jaxrs-cxf</id> <activation> <property> <name>jaxrs.impl</name> <value>cxf</value> </property> </activation> <properties> <jaxrs.impl>cxf</jaxrs.impl> </properties> <dependencies> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> </dependency> </dependencies> </profile> </profiles> <pluginRepositories> <pluginRepository> <id>inteligr8-public</id> Loading
src/main/java/com/inteligr8/rs/ClientCxfConfiguration.java→src/main/cxf/com/inteligr8/rs/ClientCxfConfiguration.java +0 −0 File moved. View file
src/main/java/com/inteligr8/rs/ClientCxfImpl.java→src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java +0 −0 File moved. View file
src/main/java/com/inteligr8/rs/CxfLoggingFilter.java→src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java +0 −0 File moved. View file
src/main/java/com/inteligr8/rs/CxfMultipartProvider.java→src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java +0 −0 File moved. View file