diff --git a/.mvn/jvm.config b/.mvn/jvm.config new file mode 100644 index 000000000..0e7dabeff --- /dev/null +++ b/.mvn/jvm.config @@ -0,0 +1 @@ +-Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom \ No newline at end of file diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ + diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 000000000..5fd4d5023 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 000000000..6637cedb2 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index bf207669a..7e9d20bc7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ + - $HOME/.m2 env: global: - secure: YIuMCulUHkCrZDzrIZj+ni+QoQYT3H5C6z32FDeRb4HD9GQzuYQ/+dLWZ6p/X2vkPv1FBlXYb6hpw9PvRLPkGqic0oKX3kMj5LmaXw6nmrq5jvmB0qAjoQ0ukhSUzQVK+43A9aNrAEsHRdrESjleeR1ISeQsUdkikaSs2D1+gQI= diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f6edfa9..a0e1b66c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### Version 9.0 +* Migrates to maven from gradle +* Changes maven groupId to `io.github.openfeign` + ### Version 8.17 * Adds support to RxJava Completable via `HystrixFeign` builder with fallback support * Upgraded hystrix-core to 1.4.26 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 648e4e768..d494fe900 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -4,15 +4,16 @@ 4.0.0 - org.sonatype.oss - oss-parent - 9 + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. - com.netflix.feign + io.github.openfeign feign-benchmark jar - 8.1.0-SNAPSHOT + 9.0.0-SNAPSHOT Feign Benchmark (JMH) @@ -21,14 +22,12 @@ - com.netflix.feign + io.github.openfeign feign-core - ${project.version} - com.netflix.feign + io.github.openfeign feign-okhttp - ${project.version} com.squareup.okhttp diff --git a/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java b/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java index 518755fcc..661c75714 100644 --- a/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java +++ b/benchmark/src/main/java/feign/benchmark/RealRequestBenchmarks.java @@ -50,8 +50,7 @@ public rx.Observable handle(HttpServerRequest request, } }); server.start(); - client = new OkHttpClient(); - client.setRetryOnConnectionFailure(false); + client = new OkHttpClient.Builder().retryOnConnectionFailure(false).build(); okFeign = Feign.builder() .client(new feign.okhttp.OkHttpClient(client)) .target(FeignTestInterface.class, "http://localhost:" + SERVER_PORT); @@ -69,8 +68,8 @@ public void tearDown() throws InterruptedException { * How fast can we execute get commands synchronously? */ @Benchmark - public com.squareup.okhttp.Response query_baseCaseUsingOkHttp() throws IOException { - com.squareup.okhttp.Response result = client.newCall(queryRequest).execute(); + public okhttp3.Response query_baseCaseUsingOkHttp() throws IOException { + okhttp3.Response result = client.newCall(queryRequest).execute(); result.body().close(); return result; } diff --git a/buildViaTravis.sh b/buildViaTravis.sh index 3e9546eb3..b0c8b5e9d 100755 --- a/buildViaTravis.sh +++ b/buildViaTravis.sh @@ -3,24 +3,27 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]" - ./gradlew build + ./mvnw clean install elif [ "${bintrayUser}" == "" ]; then echo -e "Building with no environment variables set => Forked repository" - ./gradlew build + ./mvnw clean install elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' + #TODO migrate to maven ./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']' case "$TRAVIS_TAG" in *-rc\.*) + #TODO migrate to maven ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate ;; *) + #TODO migrate to maven ./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final ;; esac else echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']' - ./gradlew build + ./mvnw clean installd fi diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 000000000..57742d72f --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,88 @@ + + + 4.0.0 + + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-core + 9.0.0-SNAPSHOT + feign-core + feign-core + + + 1.8 + 1.8 + + + + + org.jvnet + animal-sniffer-annotation + 1.0 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + com.squareup.okhttp3 + mockwebserver + test + + + com.google.code.gson + gson + 2.5 + + + org.springframework + spring-context + 4.2.5.RELEASE + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-testCompile + + true + true + + ${maven.compiler.testTarget} + ${maven.compiler.testSource} + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + + diff --git a/example-github/.jdk8 b/example-github/.jdk8 new file mode 100644 index 000000000..e69de29bb diff --git a/example-github/pom.xml b/example-github/pom.xml index 1166f83d0..6f5185309 100644 --- a/example-github/pom.xml +++ b/example-github/pom.xml @@ -4,27 +4,26 @@ 4.0.0 - org.sonatype.oss - oss-parent - 7 + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. - com.netflix.feign + io.github.openfeign feign-example-github jar - 8.16.2 + 9.0.0-SNAPSHOT GitHub Example - com.netflix.feign + io.github.openfeign feign-core - ${project.version} - com.netflix.feign + io.github.openfeign feign-gson - ${project.version} diff --git a/example-wikipedia/.jdk8 b/example-wikipedia/.jdk8 new file mode 100644 index 000000000..e69de29bb diff --git a/example-wikipedia/pom.xml b/example-wikipedia/pom.xml index a98e4b19c..e3f72c523 100644 --- a/example-wikipedia/pom.xml +++ b/example-wikipedia/pom.xml @@ -4,27 +4,26 @@ 4.0.0 - org.sonatype.oss - oss-parent - 7 + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. - com.netflix.feign + io.github.openfeign feign-example-wikipedia jar - 8.7.0 + 9.0.0-SNAPSHOT Wikipedia Example - com.netflix.feign + io.github.openfeign feign-core - ${project.version} - com.netflix.feign + io.github.openfeign feign-gson - ${project.version} com.google.code.gson diff --git a/gson/pom.xml b/gson/pom.xml new file mode 100644 index 000000000..0a4ed983e --- /dev/null +++ b/gson/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-gson + 9.0.0-SNAPSHOT + feign-gson + feign-gson + + + io.github.openfeign + feign-core + + + com.google.code.gson + gson + 2.5 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/httpclient/pom.xml b/httpclient/pom.xml new file mode 100644 index 000000000..a2b1f04de --- /dev/null +++ b/httpclient/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-httpclient + 9.0.0-SNAPSHOT + feign-httpclient + feign-httpclient + + + io.github.openfeign + feign-core + + + org.apache.httpcomponents + httpclient + 4.5.1 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + com.squareup.okhttp3 + mockwebserver + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/hystrix/pom.xml b/hystrix/pom.xml new file mode 100644 index 000000000..1e3fc8424 --- /dev/null +++ b/hystrix/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-hystrix + 9.0.0-SNAPSHOT + feign-hystrix + feign-hystrix + + + io.github.openfeign + feign-core + + + com.netflix.hystrix + hystrix-core + 1.4.26 + + + io.github.openfeign + feign-gson + test + + + junit + junit + test + + + org.assertj + assertj-core + test + + + com.squareup.okhttp3 + mockwebserver + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/jackson-jaxb/pom.xml b/jackson-jaxb/pom.xml new file mode 100644 index 000000000..1567229e7 --- /dev/null +++ b/jackson-jaxb/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-jackson-jaxb + 9.0.0-SNAPSHOT + feign-jackson-jaxb + feign-jackson-jaxb + + + io.github.openfeign + feign-core + + + javax.ws.rs + jsr311-api + 1.1.1 + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + 2.6.4 + + + com.sun.jersey + jersey-client + 1.19 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/jackson/pom.xml b/jackson/pom.xml new file mode 100644 index 000000000..41d89d19b --- /dev/null +++ b/jackson/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-jackson + 9.0.0-SNAPSHOT + feign-jackson + feign-jackson + + + io.github.openfeign + feign-core + + + com.fasterxml.jackson.core + jackson-databind + 2.6.4 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/jaxb/pom.xml b/jaxb/pom.xml new file mode 100644 index 000000000..55d74daed --- /dev/null +++ b/jaxb/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-jaxb + 9.0.0-SNAPSHOT + feign-jaxb + feign-jaxb + + + io.github.openfeign + feign-core + + + junit + junit + test + + + org.assertj + assertj-core + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml new file mode 100644 index 000000000..7c95e14e9 --- /dev/null +++ b/jaxrs/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-jaxrs + 9.0.0-SNAPSHOT + feign-jaxrs + feign-jaxrs + + + io.github.openfeign + feign-core + + + javax.ws.rs + jsr311-api + 1.1.1 + + + io.github.openfeign + feign-gson + test + + + junit + junit + test + + + org.assertj + assertj-core + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/mvnw b/mvnw new file mode 100755 index 000000000..7f94d86f9 --- /dev/null +++ b/mvnw @@ -0,0 +1,234 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@" + diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 000000000..b0dc0e7e9 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/okhttp/pom.xml b/okhttp/pom.xml new file mode 100644 index 000000000..f592500b6 --- /dev/null +++ b/okhttp/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-okhttp + 9.0.0-SNAPSHOT + feign-okhttp + feign-okhttp + + + io.github.openfeign + feign-core + + + com.squareup.okhttp3 + okhttp + 3.2.0 + + + junit + junit + test + + + org.assertj + assertj-core + test + + + com.squareup.okhttp3 + mockwebserver + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..9f4ad0209 --- /dev/null +++ b/pom.xml @@ -0,0 +1,205 @@ + + + 4.0.0 + + io.github.openfeign + feign + pom + 9.0.0-SNAPSHOT + Feign + + + UTF-8 + 1.6 + + + + core + example-github + example-wikipedia + gson + httpclient + hystrix + jackson-jaxb + jackson + jaxb + jaxrs + okhttp + ribbon + sax + slf4j + benchmark + + + + + io.github.openfeign + feign-benchmark + ${project.version} + + + io.github.openfeign + feign-core + ${project.version} + + + io.github.openfeign + feign-example-github + ${project.version} + + + io.github.openfeign + feign-example-wikipedia + ${project.version} + + + io.github.openfeign + feign-gradle + ${project.version} + + + io.github.openfeign + feign-gson + ${project.version} + + + io.github.openfeign + feign-httpclient + ${project.version} + + + io.github.openfeign + feign-hystrix + ${project.version} + + + io.github.openfeign + feign-jackson-jaxb + ${project.version} + + + io.github.openfeign + feign-jackson + ${project.version} + + + io.github.openfeign + feign-jaxb + ${project.version} + + + io.github.openfeign + feign-jaxrs + ${project.version} + + + io.github.openfeign + feign-okhttp + ${project.version} + + + io.github.openfeign + feign-ribbon + ${project.version} + + + io.github.openfeign + feign-sax + ${project.version} + + + io.github.openfeign + feign-slf4j + ${project.version} + + + junit + junit + 4.12 + + + org.assertj + assertj-core + 1.7.1 + + + com.squareup.okhttp3 + mockwebserver + 3.2.0 + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + ${java.version} + ${java.version} + + + + + + + java6 + + + .jdk8 + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.14 + + + org.codehaus.mojo.signature + java16 + 1.1 + + + + + enforce-java-6 + test + + check + + + + + + + + + + + adriancole + Adrian Cole + + + spencergibb + Spencer Gibb + spencer@gibb.us + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:https://github.com/Netflix/feign.git + scm:https://github.com/Netflix/feign.git + + https://github.com/Netflix/feign + diff --git a/ribbon/pom.xml b/ribbon/pom.xml new file mode 100644 index 000000000..cbf38dc51 --- /dev/null +++ b/ribbon/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-ribbon + 9.0.0-SNAPSHOT + feign-ribbon + feign-ribbon + + 2.1.1 + + + + io.github.openfeign + feign-core + + + com.netflix.ribbon + ribbon-core + ${ribbon-version} + + + com.netflix.ribbon + ribbon-loadbalancer + ${ribbon-version} + + + junit + junit + test + + + org.assertj + assertj-core + test + + + com.squareup.okhttp3 + mockwebserver + test + + + io.github.openfeign + feign-core + ${project.version} + test-jar + test + + + diff --git a/sax/pom.xml b/sax/pom.xml new file mode 100644 index 000000000..93f32638c --- /dev/null +++ b/sax/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-sax + 9.0.0-SNAPSHOT + feign-sax + feign-sax + + + io.github.openfeign + feign-core + + + junit + junit + test + + + org.assertj + assertj-core + test + + + diff --git a/slf4j/pom.xml b/slf4j/pom.xml new file mode 100644 index 000000000..860bb706d --- /dev/null +++ b/slf4j/pom.xml @@ -0,0 +1,86 @@ + + + 4.0.0 + + io.github.openfeign + feign + 9.0.0-SNAPSHOT + .. + + + io.github.openfeign + feign-slf4j + 9.0.0-SNAPSHOT + feign-slf4j + feign-slf4j + + + io.github.openfeign + feign-core + + + org.slf4j + slf4j-api + 1.7.13 + + + org.slf4j + slf4j-simple + 1.7.13 + test + + + junit + junit + test + + + org.assertj + assertj-core + test + + + + + netflixgithub + Netflix Open Source Development + talent@netflix.com + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + 1.0 + com.netflix.feign#feign-slf4j;8.17.0 + 8.17.0 + integration + travis + Linux + 2016-06-05_00:09:07 + 2.2.1 + talent@netflix.com + talent@netflix.com + /slf4j + https://github.com/Netflix/feign.git + 1c1d2fa + 1c1d2fa91ed0788cad7a5a9901feb22cbf3de8c3 + testing-worker-linux-docker-f919d37f-3389-linux-2 + LOCAL + LOCAL + LOCAL + 1.8.0_31-b13 (Oracle Corporation) + 1.8.0_31 + 1.6 + 1.6 + + + scm:https://github.com/Netflix/feign.git + scm:https://github.com/Netflix/feign.git + + https://github.com/Netflix/feign +