Skip to content

Commit cf215c4

Browse files
authored
Merge pull request #220 from maxmind/horgh/release
Prepare for 2.15.0-rc1 release
2 parents 94e195e + baf4e43 commit cf215c4

File tree

3 files changed

+31
-12
lines changed

3 files changed

+31
-12
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
CHANGELOG
22
=========
33

4-
2.15.0
5-
-------------------
4+
2.15.0-rc1 (2020-09-29)
5+
-----------------------
6+
67
* The HTTP client now allows up to 20 connections to be active at once.
78
Previously the limit was 2.
89
* Update `maxmind-db` dependency to a new version that no longer uses

dev-bin/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eu -o pipefail
55
changelog=$(cat CHANGELOG.md)
66

77
regex='
8-
([0-9]+\.[0-9]+\.[0-9]+) \(([0-9]{4}-[0-9]{2}-[0-9]{2})\)
8+
([0-9]+\.[0-9]+\.[0-9]+[a-zA-Z0-9\-]*) \(([0-9]{4}-[0-9]{2}-[0-9]{2})\)
99
-*
1010
1111
((.|

pom.xml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.core</groupId>
5858
<artifactId>jackson-databind</artifactId>
59-
<version>2.11.0</version>
59+
<version>2.11.2</version>
6060
</dependency>
6161
<dependency>
6262
<groupId>com.fasterxml.jackson.core</groupId>
@@ -119,21 +119,21 @@
119119
<plugin>
120120
<artifactId>maven-javadoc-plugin</artifactId>
121121
<version>3.2.0</version>
122+
<configuration>
123+
<links>
124+
<link>
125+
http://maxmind.github.io/MaxMind-DB-Reader-java/doc/latest/
126+
</link>
127+
</links>
128+
<source>8</source>
129+
</configuration>
122130
<executions>
123131
<execution>
124132
<id>javadoc-jar</id>
125133
<phase>package</phase>
126134
<goals>
127135
<goal>jar</goal>
128136
</goals>
129-
<configuration>
130-
<links>
131-
<link>
132-
http://maxmind.github.io/MaxMind-DB-Reader-java/doc/latest/
133-
</link>
134-
</links>
135-
<source>8</source>
136-
</configuration>
137137
</execution>
138138
</executions>
139139
</plugin>
@@ -253,4 +253,22 @@
253253
<artifactId>oss-parent</artifactId>
254254
<version>7</version>
255255
</parent>
256+
<profiles>
257+
<profile>
258+
<id>active-on-jdk-9-plus</id>
259+
<activation>
260+
<jdk>[9,)</jdk>
261+
</activation>
262+
<build>
263+
<plugins>
264+
<plugin>
265+
<artifactId>maven-compiler-plugin</artifactId>
266+
<configuration>
267+
<release>8</release>
268+
</configuration>
269+
</plugin>
270+
</plugins>
271+
</build>
272+
</profile>
273+
</profiles>
256274
</project>

0 commit comments

Comments
 (0)