6f9a067197
Change master branch back to 2.0-beta1
2015-08-04 15:38:21 -04:00
29d73accdd
Merge pull request #12639 from rmuir/improve_integ
...
Don't use port 9200/9300 for integration tests
2015-08-04 13:09:47 -04:00
c61dccd189
Packaging: mvn install renames artifacts when copying
...
This PR:
* renames all distribution artifacts to `elasticsearch` so maven plugins will pick up the correct finalName without needing any hack.
* changes the groupId for every single distribution module as we can't have more than one module using the same groupId:artifactId
* does not attach anymore empty jar files for tar/zip/... modules as they don't contain any `src/main/java` stuff.
When you build it, you end up with:
```
$ tree ~/.m2/repository/org/elasticsearch/distribution
distribution
├── deb
│ └── elasticsearch
│ ├── 2.0.0-beta1-SNAPSHOT
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.deb
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.deb.md5
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.deb.sha1
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.md5
│ │ └── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.sha1
├── elasticsearch-distribution
│ ├── 2.0.0-beta1-SNAPSHOT
│ │ ├── elasticsearch-distribution-2.0.0-beta1-SNAPSHOT.pom
│ │ ├── elasticsearch-distribution-2.0.0-beta1-SNAPSHOT.pom.md5
│ │ └── elasticsearch-distribution-2.0.0-beta1-SNAPSHOT.pom.sha1
├── fully-loaded
│ └── elasticsearch
│ ├── 2.0.0-beta1-SNAPSHOT
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.md5
│ │ └── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.sha1
├── rpm
│ └── elasticsearch
│ ├── 2.0.0-beta1-SNAPSHOT
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.md5
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.sha1
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.rpm
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.rpm.md5
│ │ └── elasticsearch-2.0.0-beta1-SNAPSHOT.rpm.sha1
├── shaded
│ └── elasticsearch
│ ├── 2.0.0-beta1-SNAPSHOT
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.jar
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.jar.md5
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.jar.sha1
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.md5
│ │ └── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.sha1
├── tar
│ └── elasticsearch
│ ├── 2.0.0-beta1-SNAPSHOT
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.md5
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.sha1
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.tar.gz
│ │ ├── elasticsearch-2.0.0-beta1-SNAPSHOT.tar.gz.md5
│ │ └── elasticsearch-2.0.0-beta1-SNAPSHOT.tar.gz.sha1
└── zip
└── elasticsearch
└── 2.0.0-beta1-SNAPSHOT
├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom
├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.md5
├── elasticsearch-2.0.0-beta1-SNAPSHOT.pom.sha1
├── elasticsearch-2.0.0-beta1-SNAPSHOT.zip
├── elasticsearch-2.0.0-beta1-SNAPSHOT.zip.md5
├── elasticsearch-2.0.0-beta1-SNAPSHOT.zip.sha1
└──
```
Closes #12536
2015-08-04 15:34:11 +02:00
cf6fe6cdcd
Don't use port 9200/9300 for integration tests
2015-08-04 09:25:44 -04:00
e8ccdf91fc
Merge pull request #12610 from nik9000/bug/12504_2.0
...
Plugin script: Fix spaces
2015-08-04 09:05:38 -04:00
5059c978e3
Fix distribution checks to pass unzipped directory to license checker
2015-08-04 07:54:55 -04:00
6753f7f03e
Cut over master to 2.0.0-SNAPSHOT
2015-08-04 10:54:12 +02:00
c059101fbb
Fix missed test class
2015-08-03 21:56:43 -04:00
1e12d03252
Tests: Rename base tests cases to use "TestCase" suffix
...
Most of the abstract base test classes we have were previously @Ignored.
However, there were also some other tests ignored. Having two ways to
quiet tests is confusing, and clearly it has caused some tests
to get lost in the fold.
This change moves all base test classes to use the "TestCase" suffix,
which is not picked up by the test class name pattern. It also removes
@Ignore from (almost) all tests, and adds it to forbidden apis.
And since we were renaming, I shorted base test class names to use
"ES" instead of "Elasticsearch". I type this a lot of types a day,
and I have heard others express a similar desire for a shorter name.
closes #10659
2015-08-03 17:43:00 -07:00
21a7518271
Merge branch 'master' into smflorentino-fix-winjvm-detect
2015-08-03 17:26:25 -07:00
1b5bf17ae0
Plugin script: Fix spaces
...
Fixes ES_HOME with spaces and installing plugins from a local directory
with spaces.
Closes #12504
2015-08-03 15:40:18 -04:00
0e027d82c9
Merge pull request #12602 from rmuir/core_integ_tests
...
Add integration test phase for elasticsearch core/
2015-08-03 10:15:37 -04:00
379ffdb8ee
Add integration test phase for elasticsearch core/
2015-08-03 09:43:11 -04:00
e1886a9b12
Test that shaded jar contains only shaded classes
2015-08-03 08:56:45 -04:00
a5a27a5cd9
Add jar hell check test for the shaded jar
2015-08-03 05:54:55 -04:00
aaf0976cb7
clear up dependency hell a bit more
2015-08-01 14:02:14 -04:00
eaaa06b6b3
fix shading to create correct POM and not drag in wacky dependencies
2015-08-01 12:44:00 -04:00
6f33ea4f62
move shading to distribution/shaded
2015-08-01 11:37:43 -04:00
fef55348f9
clean up .zip handling so its not uselessly downloaded in the build
2015-08-01 09:10:03 -04:00
8d5b5ad862
restore my lost code changes and add measures to detect/prevent this in the future
2015-07-31 13:00:24 -04:00
3d7da5a826
remove unused properties sections from distribution modules
2015-07-31 10:20:50 -04:00
f804ec3cd9
cleanup
2015-07-31 10:05:11 -04:00
2068fbfd1e
Merge pull request #12549 from rmuir/distribution_tests_1
...
add integration tests for tar/deb/rpm packaging
2015-07-30 09:18:09 -04:00
69d7f1a78a
Startup: Remove getopt parsing in shell script, use java CLITool
...
In order to ensure, we have the same experience across operating systems
and shells, this commit uses the java CLI parser instead of the shell
getopt parsing to parse arguments.
This also allows for support for paths, which contain spaces.
Also commons-cli depdency was upgraded to 1.3.1 and tests have been added.
Changes
* new exit code, OK_AND_EXIT, allowing to tell the caller to exit, as everything
went as expected (e.g. when running a version output)
BWC breaking:
* execute() returns an ExitStatus instead of an integer, otherwise there is no
possibility to signal by a command, if the JVM should be exited after a run.
This affects plugins, that have command line tools
* -v used to be version, but is a verbose flag by default in the current CLI infra,
must be -V or --version now
* -X has been removed - the current implementation was useless anyway, as
it prefixed those properties with "es.". You should use
ES_JAVA_OPTS/JAVA_OPTS for JVM configuration
2015-07-30 13:20:29 +02:00
6893643bef
Build: Set the correct sha1 for HDRHistogram.
2015-07-30 10:24:55 +02:00
ddfea366de
Add integration tests for distribution/rpm
2015-07-29 22:26:45 -04:00
2ed8e697d5
Add integration tests for distribution/deb
2015-07-29 21:34:46 -04:00
1c5a558164
Add integration tests for distribution/tar
2015-07-29 15:33:29 -04:00
c6d6eaef4d
Add a run.sh to run from current source code with debugger
...
The maven magic needed for this is now heavier
2015-07-29 14:21:43 -04:00
c423319dda
Build: Remove profile to create attached RPM
...
This is no longer necessary, as the RPM is now built as
a primary artifact, so no need to deploy it as a secondary
artifact anymore.
Closes #12529
2015-07-29 15:54:26 +02:00
c6abf28273
Disable license checker temporarily to get regression builds working again
...
x
2015-07-29 08:39:25 -04:00
e1c99bc8b4
Add -XX:+PrintGCDateStamps when using GC Logs
...
Now that Elasticsearch requires Java 7 or later, it's safe to add `-XX:+PrintGCDateStamps` to get human readable times alongside JVM times.
2015-07-27 15:17:54 -04:00
9628d2632f
Build: Split packages into submodules
...
This change creates a proper `distribution` modules in which we have today packaging for
all of our four current packages:
* zip
* tar.gz
* rpm
* deb
Licenes have moved into the distribution project as well. So have the config/ and the bin/ directory
from the core/ project.
The RPM package is now built, if rpmbuild exists.
The bats tests have been moved as well.
Also the zip distribution now executes the REST integration tests.
2015-07-27 17:50:54 +02:00
Robert Muir
Robert Muir
David Pilato
Nik Everett
Simon Willnauer
Ryan Ernst
Scott Florentino
Alexander Reelsen
Adrien Grand
Chris Earle