Skip to content

Commit 554e73b

Browse files
rjernstrjernst
authored
Merge pull request #2 from ChrisHegarty/x-content-split
X content split - iteration 2
2 parents 749e603 + fbba9cf commit 554e73b

File tree

15 files changed

+354
-74
lines changed

15 files changed

+354
-74
lines changed

‎distribution/tools/launchers/licenses/snakeyaml-1.26.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a78a8747147d2c5807683e76ec2b633e95c14fe9

‎distribution/tools/launchers/licenses/snakeyaml-LICENSE.txt‎

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS

‎distribution/tools/launchers/licenses/snakeyaml-NOTICE.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
***The art of simplicity is a puzzle of complexity.***
2+
3+
## Overview ##
4+
[YAML](http://yaml.org) is a data serialization format designed for human readability and interaction with scripting languages.
5+
6+
SnakeYAML is a YAML processor for the Java Virtual Machine.
7+
8+
## SnakeYAML features ##
9+
10+
* a **complete** [YAML 1.1 processor](http://yaml.org/spec/1.1/current.html). In particular, SnakeYAML can parse all examples from the specification.
11+
* Unicode support including UTF-8/UTF-16 input/output.
12+
* high-level API for serializing and deserializing native Java objects.
13+
* support for all types from the [YAML types repository](http://yaml.org/type/index.html).
14+
* relatively sensible error messages.
15+
16+
## Info ##
17+
* [Changes](https://bitbucket.org/asomov/snakeyaml/wiki/Changes)
18+
* [Documentation](https://bitbucket.org/asomov/snakeyaml/wiki/Documentation)
19+
20+
## Contribute ##
21+
* Mercurial DVCS is used to dance with the [source code](https://bitbucket.org/asomov/snakeyaml/src).
22+
* If you find a bug in SnakeYAML, please [file a bug report](https://bitbucket.org/asomov/snakeyaml/issues?status=new&status=open).
23+
* You may discuss SnakeYAML at
24+
[the mailing list](http://groups.google.com/group/snakeyaml-core).

‎libs/x-content/build.gradle‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import java.util.stream.Collectors
1111
apply plugin: 'elasticsearch.build'
1212
apply plugin: 'elasticsearch.publish'
1313

14-
configurations {
15-
providerImpl
16-
providerDir
17-
}
14+
//configurations {
15+
// providerImpl
16+
// providerDir
17+
//}
1818

1919
dependencies {
2020
api project(':libs:elasticsearch-core')
2121

22-
providerImpl project(':libs:x-content:impl')
22+
//providerImpl project(':libs:x-content:impl')
2323

2424
testImplementation(project(":test:framework")) {
2525
exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content'
@@ -46,39 +46,39 @@ tasks.named("dependencyLicenses").configure {
4646

4747
tasks.named("jarHell").configure { enabled = false }
4848

49-
tasks.named("jar").configure {
50-
into('org/elasticsearch/xcontent/internal') {
51-
from configurations.providerImpl
52-
}
53-
}
54-
55-
File providerDirPath = new File(buildDir, 'provider')
56-
def copyProviderJars = tasks.register("copyProviderJars", Copy) {
57-
dependsOn configurations.providerImpl
58-
inputs.property('jars', configurations.providerImpl)
59-
outputs.dir(providerDirPath)
60-
from configurations.providerImpl
61-
into providerDir
62-
}
63-
64-
artifacts {
65-
providerDir(providerDirPath) {
66-
builtBy copyProviderJars
67-
}
68-
}
69-
70-
def generateProviderJarsList = tasks.register("generateProviderJarsList") {
71-
File jarsFile = new File(buildDir, 'generated-resources/org/elasticsearch/xcontent/internal/provider-jars.txt')
72-
processResources.from(new File(buildDir, 'generated-resources'))
73-
inputs.property('jars', configurations.providerImpl)
74-
outputs.file(jarsFile)
75-
doLast {
76-
jarsFile.parentFile.mkdirs()
77-
jarsFile.setText(configurations.providerImpl.files.stream()
78-
.map(f -> "/" + f.name).collect(Collectors.joining('\n')), 'UTF-8')
79-
}
80-
}
81-
82-
tasks.named("processResources").configure {
83-
dependsOn generateProviderJarsList
84-
}
49+
//tasks.named("jar").configure {
50+
// into('org/elasticsearch/xcontent/internal') {
51+
// from configurations.providerImpl
52+
// }
53+
//}
54+
//
55+
//File providerDirPath = new File(buildDir, 'provider')
56+
//def copyProviderJars = tasks.register("copyProviderJars", Copy) {
57+
// dependsOn configurations.providerImpl
58+
// inputs.property('jars', configurations.providerImpl)
59+
// outputs.dir(providerDirPath)
60+
// from configurations.providerImpl
61+
// into providerDirPath
62+
//}
63+
//
64+
//artifacts {
65+
// providerDir(providerDirPath) {
66+
// builtBy copyProviderJars
67+
// }
68+
//}
69+
//
70+
//def generateProviderJarsList = tasks.register("generateProviderJarsList") {
71+
// File jarsFile = new File(buildDir, 'generated-resources/org/elasticsearch/xcontent/internal/provider-jars.txt')
72+
// processResources.from(new File(buildDir, 'generated-resources'))
73+
// inputs.property('jars', configurations.providerImpl)
74+
// outputs.file(jarsFile)
75+
// doLast {
76+
// jarsFile.parentFile.mkdirs()
77+
// jarsFile.setText(configurations.providerImpl.files.stream()
78+
// .map(f -> "/" + f.name).collect(Collectors.joining('\n')), 'UTF-8')
79+
// }
80+
//}
81+
//
82+
//tasks.named("processResources").configure {
83+
// dependsOn generateProviderJarsList
84+
//}

‎libs/x-content/impl/build.gradle‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,27 @@
99
apply plugin: 'elasticsearch.build'
1010
apply plugin: 'elasticsearch.publish'
1111

12+
configurations {
13+
providerDir
14+
providerImpl {
15+
transitive = false
16+
canBeConsumed = true
17+
canBeResolved = true
18+
// If you want this configuration to share the same dependencies, otherwise omit this line
19+
}
20+
implementation {
21+
extendsFrom providerImpl
22+
}
23+
}
24+
1225
dependencies {
1326
compileOnly project(':libs:elasticsearch-core')
1427
compileOnly project(':libs:elasticsearch-x-content')
15-
implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
16-
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
17-
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
18-
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
19-
implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
28+
providerImpl "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
29+
providerImpl "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${versions.jackson}"
30+
providerImpl "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
31+
providerImpl "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
32+
providerImpl "org.yaml:snakeyaml:${versions.snakeyaml}"
2033

2134
testImplementation(project(":test:framework")) {
2235
exclude group: 'org.elasticsearch', module: 'elasticsearch-x-content'
@@ -35,13 +48,27 @@ tasks.named("dependencyLicenses").configure {
3548

3649
tasks.named("jarHell").configure { enabled = false }
3750

38-
tasks.named("thirdPartyAudit").configure {
39-
ignoreMissingClasses(
40-
'com.fasterxml.jackson.databind.ObjectMapper',
41-
'com.fasterxml.jackson.databind.cfg.MapperBuilder'
42-
)
43-
}
51+
tasks.named("javadoc").configure { enabled = false }
52+
53+
tasks.named("thirdPartyAudit").configure {enabled = true }
4454

4555
tasks.named("jar").configure {
4656
archiveBaseName = "x-content-impl"
4757
}
58+
59+
File providerDirPath = new File(buildDir, 'provider')
60+
def copyProviderJars = tasks.register("copyProviderJars", Copy) {
61+
dependsOn configurations.providerImpl
62+
inputs.property('jars', configurations.providerImpl)
63+
inputs.property('jars', jar)
64+
outputs.dir(providerDirPath)
65+
from configurations.providerImpl
66+
from jar
67+
into providerDirPath
68+
}
69+
70+
artifacts {
71+
providerDir(providerDirPath) {
72+
builtBy copyProviderJars
73+
}
74+
}

‎libs/x-content/impl/licenses/jackson-annotations-2.10.4.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6ae6028aff033f194c9710ad87c224ccaadeed6c

‎libs/x-content/impl/licenses/jackson-databind-2.10.4.jar.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
76e9152e93d4cf052f93a64596f633ba5b1c8ed9

‎libs/x-content/impl/src/main/java/org/elasticsearch/xcontent/provider/json/JsonXContentParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void allowDuplicateKeys(boolean allowDuplicateKeys) {
4747
parser.configure(JsonParser.Feature.STRICT_DUPLICATE_DETECTION, allowDuplicateKeys == false);
4848
}
4949

50-
private static final XContentParseException newXContentParseException(JsonProcessingException e) {
50+
private static XContentParseException newXContentParseException(JsonProcessingException e) {
5151
JsonLocation loc = e.getLocation();
5252
throw new XContentParseException(new XContentLocation(loc.getLineNr(), loc.getColumnNr()), e.getMessage(), e);
5353
}

0 commit comments

Comments
 (0)