Skip to content

Commit ebc90a7

Browse files
jprantejprante
committed
update to Elasticsearch 5.1.2
1 parent 3b161a1 commit ebc90a7

File tree

109 files changed

+16359
-1510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+16359
-1510
lines changed

‎README.adoc

Lines changed: 516 additions & 0 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 0 additions & 499 deletions
This file was deleted.

‎build.gradle

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
plugins {
32
id "org.sonarqube" version "2.2"
43
id "org.xbib.gradle.plugin.asciidoctor" version "1.5.4.1.0"
@@ -27,9 +26,8 @@ ext {
2726
scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
2827
scmDeveloperConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
2928
versions = [
30-
'elasticsearch' : '2.4.4',
31-
'jackson': '2.6.2',
32-
'log4j': '2.5',
29+
'elasticsearch' : '5.1.2',
30+
'log4j': '2.7',
3331
'junit' : '4.12'
3432
]
3533
}
@@ -48,48 +46,38 @@ repositories {
4846
mavenCentral()
4947
}
5048

51-
sourceSets {
52-
integrationTest {
53-
java {
54-
compileClasspath += main.output + test.output
55-
runtimeClasspath += main.output + test.output
56-
srcDir file('src/integration-test/java')
57-
}
58-
resources.srcDir file('src/integration-test/resources')
59-
}
60-
}
6149
configurations {
50+
asciidoclet
6251
wagon
63-
integrationTestCompile.extendsFrom testCompile
64-
integrationTestRuntime.extendsFrom testRuntime
65-
releaseJars {
52+
distJars {
6653
extendsFrom runtime
6754
exclude group: 'org.elasticsearch'
55+
exclude module: 'lucene-core'
56+
exclude module: 'lucene-analyzers-common'
6857
exclude module: 'jna'
6958
exclude module: 'jackson-core'
7059
exclude module: 'jackson-dataformat-smile'
7160
exclude module: 'jackson-dataformat-yaml'
61+
exclude module: 'jflex'
7262
}
7363
}
7464

7565
dependencies {
7666
compile "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
77-
compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
67+
compileOnly "org.apache.logging.log4j:log4j-core:${versions.log4j}"
7868
testCompile "junit:junit:${versions.junit}"
79-
testCompile "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
8069
testCompile "org.apache.logging.log4j:log4j-core:${versions.log4j}"
81-
integrationTestCompile "junit:junit:${versions.junit}"
82-
integrationTestCompile "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
83-
releaseJars "${project.group}:${project.name}:${project.version}"
70+
asciidoclet 'org.asciidoctor:asciidoclet:1.5.4'
8471
wagon 'org.apache.maven.wagon:wagon-ssh-external:2.10'
72+
distJars "${project.group}:${project.name}:${project.version}"
8573
}
8674

87-
sourceCompatibility = JavaVersion.VERSION_1_7
88-
targetCompatibility = JavaVersion.VERSION_1_7
75+
sourceCompatibility = JavaVersion.VERSION_1_8
76+
targetCompatibility = JavaVersion.VERSION_1_8
8977

9078
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
9179
tasks.withType(JavaCompile) {
92-
options.compilerArgs << "-Xlint:all"
80+
options.compilerArgs << "-Xlint:all" << "-profile" << "compact2"
9381
}
9482

9583

@@ -99,6 +87,7 @@ test {
9987
showStandardStreams = false
10088
exceptionFormat = 'full'
10189
}
90+
reports.html.destination = "docs/test"
10291
}
10392

10493
task makePluginDescriptor(type: Copy) {
@@ -120,38 +109,48 @@ task makePluginDescriptor(type: Copy) {
120109
}
121110

122111
task buildPluginZip(type: Zip, dependsOn: [':jar', ':makePluginDescriptor']) {
123-
from configurations.releaseJars
112+
from configurations.distJars
124113
from 'build/tmp/plugin'
114+
into 'elasticsearch'
125115
classifier 'plugin'
126116
}
127117

128118
task unpackPlugin(type: Copy, dependsOn: [':buildPluginZip']) {
129119
delete "plugins"
130-
from configurations.releaseJars
120+
from configurations.distJars
131121
from 'build/tmp/plugin'
132122
into "plugins/${pluginName}"
133123
}
134124

135-
task integrationTest(type: Test, dependsOn: ['unpackPlugin']) {
136-
testClassesDir = sourceSets.integrationTest.output.classesDir
137-
classpath = configurations.integrationTestCompile
138-
classpath += fileTree("plugins/${pluginName}").include('*.jar')
139-
classpath += sourceSets.integrationTest.output
140-
// without this trick to remove identical jars from classpath, an Elasticsearch bug whines about a "jar hell"
141-
classpath -= configurations.releaseJars
142-
outputs.upToDateWhen { false }
143-
systemProperty 'path.home', projectDir.absolutePath
144-
testLogging.showStandardStreams = false
145-
}
146-
147-
integrationTest.mustRunAfter test
148-
check.dependsOn integrationTest
149-
150125
clean {
151126
delete "plugins"
152127
delete "logs"
153128
}
154129

130+
asciidoctor {
131+
backends 'html5'
132+
outputDir = file('docs')
133+
separateOutputDirs = false
134+
attributes 'source-highlighter': 'coderay',
135+
toc : '',
136+
idprefix : '',
137+
idseparator : '-',
138+
stylesheet: "${projectDir}/src/docs/asciidoc/css/foundation.css"
139+
}
140+
141+
javadoc {
142+
options.docletpath = configurations.asciidoclet.files.asType(List)
143+
options.doclet = 'org.asciidoctor.Asciidoclet'
144+
options.overview = "src/docs/asciidoclet/overview.adoc"
145+
options.addStringOption "-base-dir", "${projectDir}"
146+
options.addStringOption "-attribute",
147+
"name=${project.name},version=${project.version},title-link=https://github.com/${user}/${project.name}"
148+
options.destinationDirectory(file("${projectDir}/docs/javadoc"))
149+
configure(options) {
150+
noTimestamp = true
151+
}
152+
}
153+
155154
task javadocJar(type: Jar, dependsOn: classes) {
156155
from javadoc
157156
into "build/tmp"

‎docs/javadoc/allclasses-frame.html

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!-- NewPage -->
3+
<html lang="de">
4+
<head>
5+
<!-- Generated by javadoc -->
6+
<title>All Classes (elasticsearch-langdetect 5.1.2.0 API)</title>
7+
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
8+
<script type="text/javascript" src="script.js"></script>
9+
</head>
10+
<body>
11+
<h1 class="bar">All&nbsp;Classes</h1>
12+
<div class="indexContainer">
13+
<ul>
14+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectAction.html" title="class in org.xbib.elasticsearch.action.langdetect" target="classFrame">LangdetectAction</a></li>
15+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect" target="classFrame">LangdetectMapper</a></li>
16+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.Builder.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect" target="classFrame">LangdetectMapper.Builder</a></li>
17+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.Defaults.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect" target="classFrame">LangdetectMapper.Defaults</a></li>
18+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.LanguageTo.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect" target="classFrame">LangdetectMapper.LanguageTo</a></li>
19+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.LanguageTo.Builder.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect" target="classFrame">LangdetectMapper.LanguageTo.Builder</a></li>
20+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.TypeParser.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect" target="classFrame">LangdetectMapper.TypeParser</a></li>
21+
<li><a href="org/xbib/elasticsearch/plugin/langdetect/LangdetectPlugin.html" title="class in org.xbib.elasticsearch.plugin.langdetect" target="classFrame">LangdetectPlugin</a></li>
22+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectRequest.html" title="class in org.xbib.elasticsearch.action.langdetect" target="classFrame">LangdetectRequest</a></li>
23+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectRequestBuilder.html" title="class in org.xbib.elasticsearch.action.langdetect" target="classFrame">LangdetectRequestBuilder</a></li>
24+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectResponse.html" title="class in org.xbib.elasticsearch.action.langdetect" target="classFrame">LangdetectResponse</a></li>
25+
<li><a href="org/xbib/elasticsearch/common/langdetect/LangdetectService.html" title="class in org.xbib.elasticsearch.common.langdetect" target="classFrame">LangdetectService</a></li>
26+
<li><a href="org/xbib/elasticsearch/common/langdetect/LangProfile.html" title="class in org.xbib.elasticsearch.common.langdetect" target="classFrame">LangProfile</a></li>
27+
<li><a href="org/xbib/elasticsearch/common/langdetect/Language.html" title="class in org.xbib.elasticsearch.common.langdetect" target="classFrame">Language</a></li>
28+
<li><a href="org/xbib/elasticsearch/common/langdetect/LanguageDetectionException.html" title="class in org.xbib.elasticsearch.common.langdetect" target="classFrame">LanguageDetectionException</a></li>
29+
<li><a href="org/xbib/elasticsearch/common/langdetect/NGram.html" title="class in org.xbib.elasticsearch.common.langdetect" target="classFrame">NGram</a></li>
30+
<li><a href="org/xbib/elasticsearch/rest/action/langdetect/RestLangdetectAction.html" title="class in org.xbib.elasticsearch.rest.action.langdetect" target="classFrame">RestLangdetectAction</a></li>
31+
<li><a href="org/xbib/elasticsearch/action/langdetect/TransportLangdetectAction.html" title="class in org.xbib.elasticsearch.action.langdetect" target="classFrame">TransportLangdetectAction</a></li>
32+
</ul>
33+
</div>
34+
</body>
35+
</html>

‎docs/javadoc/allclasses-noframe.html

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2+
<!-- NewPage -->
3+
<html lang="de">
4+
<head>
5+
<!-- Generated by javadoc -->
6+
<title>All Classes (elasticsearch-langdetect 5.1.2.0 API)</title>
7+
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
8+
<script type="text/javascript" src="script.js"></script>
9+
</head>
10+
<body>
11+
<h1 class="bar">All&nbsp;Classes</h1>
12+
<div class="indexContainer">
13+
<ul>
14+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectAction.html" title="class in org.xbib.elasticsearch.action.langdetect">LangdetectAction</a></li>
15+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect">LangdetectMapper</a></li>
16+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.Builder.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect">LangdetectMapper.Builder</a></li>
17+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.Defaults.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect">LangdetectMapper.Defaults</a></li>
18+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.LanguageTo.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect">LangdetectMapper.LanguageTo</a></li>
19+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.LanguageTo.Builder.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect">LangdetectMapper.LanguageTo.Builder</a></li>
20+
<li><a href="org/xbib/elasticsearch/index/mapper/langdetect/LangdetectMapper.TypeParser.html" title="class in org.xbib.elasticsearch.index.mapper.langdetect">LangdetectMapper.TypeParser</a></li>
21+
<li><a href="org/xbib/elasticsearch/plugin/langdetect/LangdetectPlugin.html" title="class in org.xbib.elasticsearch.plugin.langdetect">LangdetectPlugin</a></li>
22+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectRequest.html" title="class in org.xbib.elasticsearch.action.langdetect">LangdetectRequest</a></li>
23+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectRequestBuilder.html" title="class in org.xbib.elasticsearch.action.langdetect">LangdetectRequestBuilder</a></li>
24+
<li><a href="org/xbib/elasticsearch/action/langdetect/LangdetectResponse.html" title="class in org.xbib.elasticsearch.action.langdetect">LangdetectResponse</a></li>
25+
<li><a href="org/xbib/elasticsearch/common/langdetect/LangdetectService.html" title="class in org.xbib.elasticsearch.common.langdetect">LangdetectService</a></li>
26+
<li><a href="org/xbib/elasticsearch/common/langdetect/LangProfile.html" title="class in org.xbib.elasticsearch.common.langdetect">LangProfile</a></li>
27+
<li><a href="org/xbib/elasticsearch/common/langdetect/Language.html" title="class in org.xbib.elasticsearch.common.langdetect">Language</a></li>
28+
<li><a href="org/xbib/elasticsearch/common/langdetect/LanguageDetectionException.html" title="class in org.xbib.elasticsearch.common.langdetect">LanguageDetectionException</a></li>
29+
<li><a href="org/xbib/elasticsearch/common/langdetect/NGram.html" title="class in org.xbib.elasticsearch.common.langdetect">NGram</a></li>
30+
<li><a href="org/xbib/elasticsearch/rest/action/langdetect/RestLangdetectAction.html" title="class in org.xbib.elasticsearch.rest.action.langdetect">RestLangdetectAction</a></li>
31+
<li><a href="org/xbib/elasticsearch/action/langdetect/TransportLangdetectAction.html" title="class in org.xbib.elasticsearch.action.langdetect">TransportLangdetectAction</a></li>
32+
</ul>
33+
</div>
34+
</body>
35+
</html>

‎docs/javadoc/coderay-asciidoctor.css

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
/* Stylesheet for CodeRay to match GitHub theme | MIT License | http://foundation.zurb.com */
2+
/*pre.CodeRay {background-color:#f7f7f8;}*/
3+
.CodeRay .line-numbers{border-right:1px solid #d8d8d8;padding:0 0.5em 0 .25em}
4+
.CodeRay span.line-numbers{display:inline-block;margin-right:.5em;color:rgba(0,0,0,.3)}
5+
.CodeRay .line-numbers strong{font-weight: normal}
6+
table.CodeRay{border-collapse:separate;border-spacing:0;margin-bottom:0;border:0;background:none}
7+
table.CodeRay td{vertical-align: top}
8+
table.CodeRay td.line-numbers{text-align:right}
9+
table.CodeRay td.line-numbers>pre{padding:0;color:rgba(0,0,0,.3)}
10+
table.CodeRay td.code{padding:0 0 0 .5em}
11+
table.CodeRay td.code>pre{padding:0}
12+
.CodeRay .debug{color:#fff !important;background:#000080 !important}
13+
.CodeRay .annotation{color:#007}
14+
.CodeRay .attribute-name{color:#000080}
15+
.CodeRay .attribute-value{color:#700}
16+
.CodeRay .binary{color:#509}
17+
.CodeRay .comment{color:#998;font-style:italic}
18+
.CodeRay .char{color:#04d}
19+
.CodeRay .char .content{color:#04d}
20+
.CodeRay .char .delimiter{color:#039}
21+
.CodeRay .class{color:#458;font-weight:bold}
22+
.CodeRay .complex{color:#a08}
23+
.CodeRay .constant,.CodeRay .predefined-constant{color:#008080}
24+
.CodeRay .color{color:#099}
25+
.CodeRay .class-variable{color:#369}
26+
.CodeRay .decorator{color:#b0b}
27+
.CodeRay .definition{color:#099}
28+
.CodeRay .delimiter{color:#000}
29+
.CodeRay .doc{color:#970}
30+
.CodeRay .doctype{color:#34b}
31+
.CodeRay .doc-string{color:#d42}
32+
.CodeRay .escape{color:#666}
33+
.CodeRay .entity{color:#800}
34+
.CodeRay .error{color:#808}
35+
.CodeRay .exception{color:inherit}
36+
.CodeRay .filename{color:#099}
37+
.CodeRay .function{color:#900;font-weight:bold}
38+
.CodeRay .global-variable{color:#008080}
39+
.CodeRay .hex{color:#058}
40+
.CodeRay .integer,.CodeRay .float{color:#099}
41+
.CodeRay .include{color:#555}
42+
.CodeRay .inline{color:#00}
43+
.CodeRay .inline .inline{background:#ccc}
44+
.CodeRay .inline .inline .inline{background:#bbb}
45+
.CodeRay .inline .inline-delimiter{color:#d14}
46+
.CodeRay .inline-delimiter{color:#d14}
47+
.CodeRay .important{color:#555;font-weight:bold}
48+
.CodeRay .interpreted{color:#b2b}
49+
.CodeRay .instance-variable{color:#008080}
50+
.CodeRay .label{color:#970}
51+
.CodeRay .local-variable{color:#963}
52+
.CodeRay .octal{color:#40e}
53+
.CodeRay .predefined{color:#369}
54+
.CodeRay .preprocessor{color:#579}
55+
.CodeRay .pseudo-class{color:#555}
56+
.CodeRay .directive{font-weight:bold}
57+
.CodeRay .type{font-weight:bold}
58+
.CodeRay .predefined-type{color:inherit}
59+
.CodeRay .reserved,.CodeRay .keyword {color:#000;font-weight:bold}
60+
.CodeRay .key{color:#808}
61+
.CodeRay .key .delimiter{color:#606}
62+
.CodeRay .key .char{color:#80f}
63+
.CodeRay .value{color:#088}
64+
.CodeRay .regexp .delimiter{color:#808}
65+
.CodeRay .regexp .content{color:#808}
66+
.CodeRay .regexp .modifier{color:#808}
67+
.CodeRay .regexp .char{color:#d14}
68+
.CodeRay .regexp .function{color:#404;font-weight:bold}
69+
.CodeRay .string{color:#d20}
70+
.CodeRay .string .string .string{background:#ffd0d0}
71+
.CodeRay .string .content{color:#d14}
72+
.CodeRay .string .char{color:#d14}
73+
.CodeRay .string .delimiter{color:#d14}
74+
.CodeRay .shell{color:#d14}
75+
.CodeRay .shell .delimiter{color:#d14}
76+
.CodeRay .symbol{color:#990073}
77+
.CodeRay .symbol .content{color:#a60}
78+
.CodeRay .symbol .delimiter{color:#630}
79+
.CodeRay .tag{color:#008080}
80+
.CodeRay .tag-special{color:#d70}
81+
.CodeRay .variable{color:#036}
82+
.CodeRay .insert{background:#afa}
83+
.CodeRay .delete{background:#faa}
84+
.CodeRay .change{color:#aaf;background:#007}
85+
.CodeRay .head{color:#f8f;background:#505}
86+
.CodeRay .insert .insert{color:#080}
87+
.CodeRay .delete .delete{color:#800}
88+
.CodeRay .change .change{color:#66f}
89+
.CodeRay .head .head{color:#f4f}

0 commit comments

Comments
 (0)