github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 23:27:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

Build: Split distributions into oss and default

Browse source 
This commit makes x-pack a module and adds it to the default
distrubtion. It also creates distributions for zip, tar, deb and rpm
which contain only oss code.
This commit is contained in:
Ryan Ernst 2018-02-23 08:03:17 -08:00
parent cb56bf49d5
commit fab5e21e7d
117 changed files with 830 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qa/no-bootstrap-tests/src/test/java/org/elasticsearch/bootstrap/SpawnerNoBootstrapTests.java
View file

@ -91,7 +91,7 @@ public class SpawnerNoBootstrapTests extends LuceneTestCase {
"has.native.controller", "false");
try (Spawner spawner = new Spawner()) {
spawner.spawnNativePluginControllers(environment);
spawner.spawnNativeControllers(environment);
assertThat(spawner.getProcesses(), hasSize(0));
}
}
@ -149,7 +149,7 @@ public class SpawnerNoBootstrapTests extends LuceneTestCase {
"has.native.controller", "false");
Spawner spawner = new Spawner();
spawner.spawnNativePluginControllers(environment);
spawner.spawnNativeControllers(environment);
List<Process> processes = spawner.getProcesses();
/*
@ -228,7 +228,7 @@ public class SpawnerNoBootstrapTests extends LuceneTestCase {
"has.native.controller", "false");
Spawner spawner = new Spawner();
spawner.spawnNativePluginControllers(environment);
spawner.spawnNativeControllers(environment);
List<Process> processes = spawner.getProcesses();
/*
@ -277,7 +277,7 @@ public class SpawnerNoBootstrapTests extends LuceneTestCase {
Spawner spawner = new Spawner();
IllegalArgumentException e = expectThrows(
IllegalArgumentException.class,
() -> spawner.spawnNativePluginControllers(environment));
() -> spawner.spawnNativeControllers(environment));
assertThat(
e.getMessage(),
equalTo("plugin [test_plugin] does not have permission to fork native controller"));
@ -298,11 +298,11 @@ public class SpawnerNoBootstrapTests extends LuceneTestCase {
final Spawner spawner = new Spawner();
if (Constants.MAC_OS_X) {
// if the spawner were not skipping the Desktop Services Store files on macOS this would explode
spawner.spawnNativePluginControllers(environment);
spawner.spawnNativeControllers(environment);
} else {
// we do not ignore these files on non-macOS systems
final FileSystemException e =
expectThrows(FileSystemException.class, () -> spawner.spawnNativePluginControllers(environment));
expectThrows(FileSystemException.class, () -> spawner.spawnNativeControllers(environment));
if (Constants.WINDOWS) {
assertThat(e, instanceOf(NoSuchFileException.class));
} else {