Skip to content

Commit 18e4112

Browse files
Merge pull request #6 from julianladisch/master
Release 1.13
2 parents f1ab2a9 + 480639e commit 18e4112

2 files changed

Lines changed: 52 additions & 6 deletions

File tree

Changes

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ See the bottom of this file for a list of things still to do.
55
The work for releases 1.0, 1.2 and 1.2.1 was sponsored by the National
66
Library of Australia, whose help we gratefully acknowledge.
77

8+
1.13 Wed 10 May 2017 14:44:44 CET
9+
- add classes for visitor traversal
10+
- truncation attribute right/left/both/none (thanks to Rustam Usmanov)
11+
- exact relation == (thanks to Rustam Usmanov)
12+
- CQLNodeVisitor rewritten to allow for generation of prefix,
13+
postfix and infix notations
14+
- enum CQLBoolean
15+
816
1.12 Mon 17 Mar 2014 16:16:16 CET
917
- rewrite the CQL lexer to better conform to CQL spec
1018
(e.g retain escapes for wildcards, etc)

pom.xml

Lines changed: 44 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<groupId>org.z3950.zing</groupId>
44
<artifactId>cql-java</artifactId>
55
<packaging>jar</packaging>
6-
<version>1.13-SNAPSHOT</version>
6+
<version>1.14-SNAPSHOT</version>
77
<name>cql-java</name>
88
<url>http://www.indexdata.com/cql-java</url>
99
<licenses>
@@ -41,6 +41,7 @@
4141
<scm>
4242
<connection>scm:git:ssh://git.indexdata.com:222/home/git/pub/cql-java</connection>
4343
<url>http://git.indexdata.com/?p=cql-java.git</url>
44+
<tag>HEAD</tag>
4445
</scm>
4546
<issueManagement>
4647
<system>Bugzilla</system>
@@ -55,7 +56,7 @@
5556
<plugin>
5657
<groupId>org.apache.maven.plugins</groupId>
5758
<artifactId>maven-javadoc-plugin</artifactId>
58-
<version>2.8.1</version>
59+
<version>2.10.4</version>
5960
<configuration>
6061
<chartset>UTF-8</chartset>
6162
</configuration>
@@ -89,15 +90,31 @@
8990
<plugin>
9091
<groupId>org.apache.maven.plugins</groupId>
9192
<artifactId>maven-release-plugin</artifactId>
92-
<version>2.2.2</version>
93+
<version>2.5.3</version>
9394
<configuration>
9495
<preparationGoals>clean verify</preparationGoals>
95-
<releaseProfiles>production</releaseProfiles>
96+
<releaseProfiles>maven-3</releaseProfiles>
9697
<tagNameFormat>v@{project.version}</tagNameFormat>
9798
<pushChanges>false</pushChanges>
9899
<localCheckout>true</localCheckout>
99100
</configuration>
100101
</plugin>
102+
<plugin>
103+
<groupId>org.apache.maven.plugins</groupId>
104+
<artifactId>maven-javadoc-plugin</artifactId>
105+
<version>2.10.4</version>
106+
<executions>
107+
<execution>
108+
<id>attach-javadocs</id>
109+
<goals>
110+
<goal>jar</goal>
111+
</goals>
112+
<configuration>
113+
<additionalparam>${javadoc.opts}</additionalparam>
114+
</configuration>
115+
</execution>
116+
</executions>
117+
</plugin>
101118
</plugins>
102119
</build>
103120
<dependencies>
@@ -130,7 +147,7 @@
130147
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
131148
</properties>
132149
<profiles>
133-
<profile>
150+
<profile>
134151
<id>maven-3</id>
135152
<activation>
136153
<file>
@@ -144,7 +161,18 @@
144161
<plugin>
145162
<groupId>org.apache.maven.plugins</groupId>
146163
<artifactId>maven-site-plugin</artifactId>
147-
<version>3.0</version>
164+
<version>3.6</version>
165+
<configuration>
166+
<reportPlugins>
167+
<plugin>
168+
<groupId>org.apache.maven.plugins</groupId>
169+
<artifactId>maven-javadoc-plugin</artifactId>
170+
<configuration>
171+
<additionalparam>${javadoc.opts}</additionalparam>
172+
</configuration>
173+
</plugin>
174+
</reportPlugins>
175+
</configuration>
148176
</plugin>
149177
</plugins>
150178
</pluginManagement>
@@ -163,6 +191,16 @@
163191
</plugins>
164192
</build>
165193
</profile>
194+
<profile>
195+
<!-- https://stackoverflow.com/questions/15886209/maven-is-not-working-in-java-8-when-javadoc-tags-are-incomplete -->
196+
<id>java8-doclint-disabled</id>
197+
<activation>
198+
<jdk>[1.8,)</jdk>
199+
</activation>
200+
<properties>
201+
<javadoc.opts>-Xdoclint:none</javadoc.opts>
202+
</properties>
203+
</profile>
166204
</profiles>
167205
</project>
168206

0 commit comments

Comments
 (0)