Skip to content

Commit 167c674

Browse files
author
jsabin
committed
Manual merge of pull request kairosdb#53 "Adding initial support to query tags service".
1 parent 3a92005 commit 167c674

17 files changed

+1080
-397
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ out/*
1010
dependency.txt
1111
.tablesawcache
1212
.idea
13+
+.classpath
14+
+.project
15+
+.settings

‎pom.xml

+165-162
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4+
<modelVersion>4.0.0</modelVersion>
45

5-
<groupId>org.kairosdb</groupId>
6-
<artifactId>client</artifactId>
7-
<version>2.2.0-SNAPSHOT</version>
8-
<packaging>jar</packaging>
6+
<groupId>org.kairosdb</groupId>
7+
<artifactId>client</artifactId>
8+
<version>2.2.0-SNAPSHOT</version>
9+
<packaging>jar</packaging>
910

10-
<name>kairosclient</name>
11-
<description>Java client for pushing and querying data to/from KairosDB</description>
11+
<name>kairosclient</name>
12+
<description>Java client for pushing and querying data to/from KairosDB
13+
</description>
1214
<url>http://kairosdb.org</url>
1315

1416
<scm>
@@ -36,78 +38,78 @@
3638
</developer>
3739
</developers>
3840

39-
<dependencies>
40-
<dependency>
41-
<groupId>com.google.guava</groupId>
42-
<artifactId>guava</artifactId>
43-
<version>14.0</version>
44-
</dependency>
45-
<dependency>
46-
<groupId>org.hamcrest</groupId>
47-
<artifactId>hamcrest-all</artifactId>
48-
<version>1.1</version>
49-
<scope>test</scope>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.apache.httpcomponents</groupId>
53-
<artifactId>httpclient</artifactId>
54-
<version>4.3.3</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>commons-lang</groupId>
58-
<artifactId>commons-lang</artifactId>
59-
<version>2.6</version>
60-
</dependency>
61-
<dependency>
62-
<groupId>commons-io</groupId>
63-
<artifactId>commons-io</artifactId>
64-
<version>2.2</version>
65-
</dependency>
66-
<dependency>
67-
<groupId>com.google.code.findbugs</groupId>
68-
<artifactId>jsr305</artifactId>
69-
<version>2.0.0</version>
70-
</dependency>
41+
<dependencies>
42+
<dependency>
43+
<groupId>com.google.guava</groupId>
44+
<artifactId>guava</artifactId>
45+
<version>14.0</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.hamcrest</groupId>
49+
<artifactId>hamcrest-all</artifactId>
50+
<version>1.1</version>
51+
<scope>test</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.apache.httpcomponents</groupId>
55+
<artifactId>httpclient</artifactId>
56+
<version>4.3.3</version>
57+
</dependency>
58+
<dependency>
59+
<groupId>commons-lang</groupId>
60+
<artifactId>commons-lang</artifactId>
61+
<version>2.6</version>
62+
</dependency>
63+
<dependency>
64+
<groupId>commons-io</groupId>
65+
<artifactId>commons-io</artifactId>
66+
<version>2.2</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>com.google.code.findbugs</groupId>
70+
<artifactId>jsr305</artifactId>
71+
<version>2.0.0</version>
72+
</dependency>
7173

72-
<dependency>
73-
<groupId>junit</groupId>
74-
<artifactId>junit</artifactId>
75-
<version>4.11</version>
76-
<scope>test</scope>
77-
</dependency>
78-
<dependency>
79-
<groupId>com.google.code.gson</groupId>
80-
<artifactId>gson</artifactId>
81-
<version>2.2.4</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>org.kairosdb</groupId>
85-
<artifactId>kairosdb</artifactId>
86-
<version>1.1.2-1</version>
87-
<scope>test</scope>
88-
</dependency>
74+
<dependency>
75+
<groupId>junit</groupId>
76+
<artifactId>junit</artifactId>
77+
<version>4.11</version>
78+
<scope>test</scope>
79+
</dependency>
80+
<dependency>
81+
<groupId>com.google.code.gson</groupId>
82+
<artifactId>gson</artifactId>
83+
<version>2.2.4</version>
84+
</dependency>
85+
<dependency>
86+
<groupId>org.kairosdb</groupId>
87+
<artifactId>kairosdb</artifactId>
88+
<version>1.1.3-1</version>
89+
<scope>test</scope>
90+
</dependency>
8991

90-
<dependency>
91-
<groupId>org.mockito</groupId>
92-
<artifactId>mockito-core</artifactId>
93-
<version>1.9.5</version>
94-
<scope>test</scope>
95-
</dependency>
96-
</dependencies>
92+
<dependency>
93+
<groupId>org.mockito</groupId>
94+
<artifactId>mockito-core</artifactId>
95+
<version>1.9.5</version>
96+
<scope>test</scope>
97+
</dependency>
98+
</dependencies>
9799

98-
<repositories>
99-
<repository>
100-
<id>sonatype-nexus-snapshots</id>
101-
<name>Sonatype Nexus Snapshots</name>
102-
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
103-
<releases>
104-
<enabled>false</enabled>
105-
</releases>
106-
<snapshots>
107-
<enabled>true</enabled>
108-
</snapshots>
109-
</repository>
110-
</repositories>
100+
<repositories>
101+
<repository>
102+
<id>sonatype-nexus-snapshots</id>
103+
<name>Sonatype Nexus Snapshots</name>
104+
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
105+
<releases>
106+
<enabled>false</enabled>
107+
</releases>
108+
<snapshots>
109+
<enabled>true</enabled>
110+
</snapshots>
111+
</repository>
112+
</repositories>
111113

112114
<distributionManagement>
113115
<snapshotRepository>
@@ -116,96 +118,97 @@
116118
</snapshotRepository>
117119
<repository>
118120
<id>ossrh</id>
119-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
121+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/
122+
</url>
120123
</repository>
121124
</distributionManagement>
122125

123126

124-
<build>
125-
<plugins>
126-
<plugin>
127-
<groupId>org.apache.maven.plugins</groupId>
128-
<artifactId>maven-compiler-plugin</artifactId>
129-
<version>2.5.1</version>
130-
<configuration>
131-
<source>1.6</source>
132-
<target>1.6</target>
133-
</configuration>
134-
</plugin>
135-
<plugin>
136-
<groupId>org.jacoco</groupId>
137-
<artifactId>jacoco-maven-plugin</artifactId>
138-
<version>0.7.7.201606060606</version>
139-
<executions>
140-
<execution>
141-
<id>prepare-agent</id>
142-
<goals>
143-
<goal>prepare-agent</goal>
144-
</goals>
145-
</execution>
146-
<execution>
147-
<id>report</id>
148-
<phase>prepare-package</phase>
149-
<goals>
150-
<goal>report</goal>
151-
</goals>
152-
</execution>
153-
</executions>
154-
</plugin>
127+
<build>
128+
<plugins>
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-compiler-plugin</artifactId>
132+
<version>2.5.1</version>
133+
<configuration>
134+
<source>1.6</source>
135+
<target>1.6</target>
136+
</configuration>
137+
</plugin>
138+
<plugin>
139+
<groupId>org.jacoco</groupId>
140+
<artifactId>jacoco-maven-plugin</artifactId>
141+
<version>0.7.7.201606060606</version>
142+
<executions>
143+
<execution>
144+
<id>prepare-agent</id>
145+
<goals>
146+
<goal>prepare-agent</goal>
147+
</goals>
148+
</execution>
149+
<execution>
150+
<id>report</id>
151+
<phase>prepare-package</phase>
152+
<goals>
153+
<goal>report</goal>
154+
</goals>
155+
</execution>
156+
</executions>
157+
</plugin>
155158

156-
<plugin>
157-
<groupId>org.apache.maven.plugins</groupId>
158-
<artifactId>maven-source-plugin</artifactId>
159-
<version>2.2.1</version>
160-
<executions>
161-
<execution>
162-
<id>attach-sources</id>
163-
<goals>
164-
<goal>jar-no-fork</goal>
165-
</goals>
166-
</execution>
167-
</executions>
168-
</plugin>
169-
<plugin>
170-
<groupId>org.apache.maven.plugins</groupId>
171-
<artifactId>maven-javadoc-plugin</artifactId>
172-
<version>2.9.1</version>
173-
<executions>
174-
<execution>
175-
<id>attach-javadocs</id>
176-
<goals>
177-
<goal>jar</goal>
178-
</goals>
179-
</execution>
180-
</executions>
181-
</plugin>
159+
<plugin>
160+
<groupId>org.apache.maven.plugins</groupId>
161+
<artifactId>maven-source-plugin</artifactId>
162+
<version>2.2.1</version>
163+
<executions>
164+
<execution>
165+
<id>attach-sources</id>
166+
<goals>
167+
<goal>jar-no-fork</goal>
168+
</goals>
169+
</execution>
170+
</executions>
171+
</plugin>
172+
<plugin>
173+
<groupId>org.apache.maven.plugins</groupId>
174+
<artifactId>maven-javadoc-plugin</artifactId>
175+
<version>2.9.1</version>
176+
<executions>
177+
<execution>
178+
<id>attach-javadocs</id>
179+
<goals>
180+
<goal>jar</goal>
181+
</goals>
182+
</execution>
183+
</executions>
184+
</plugin>
182185

183-
<plugin>
184-
<groupId>org.apache.maven.plugins</groupId>
185-
<artifactId>maven-gpg-plugin</artifactId>
186-
<version>1.6</version>
187-
<executions>
188-
<execution>
189-
<id>sign-artifacts</id>
190-
<phase>verify</phase>
191-
<goals>
192-
<goal>sign</goal>
193-
</goals>
194-
</execution>
195-
</executions>
196-
</plugin>
186+
<plugin>
187+
<groupId>org.apache.maven.plugins</groupId>
188+
<artifactId>maven-gpg-plugin</artifactId>
189+
<version>1.6</version>
190+
<executions>
191+
<execution>
192+
<id>sign-artifacts</id>
193+
<phase>verify</phase>
194+
<goals>
195+
<goal>sign</goal>
196+
</goals>
197+
</execution>
198+
</executions>
199+
</plugin>
197200

198-
<plugin>
199-
<groupId>org.sonatype.plugins</groupId>
200-
<artifactId>nexus-staging-maven-plugin</artifactId>
201-
<version>1.6.2</version>
202-
<extensions>true</extensions>
203-
<configuration>
204-
<serverId>ossrh</serverId>
205-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
206-
<autoReleaseAfterClose>false</autoReleaseAfterClose>
207-
</configuration>
208-
</plugin>
209-
</plugins>
210-
</build>
201+
<plugin>
202+
<groupId>org.sonatype.plugins</groupId>
203+
<artifactId>nexus-staging-maven-plugin</artifactId>
204+
<version>1.6.2</version>
205+
<extensions>true</extensions>
206+
<configuration>
207+
<serverId>ossrh</serverId>
208+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
209+
<autoReleaseAfterClose>false</autoReleaseAfterClose>
210+
</configuration>
211+
</plugin>
212+
</plugins>
213+
</build>
211214
</project>

0 commit comments

Comments
 (0)