Skip to content

Commit 60e0319

Browse files
adriancoleadriancole
authored
Adds maven project under group id io.github.openfeign (OpenFeign#416)
* Updates travis to use maven for non-deploys * Adds maven project for io.github.openfeign * Polished maven configuraion
1 parent 07275ee commit 60e0319

27 files changed

Lines changed: 1333 additions & 3 deletions

File tree

‎.mvn/jvm.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom

‎.mvn/maven.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

‎.mvn/wrapper/maven-wrapper.jar‎

48.4 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ cache:
1515
directories:
1616
- $HOME/.gradle/caches/
1717
- $HOME/.gradle/wrapper/
18+
- $HOME/.m2
1819
env:
1920
global:
2021
- secure: YIuMCulUHkCrZDzrIZj+ni+QoQYT3H5C6z32FDeRb4HD9GQzuYQ/+dLWZ6p/X2vkPv1FBlXYb6hpw9PvRLPkGqic0oKX3kMj5LmaXw6nmrq5jvmB0qAjoQ0ukhSUzQVK+43A9aNrAEsHRdrESjleeR1ISeQsUdkikaSs2D1+gQI=

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Version 9.0
2+
* Migrates to maven from gradle
3+
* Changes maven groupId to `io.github.openfeign`
4+
15
### Version 8.18
26
* Content-Length response bodies with lengths greater than Integer.MAX_VALUE report null length
37
* Previously the OkhttpClient would throw an exception, and ApacheHttpClient

‎benchmark/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<version>9</version>
1010
</parent>
1111

12+
<!-- TODO: change group id when 9.0 is released -->
1213
<groupId>com.netflix.feign</groupId>
1314
<artifactId>feign-benchmark</artifactId>
1415
<packaging>jar</packaging>

‎buildViaTravis.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,27 @@
33

44
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
55
echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
6-
./gradlew build
6+
./mvnw clean install
77
elif [ "${bintrayUser}" == "" ]; then
88
echo -e "Building with no environment variables set => Forked repository"
9-
./gradlew build
9+
./mvnw clean install
1010
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
1111
echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
12+
#TODO migrate to maven
1213
./gradlew -Prelease.travisci=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build snapshot
1314
elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
1415
echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']'
1516
case "$TRAVIS_TAG" in
1617
*-rc\.*)
18+
#TODO migrate to maven
1719
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" candidate
1820
;;
1921
*)
22+
#TODO migrate to maven
2023
./gradlew -Prelease.travisci=true -Prelease.useLastTag=true -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" final
2124
;;
2225
esac
2326
else
2427
echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG'] Pull Request ['$TRAVIS_PULL_REQUEST']'
25-
./gradlew build
28+
./mvnw clean install
2629
fi

‎core/pom.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>io.github.openfeign</groupId>
9+
<artifactId>parent</artifactId>
10+
<version>9.0.0-SNAPSHOT</version>
11+
</parent>
12+
13+
<artifactId>feign-core</artifactId>
14+
<name>Feign Core</name>
15+
<description>Feign Core</description>
16+
17+
<properties>
18+
<main.basedir>${project.basedir}/..</main.basedir>
19+
</properties>
20+
21+
<dependencies>
22+
<dependency>
23+
<groupId>org.jvnet</groupId>
24+
<artifactId>animal-sniffer-annotation</artifactId>
25+
</dependency>
26+
27+
<dependency>
28+
<groupId>com.squareup.okhttp3</groupId>
29+
<artifactId>mockwebserver</artifactId>
30+
<scope>test</scope>
31+
</dependency>
32+
33+
<dependency>
34+
<groupId>com.google.code.gson</groupId>
35+
<artifactId>gson</artifactId>
36+
<scope>test</scope>
37+
</dependency>
38+
39+
<dependency>
40+
<groupId>org.springframework</groupId>
41+
<artifactId>spring-context</artifactId>
42+
<version>4.2.5.RELEASE</version>
43+
<scope>test</scope>
44+
</dependency>
45+
</dependencies>
46+
47+
<build>
48+
<plugins>
49+
<plugin>
50+
<artifactId>maven-jar-plugin</artifactId>
51+
<executions>
52+
<execution>
53+
<goals>
54+
<goal>test-jar</goal>
55+
</goals>
56+
</execution>
57+
</executions>
58+
</plugin>
59+
</plugins>
60+
</build>
61+
</project>

‎example-github/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ configurations {
1212
}
1313

1414
dependencies {
15+
// TODO: change group id when 9.0 is released
1516
compile 'com.netflix.feign:feign-core:8.16.2'
1617
compile 'com.netflix.feign:feign-gson:8.16.2'
1718
}

0 commit comments

Comments
 (0)