Skip to content

Commit 9334fa0

Browse files
Tim-BrooksTim-Brooks
committed
Introduce elasticsearch-core jar (#28191)
This is related to #27933. It introduces a jar named elasticsearch-core in the lib directory. This commit moves the JarHell class from server to elasticsearch-core. Additionally, PathUtils and some of Loggers are moved as JarHell depends on them.
1 parent 938b7b9 commit 9334fa0

File tree

66 files changed

+509
-237
lines changed

Some content is hidden

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

66 files changed

+509
-237
lines changed

‎build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ subprojects {
183183
"org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec',
184184
"org.elasticsearch:elasticsearch:${version}": ':server',
185185
"org.elasticsearch:elasticsearch-cli:${version}": ':server:cli',
186+
"org.elasticsearch:elasticsearch-core:${version}": ':libs:elasticsearch-core',
186187
"org.elasticsearch.client:elasticsearch-rest-client:${version}": ':client:rest',
187188
"org.elasticsearch.client:elasticsearch-rest-client-sniffer:${version}": ':client:sniffer',
188189
"org.elasticsearch.client:elasticsearch-rest-high-level-client:${version}": ':client:rest-high-level',

‎client/rest/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ forbiddenApisTest {
7272
}
7373

7474
// JarHell is part of es server, which we don't want to pull in
75+
// TODO: Not anymore. Now in elasticsearch-core
7576
jarHell.enabled=false
7677

7778
namingConventions {

‎client/sniffer/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ dependencyLicenses {
7575
}
7676

7777
// JarHell is part of es server, which we don't want to pull in
78+
// TODO: Not anymore. Now in elasticsearch-core
7879
jarHell.enabled=false
7980

8081
namingConventions {

‎client/test/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ forbiddenApisTest {
4949
}
5050

5151
// JarHell is part of es server, which we don't want to pull in
52+
// TODO: Not anymore. Now in elasticsearch-core
5253
jarHell.enabled=false
5354

5455
// TODO: should we have licenses for our test deps?

‎libs/elasticsearch-core/build.gradle

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
import org.elasticsearch.gradle.precommit.PrecommitTasks
2+
3+
/*
4+
* Licensed to Elasticsearch under one or more contributor
5+
* license agreements. See the NOTICE file distributed with
6+
* this work for additional information regarding copyright
7+
* ownership. Elasticsearch licenses this file to you under
8+
* the Apache License, Version 2.0 (the "License"); you may
9+
* not use this file except in compliance with the License.
10+
* You may obtain a copy of the License at
11+
*
12+
* http://www.apache.org/licenses/LICENSE-2.0
13+
*
14+
* Unless required by applicable law or agreed to in writing,
15+
* software distributed under the License is distributed on an
16+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
* KIND, either express or implied. See the License for the
18+
* specific language governing permissions and limitations
19+
* under the License.
20+
*/
21+
22+
apply plugin: 'elasticsearch.build'
23+
apply plugin: 'nebula.optional-base'
24+
apply plugin: 'nebula.maven-base-publish'
25+
apply plugin: 'nebula.maven-scm'
26+
27+
archivesBaseName = 'elasticsearch-core'
28+
29+
publishing {
30+
publications {
31+
nebula {
32+
artifactId = archivesBaseName
33+
}
34+
}
35+
}
36+
37+
dependencies {
38+
compile "org.apache.logging.log4j:log4j-api:${versions.log4j}"
39+
40+
testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
41+
testCompile "junit:junit:${versions.junit}"
42+
testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}"
43+
44+
if (isEclipse == false || project.path == ":libs:elasticsearch-core-tests") {
45+
testCompile("org.elasticsearch.test:framework:${version}") {
46+
exclude group: 'org.elasticsearch', module: 'elasticsearch-core'
47+
}
48+
}
49+
}
50+
51+
forbiddenApisMain {
52+
// elasticsearch-core does not depend on server
53+
// TODO: Need to decide how we want to handle for forbidden signatures with the changes to core
54+
signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')]
55+
}
56+
57+
if (isEclipse) {
58+
// in eclipse the project is under a fake root, we need to change around the source sets
59+
sourceSets {
60+
if (project.path == ":libs:elasticsearch-core") {
61+
main.java.srcDirs = ['java']
62+
main.resources.srcDirs = ['resources']
63+
} else {
64+
test.java.srcDirs = ['java']
65+
test.resources.srcDirs = ['resources']
66+
}
67+
}
68+
}
69+
70+
thirdPartyAudit.excludes = [
71+
// from log4j
72+
'org/osgi/framework/AdaptPermission',
73+
'org/osgi/framework/AdminPermission',
74+
'org/osgi/framework/Bundle',
75+
'org/osgi/framework/BundleActivator',
76+
'org/osgi/framework/BundleContext',
77+
'org/osgi/framework/BundleEvent',
78+
'org/osgi/framework/SynchronousBundleListener',
79+
'org/osgi/framework/wiring/BundleWire',
80+
'org/osgi/framework/wiring/BundleWiring'
81+
]

‎libs/elasticsearch-core/licenses/log4j-api-2.9.1.jar.sha1

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

‎libs/elasticsearch-core/licenses/log4j-api-LICENSE.txt

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

‎libs/elasticsearch-core/licenses/log4j-api-NOTICE.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Apache log4j
2+
Copyright 2007 The Apache Software Foundation
3+
4+
This product includes software developed at
5+
The Apache Software Foundation (http://www.apache.org/).

‎server/src/main/java/org/elasticsearch/bootstrap/JarHell.java renamed to ‎libs/elasticsearch-core/src/main/java/org/elasticsearch/bootstrap/JarHell.java

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.bootstrap;
2121

2222
import org.apache.logging.log4j.Logger;
23-
import org.elasticsearch.Version;
2423
import org.elasticsearch.common.SuppressForbidden;
2524
import org.elasticsearch.common.io.PathUtils;
2625
import org.elasticsearch.common.logging.Loggers;
@@ -120,7 +119,8 @@ static Set<URL> parseClassPath(String classPath) {
120119
// }
121120
// Instead we just throw an exception, and keep it clean.
122121
if (element.isEmpty()) {
123-
throw new IllegalStateException("Classpath should not contain empty elements! (outdated shell script from a previous version?) classpath='" + classPath + "'");
122+
throw new IllegalStateException("Classpath should not contain empty elements! (outdated shell script from a previous" +
123+
" version?) classpath='" + classPath + "'");
124124
}
125125
// we should be able to just Paths.get() each element, but unfortunately this is not the
126126
// whole story on how classpath parsing works: if you want to know, start at sun.misc.Launcher,
@@ -215,29 +215,22 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
215215
}
216216

217217
/** inspect manifest for sure incompatibilities */
218-
static void checkManifest(Manifest manifest, Path jar) {
218+
private static void checkManifest(Manifest manifest, Path jar) {
219219
// give a nice error if jar requires a newer java version
220220
String targetVersion = manifest.getMainAttributes().getValue("X-Compile-Target-JDK");
221221
if (targetVersion != null) {
222222
checkVersionFormat(targetVersion);
223223
checkJavaVersion(jar.toString(), targetVersion);
224224
}
225-
226-
// give a nice error if jar is compiled against different es version
227-
String systemESVersion = Version.CURRENT.toString();
228-
String targetESVersion = manifest.getMainAttributes().getValue("X-Compile-Elasticsearch-Version");
229-
if (targetESVersion != null && targetESVersion.equals(systemESVersion) == false) {
230-
throw new IllegalStateException(jar + " requires Elasticsearch " + targetESVersion
231-
+ ", your system: " + systemESVersion);
232-
}
233225
}
234226

235227
public static void checkVersionFormat(String targetVersion) {
236228
if (!JavaVersion.isValid(targetVersion)) {
237229
throw new IllegalStateException(
238230
String.format(
239231
Locale.ROOT,
240-
"version string must be a sequence of nonnegative decimal integers separated by \".\"'s and may have leading zeros but was %s",
232+
"version string must be a sequence of nonnegative decimal integers separated by \".\"'s and may have " +
233+
"leading zeros but was %s",
241234
targetVersion
242235
)
243236
);
@@ -263,7 +256,7 @@ public static void checkJavaVersion(String resource, String targetVersion) {
263256
}
264257
}
265258

266-
static void checkClass(Map<String,Path> clazzes, String clazz, Path jarpath) {
259+
private static void checkClass(Map<String, Path> clazzes, String clazz, Path jarpath) {
267260
Path previous = clazzes.put(clazz, jarpath);
268261
if (previous != null) {
269262
if (previous.equals(jarpath)) {

‎server/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java renamed to ‎libs/elasticsearch-core/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.util.stream.Collectors;
2727

2828
public class JavaVersion implements Comparable<JavaVersion> {
29+
2930
private final List<Integer> version;
3031

3132
public List<Integer> getVersion() {

‎server/src/main/java/org/elasticsearch/common/SuppressForbidden.java renamed to ‎libs/elasticsearch-core/src/main/java/org/elasticsearch/common/SuppressForbidden.java

File renamed without changes.

‎server/src/main/java/org/elasticsearch/common/io/PathUtils.java renamed to ‎libs/elasticsearch-core/src/main/java/org/elasticsearch/common/io/PathUtils.java

File renamed without changes.

0 commit comments

Comments
 (0)