Skip to content

Commit 0bf4a75

Browse files
author
Fernando Saint-Jean
committed
updates things to work with new parent, but we do ignore gpg... not great.
1 parent 59c0f70 commit 0bf4a75

File tree

5 files changed

+1023
-14
lines changed

5 files changed

+1023
-14
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
1+
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

.travis.yml

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,48 @@
1-
sudo: required
1+
# Run `travis lint` when changing this file to avoid breaking the build.
2+
# Default JDK is really old: 1.8.0_31; Trusty's is less old: 1.8.0_51
3+
# https://docs.travis-ci.com/user/ci-environment/#Virtualization-environments
24
dist: trusty
3-
cache:
4-
directories:
5-
- "$HOME/.m2"
5+
sudo: false
66
language: java
7-
jdk:
8-
- oraclejdk8
7+
jdk: oraclejdk8
98
before_install:
10-
- git config user.name "$GH_USER"
11-
- git config user.email "$GH_USER_EMAIL"
12-
- git config credential.helper "store --file=.git/credentials"
13-
- echo "https://$GH_TOKEN:@github.com" > .git/credentials
9+
# Parameters used during release
10+
- git config user.name "$GH_USER"
11+
- git config user.email "$GH_USER_EMAIL"
12+
# setup https authentication credentials, used by ./mvnw release:prepare
13+
- git config credential.helper "store --file=.git/credentials"
14+
- echo "https://$GH_TOKEN:@github.com" > .git/credentials
15+
1416
install:
15-
- "./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -B -V"
17+
# Override default travis to use the maven wrapper
18+
- ./mvnw install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true -B -V
19+
1620
script:
17-
- "./travis/publish.sh"
21+
- ./travis/publish.sh
22+
23+
cache:
24+
directories:
25+
- $HOME/.m2
26+
27+
matrix:
28+
include:
29+
- os: linux
30+
jdk: oraclejdk8
31+
addons:
32+
apt:
33+
packages:
34+
- oracle-java8-installer
35+
- os: linux
36+
jdk: openjdk8
37+
- os: linux
38+
jdk: openjdk11
39+
40+
# Don't build release tags. This avoids publish conflicts because the version commit exists both on master and the release tag.
41+
# See https://github.com/travis-ci/travis-ci/issues/1532
1842
branches:
1943
except:
20-
- "/^[0-9]/"
44+
- /^[0-9]/
45+
2146
env:
2247
global:
2348
# Ex. travis encrypt BINTRAY_USER=your_github_account

src/config/bom.xml

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright 2017-2019 The Feign Authors
5+
6+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
7+
in compliance with the License. You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software distributed under the License
12+
is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
13+
or implied. See the License for the specific language governing permissions and limitations under
14+
the License.
15+
16+
-->
17+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<modelVersion>4.0.0</modelVersion>
19+
20+
<groupId>${model.groupId}</groupId>
21+
<artifactId>${model.artifactId}</artifactId>
22+
<version>${model.version}</version>
23+
<name>${model.name}</name>
24+
<packaging>pom</packaging>
25+
<description>Bill of material</description>
26+
#if ($model.url)
27+
28+
<url>${model.url}</url>#end
29+
#if ($model.licenses && !$model.licenses.isEmpty())
30+
31+
<licenses>#foreach($l in $model.licenses)
32+
33+
<license>
34+
<name>${l.name}</name>
35+
<url>${l.url}</url>
36+
<distribution>${l.distribution}</distribution>
37+
</license>#end
38+
39+
</licenses>
40+
#end
41+
42+
#if ($model.developers && !$model.developers.isEmpty())
43+
<developers>#foreach($d in $model.developers)
44+
45+
<developer>
46+
<id>${d.id}</id>
47+
<name>${d.name}</name>#if($d.email)
48+
49+
<email>${d.email}</email>#end#if($d.url)
50+
51+
<url>${d.url}</url>#end#if($d.organization)
52+
53+
<organization>${d.organization}</organization>#end#if($d.organizationUrl)
54+
55+
<organizationUrl>${d.organizationUrl}</organizationUrl>#end
56+
57+
</developer>#end
58+
59+
</developers>
60+
#end
61+
62+
<dependencyManagement>
63+
<dependencies>#foreach($d in $model.dependencyManagement.dependencies)
64+
65+
<dependency>
66+
<groupId>${d.groupId}</groupId>
67+
<artifactId>${d.artifactId}</artifactId>
68+
<version>${d.version}</version>#if( $d.scope && $!d.scope != '' )
69+
70+
<scope>${d.scope}</scope>#end#if( $d.type && $!d.type != '' && $!d.type != 'jar' && $!d.type != 'bundle')
71+
72+
<type>${d.type}</type>#end#if( $d.classifier && $!d.classifier != '' )
73+
74+
<classifier>${d.classifier}</classifier>#end#if( $d.exclusions && $d.exclusions.size() > 0 )
75+
76+
<exclusions>#foreach( $e in $d.exclusions )
77+
78+
<exclusion>
79+
<groupId>${e.groupId}</groupId>
80+
<artifactId>${e.artifactId}</artifactId>
81+
</exclusion>#end
82+
83+
</exclusions>#end
84+
85+
</dependency>#end
86+
87+
</dependencies>
88+
</dependencyManagement>
89+
90+
</project>

0 commit comments

Comments
 (0)