Skip to content

Commit 242f1e7

Browse files
majst01majst01
authored
Merge pull request influxdata#335 from bonitoo-io/release-2.6
release 2.6
2 parents e88a882 + 25f9a4a commit 242f1e7

File tree

3 files changed

+76
-14
lines changed

3 files changed

+76
-14
lines changed

‎pom.xml‎

Lines changed: 69 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<?xml version="1.0"?>
22
<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">
3-
<parent>
4-
<groupId>org.sonatype.oss</groupId>
5-
<artifactId>oss-parent</artifactId>
6-
<version>7</version>
7-
</parent>
8-
93
<modelVersion>4.0.0</modelVersion>
104
<groupId>org.influxdb</groupId>
115
<artifactId>influxdb-java</artifactId>
126
<packaging>jar</packaging>
13-
<version>2.5-SNAPSHOT</version>
7+
<version>2.6</version>
148
<name>influxdb java bindings</name>
159
<description>Java API to access the InfluxDB REST API</description>
1610
<url>http://www.influxdb.org</url>
@@ -57,6 +51,19 @@
5751
</plugin>
5852
</plugins>
5953
</reporting>
54+
55+
<distributionManagement>
56+
<snapshotRepository>
57+
<id>ossrh</id>
58+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
59+
</snapshotRepository>
60+
<repository>
61+
<id>ossrh</id>
62+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
63+
</repository>
64+
</distributionManagement>
65+
66+
6067
<build>
6168
<pluginManagement>
6269
<plugins>
@@ -82,6 +89,61 @@
8289
</plugins>
8390
</pluginManagement>
8491
<plugins>
92+
93+
<plugin>
94+
<groupId>org.sonatype.plugins</groupId>
95+
<artifactId>nexus-staging-maven-plugin</artifactId>
96+
<version>1.6.7</version>
97+
<extensions>true</extensions>
98+
<configuration>
99+
<serverId>ossrh</serverId>
100+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
101+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
102+
</configuration>
103+
</plugin>
104+
<plugin>
105+
<groupId>org.apache.maven.plugins</groupId>
106+
<artifactId>maven-source-plugin</artifactId>
107+
<version>3.0.1</version>
108+
<executions>
109+
<execution>
110+
<id>attach-sources</id>
111+
<goals>
112+
<goal>jar-no-fork</goal>
113+
</goals>
114+
</execution>
115+
</executions>
116+
</plugin>
117+
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-javadoc-plugin</artifactId>
121+
<version>2.10.4</version>
122+
<executions>
123+
<execution>
124+
<id>attach-javadocs</id>
125+
<goals>
126+
<goal>jar</goal>
127+
</goals>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
<!-- This is needed at release time only with the keys of a person
132+
<plugin>
133+
<groupId>org.apache.maven.plugins</groupId>
134+
<artifactId>maven-gpg-plugin</artifactId>
135+
<version>1.6</version>
136+
<executions>
137+
<execution>
138+
<id>sign-artifacts</id>
139+
<phase>verify</phase>
140+
<goals>
141+
<goal>sign</goal>
142+
</goals>
143+
</execution>
144+
</executions>
145+
</plugin>
146+
-->
85147
<plugin>
86148
<groupId>org.jacoco</groupId>
87149
<artifactId>jacoco-maven-plugin</artifactId>

‎src/main/java/org/influxdb/InfluxDB.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ public String value() {
104104

105105
/**
106106
* Enable batching of single Point writes as
107-
* {@link #enableBatch(int, int, TimeUnit, ThreadFactory, BiConsumer<Iterable<Point>, Throwable>)}
107+
* {@link #enableBatch(int, int, TimeUnit, ThreadFactory, BiConsumer)}
108108
* using with a exceptionHandler that does nothing.
109109
*
110-
* @see #enableBatch(int, int, TimeUnit, ThreadFactory, BiConsumer<Iterable<Point>, Throwable>)
110+
* @see #enableBatch(int, int, TimeUnit, ThreadFactory, BiConsumer)
111111
*/
112112
public InfluxDB enableBatch(final int actions, final int flushDuration, final TimeUnit flushDurationTimeUnit,
113113
final ThreadFactory threadFactory);
@@ -179,9 +179,9 @@ public InfluxDB enableBatch(final int actions, final int flushDuration, final Ti
179179
public void write(final int udpPort, final Point point);
180180

181181
/**
182-
* Write a set of Points to the influxdb database with the new (>= 0.9.0rc32) lineprotocol.
182+
* Write a set of Points to the influxdb database with the new (&gt;= 0.9.0rc32) lineprotocol.
183183
*
184-
* {@linkplain "https://github.com/influxdb/influxdb/pull/2696"}
184+
* @see <a href="https://github.com/influxdb/influxdb/pull/2696">2696</a>
185185
*
186186
* @param batchPoints
187187
*/
@@ -190,7 +190,7 @@ public InfluxDB enableBatch(final int actions, final int flushDuration, final Ti
190190
/**
191191
* Write a set of Points to the influxdb database with the string records.
192192
*
193-
* {@linkplain "https://github.com/influxdb/influxdb/pull/2696"}
193+
* @see <a href="https://github.com/influxdb/influxdb/pull/2696">2696</a>
194194
*
195195
* @param records
196196
*/
@@ -200,7 +200,7 @@ public void write(final String database, final String retentionPolicy,
200200
/**
201201
* Write a set of Points to the influxdb database with the list of string records.
202202
*
203-
* {@linkplain "https://github.com/influxdb/influxdb/pull/2696"}
203+
* @see <a href="https://github.com/influxdb/influxdb/pull/2696">2696</a>
204204
*
205205
* @param records
206206
*/

‎src/main/java/org/influxdb/impl/TimeUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static String toTimePrecision(final TimeUnit t) {
6969
/**
7070
* convert a unix epoch time to timestamp used by influxdb.
7171
* this can then be used in query expressions against influxdb's time column like so:
72-
* influxDB.query(new Query("SELECT * FROM some_measurement WHERE time >= '"
72+
* influxDB.query(new Query("SELECT * FROM some_measurement WHERE time &gt;= '"
7373
* + toInfluxDBTimeFormat(timeStart) + "'", some_database))
7474
* influxdb time format example: 2016-10-31T06:52:20.020Z
7575
*

0 commit comments

Comments
 (0)