From 5330e3423f1361545e0ae405b2c753ff51ae4e63 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Fri, 22 May 2015 23:23:59 -0400 Subject: [PATCH] remove build duplication --- dev-tools/elasticsearch_license_header.txt | 16 - dev-tools/forbidden/all-signatures.txt | 47 -- dev-tools/forbidden/core-signatures.txt | 137 ---- dev-tools/forbidden/test-signatures.txt | 20 - dev-tools/license_header_definition.xml | 13 - pom.xml | 706 +----------------- .../org/elasticsearch/test/ExternalNode.java | 2 + .../test/disruption/LongGCDisruption.java | 3 + 8 files changed, 29 insertions(+), 915 deletions(-) delete mode 100644 dev-tools/elasticsearch_license_header.txt delete mode 100644 dev-tools/forbidden/all-signatures.txt delete mode 100644 dev-tools/forbidden/core-signatures.txt delete mode 100644 dev-tools/forbidden/test-signatures.txt delete mode 100644 dev-tools/license_header_definition.xml diff --git a/dev-tools/elasticsearch_license_header.txt b/dev-tools/elasticsearch_license_header.txt deleted file mode 100644 index ca943323401..00000000000 --- a/dev-tools/elasticsearch_license_header.txt +++ /dev/null @@ -1,16 +0,0 @@ -Licensed to Elasticsearch under one or more contributor -license agreements. See the NOTICE file distributed with -this work for additional information regarding copyright -ownership. Elasticsearch licenses this file to you under -the Apache License, Version 2.0 (the "License"); you may -not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. diff --git a/dev-tools/forbidden/all-signatures.txt b/dev-tools/forbidden/all-signatures.txt deleted file mode 100644 index 3b5eb7a0b03..00000000000 --- a/dev-tools/forbidden/all-signatures.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Licensed to Elasticsearch under one or more contributor -# license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright -# ownership. Elasticsearch licenses this file to you under -# the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on -# an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the License. - -@defaultMessage Convert to URI -java.net.URL#getPath() -java.net.URL#getFile() - -@defaultMessage Use java.nio.file instead of java.io.File API -java.util.jar.JarFile -java.util.zip.ZipFile -java.io.File -java.io.FileInputStream -java.io.FileOutputStream -java.io.PrintStream#(java.lang.String,java.lang.String) -java.io.PrintWriter#(java.lang.String,java.lang.String) -java.util.Formatter#(java.lang.String,java.lang.String,java.util.Locale) -java.io.RandomAccessFile -java.nio.file.Path#toFile() - -@defaultMessage Don't use deprecated lucene apis -org.apache.lucene.index.DocsEnum -org.apache.lucene.index.DocsAndPositionsEnum -org.apache.lucene.queries.TermFilter -org.apache.lucene.queries.TermsFilter -org.apache.lucene.search.TermRangeFilter -org.apache.lucene.search.NumericRangeFilter -org.apache.lucene.search.PrefixFilter - -java.nio.file.Paths @ Use PathUtils.get instead. -java.nio.file.FileSystems#getDefault() @ use PathUtils.getDefault instead. - -@defaultMessage Specify a location for the temp file/directory instead. -java.nio.file.Files#createTempDirectory(java.lang.String,java.nio.file.attribute.FileAttribute[]) -java.nio.file.Files#createTempFile(java.lang.String,java.lang.String,java.nio.file.attribute.FileAttribute[]) diff --git a/dev-tools/forbidden/core-signatures.txt b/dev-tools/forbidden/core-signatures.txt deleted file mode 100644 index 92a382f03e3..00000000000 --- a/dev-tools/forbidden/core-signatures.txt +++ /dev/null @@ -1,137 +0,0 @@ -# Licensed to Elasticsearch under one or more contributor -# license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright -# ownership. Elasticsearch licenses this file to you under -# the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on -# an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the License. - -@defaultMessage spawns threads with vague names; use a custom thread factory and name threads so that you can tell (by its name) which executor it is associated with - -java.util.concurrent.Executors#newFixedThreadPool(int) -java.util.concurrent.Executors#newSingleThreadExecutor() -java.util.concurrent.Executors#newCachedThreadPool() -java.util.concurrent.Executors#newSingleThreadScheduledExecutor() -java.util.concurrent.Executors#newScheduledThreadPool(int) -java.util.concurrent.Executors#defaultThreadFactory() -java.util.concurrent.Executors#privilegedThreadFactory() - -java.lang.Character#codePointBefore(char[],int) @ Implicit start offset is error-prone when the char[] is a buffer and the first chars are random chars -java.lang.Character#codePointAt(char[],int) @ Implicit end offset is error-prone when the char[] is a buffer and the last chars are random chars - -@defaultMessage Collections.sort dumps data into an array, sorts the array and reinserts data into the list, one should rather use Lucene's CollectionUtil sort methods which sort in place - -java.util.Collections#sort(java.util.List) -java.util.Collections#sort(java.util.List,java.util.Comparator) - -java.io.StringReader#(java.lang.String) @ Use FastStringReader instead - -@defaultMessage Reference management is tricky, leave it to SearcherManager -org.apache.lucene.index.IndexReader#decRef() -org.apache.lucene.index.IndexReader#incRef() -org.apache.lucene.index.IndexReader#tryIncRef() - -@defaultMessage Pass the precision step from the mappings explicitly instead -org.apache.lucene.search.NumericRangeQuery#newDoubleRange(java.lang.String,java.lang.Double,java.lang.Double,boolean,boolean) -org.apache.lucene.search.NumericRangeQuery#newFloatRange(java.lang.String,java.lang.Float,java.lang.Float,boolean,boolean) -org.apache.lucene.search.NumericRangeQuery#newIntRange(java.lang.String,java.lang.Integer,java.lang.Integer,boolean,boolean) -org.apache.lucene.search.NumericRangeQuery#newLongRange(java.lang.String,java.lang.Long,java.lang.Long,boolean,boolean) -org.apache.lucene.search.NumericRangeFilter#newDoubleRange(java.lang.String,java.lang.Double,java.lang.Double,boolean,boolean) -org.apache.lucene.search.NumericRangeFilter#newFloatRange(java.lang.String,java.lang.Float,java.lang.Float,boolean,boolean) -org.apache.lucene.search.NumericRangeFilter#newIntRange(java.lang.String,java.lang.Integer,java.lang.Integer,boolean,boolean) -org.apache.lucene.search.NumericRangeFilter#newLongRange(java.lang.String,java.lang.Long,java.lang.Long,boolean,boolean) - -@defaultMessage Only use wait / notify when really needed try to use concurrency primitives, latches or callbacks instead. -java.lang.Object#wait() -java.lang.Object#wait(long) -java.lang.Object#wait(long,int) -java.lang.Object#notify() -java.lang.Object#notifyAll() - -@defaultMessage Beware of the behavior of this method on MIN_VALUE -java.lang.Math#abs(int) -java.lang.Math#abs(long) - -@defaultMessage Please do not try to stop the world -java.lang.System#gc() - -@defaultMessage Use Long.compare instead we are on Java7 -com.google.common.primitives.Longs#compare(long,long) - -@defaultMessage Use Channels.* methods to write to channels. Do not write directly. -java.nio.channels.WritableByteChannel#write(java.nio.ByteBuffer) -java.nio.channels.FileChannel#write(java.nio.ByteBuffer, long) -java.nio.channels.GatheringByteChannel#write(java.nio.ByteBuffer[], int, int) -java.nio.channels.GatheringByteChannel#write(java.nio.ByteBuffer[]) -java.nio.channels.ReadableByteChannel#read(java.nio.ByteBuffer) -java.nio.channels.ScatteringByteChannel#read(java.nio.ByteBuffer[]) -java.nio.channels.ScatteringByteChannel#read(java.nio.ByteBuffer[], int, int) -java.nio.channels.FileChannel#read(java.nio.ByteBuffer, long) - -@defaultMessage Use Lucene.parseLenient instead it strips off minor version -org.apache.lucene.util.Version#parseLeniently(java.lang.String) - -@defaultMessage unsafe encoders/decoders have problems in the lzf compress library. Use variants of encode/decode functions which take Encoder/Decoder. -com.ning.compress.lzf.impl.UnsafeChunkEncoders#createEncoder(int) -com.ning.compress.lzf.impl.UnsafeChunkEncoders#createNonAllocatingEncoder(int) -com.ning.compress.lzf.impl.UnsafeChunkEncoders#createEncoder(int, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.impl.UnsafeChunkEncoders#createNonAllocatingEncoder(int, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.impl.UnsafeChunkDecoder#() -com.ning.compress.lzf.parallel.CompressTask -com.ning.compress.lzf.util.ChunkEncoderFactory#optimalInstance() -com.ning.compress.lzf.util.ChunkEncoderFactory#optimalInstance(int) -com.ning.compress.lzf.util.ChunkEncoderFactory#optimalNonAllocatingInstance(int) -com.ning.compress.lzf.util.ChunkEncoderFactory#optimalInstance(com.ning.compress.BufferRecycler) -com.ning.compress.lzf.util.ChunkEncoderFactory#optimalInstance(int, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.util.ChunkEncoderFactory#optimalNonAllocatingInstance(int, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.util.ChunkDecoderFactory#optimalInstance() -com.ning.compress.lzf.util.LZFFileInputStream#(java.io.File) -com.ning.compress.lzf.util.LZFFileInputStream#(java.io.FileDescriptor) -com.ning.compress.lzf.util.LZFFileInputStream#(java.lang.String) -com.ning.compress.lzf.util.LZFFileOutputStream#(java.io.File) -com.ning.compress.lzf.util.LZFFileOutputStream#(java.io.File, boolean) -com.ning.compress.lzf.util.LZFFileOutputStream#(java.io.FileDescriptor) -com.ning.compress.lzf.util.LZFFileOutputStream#(java.lang.String) -com.ning.compress.lzf.util.LZFFileOutputStream#(java.lang.String, boolean) -com.ning.compress.lzf.LZFEncoder#encode(byte[]) -com.ning.compress.lzf.LZFEncoder#encode(byte[], int, int) -com.ning.compress.lzf.LZFEncoder#encode(byte[], int, int, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.LZFEncoder#appendEncoded(byte[], int, int, byte[], int) -com.ning.compress.lzf.LZFEncoder#appendEncoded(byte[], int, int, byte[], int, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.LZFCompressingInputStream#(java.io.InputStream) -com.ning.compress.lzf.LZFDecoder#fastDecoder() -com.ning.compress.lzf.LZFDecoder#decode(byte[]) -com.ning.compress.lzf.LZFDecoder#decode(byte[], int, int) -com.ning.compress.lzf.LZFDecoder#decode(byte[], byte[]) -com.ning.compress.lzf.LZFDecoder#decode(byte[], int, int, byte[]) -com.ning.compress.lzf.LZFInputStream#(java.io.InputStream) -com.ning.compress.lzf.LZFInputStream#(java.io.InputStream, boolean) -com.ning.compress.lzf.LZFInputStream#(java.io.InputStream, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.LZFInputStream#(java.io.InputStream, com.ning.compress.BufferRecycler, boolean) -com.ning.compress.lzf.LZFOutputStream#(java.io.OutputStream) -com.ning.compress.lzf.LZFOutputStream#(java.io.OutputStream, com.ning.compress.BufferRecycler) -com.ning.compress.lzf.LZFUncompressor#(com.ning.compress.DataHandler) -com.ning.compress.lzf.LZFUncompressor#(com.ning.compress.DataHandler, com.ning.compress.BufferRecycler) - -@defaultMessage Spawns a new thread which is solely under lucenes control use ThreadPool#estimatedTimeInMillisCounter instead -org.apache.lucene.search.TimeLimitingCollector#getGlobalTimerThread() -org.apache.lucene.search.TimeLimitingCollector#getGlobalCounter() - -@defaultMessage Don't interrupt threads use FutureUtils#cancel(Future) instead -java.util.concurrent.Future#cancel(boolean) - -@defaultMessage Don't try reading from paths that are not configured in Environment, resolve from Environment instead -org.elasticsearch.common.io.PathUtils#get(java.lang.String, java.lang.String[]) -org.elasticsearch.common.io.PathUtils#get(java.net.URI) - -@defaultMessage Use queries, not filters -org.apache.lucene.search.FilteredQuery#(org.apache.lucene.search.Query, org.apache.lucene.search.Filter) -org.apache.lucene.search.FilteredQuery#(org.apache.lucene.search.Query, org.apache.lucene.search.Filter, org.apache.lucene.search.FilteredQuery$FilterStrategy) diff --git a/dev-tools/forbidden/test-signatures.txt b/dev-tools/forbidden/test-signatures.txt deleted file mode 100644 index 7ea2c6a45f1..00000000000 --- a/dev-tools/forbidden/test-signatures.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to Elasticsearch under one or more contributor -# license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright -# ownership. Elasticsearch licenses this file to you under -# the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on -# an 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, -# either express or implied. See the License for the specific -# language governing permissions and limitations under the License. - -com.carrotsearch.randomizedtesting.RandomizedTest#globalTempDir() @ Use newTempDirPath() instead -com.carrotsearch.randomizedtesting.annotations.Seed @ Don't commit hardcoded seeds - -org.apache.lucene.codecs.Codec#setDefault(org.apache.lucene.codecs.Codec) @ Use the SuppressCodecs("*") annotation instead diff --git a/dev-tools/license_header_definition.xml b/dev-tools/license_header_definition.xml deleted file mode 100644 index 1cc53bda001..00000000000 --- a/dev-tools/license_header_definition.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - /* - * - */ - - (\s|\t)*/\*.*$ - .*\*/(\s|\t)*$ - false - true - - diff --git a/pom.xml b/pom.xml index 88accea646d..be7178b876a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,32 +25,14 @@ - org.sonatype.oss - oss-parent - 7 + org.elasticsearch + elasticsearch-parent + 2.0.0-SNAPSHOT - 5.2.0 - 1681214 - 5.2.0-snapshot-${lucene.snapshot.revision} - 2.1.14 - auto - true - onerror - - ${project.basedir}/backwards - random - random - false - true - ERROR - 512m - ${basedir}/logs/ - 5 - ${java.home}${file.separator}bin${file.separator}java - .local-${project.version}-execution-hints.log - + + unshaded /usr/share/elasticsearch /usr/share/elasticsearch/bin @@ -65,151 +47,105 @@ dpkg-sig - - - lucene-snapshots - Lucene Snapshots - http://download.elastic.co/lucenesnapshots/${lucene.snapshot.revision} - - - org.hamcrest hamcrest-all - 1.3 test com.carrotsearch.randomizedtesting randomizedtesting-runner - ${testframework.version} test org.apache.lucene lucene-test-framework - ${lucene.maven.version} test org.apache.httpcomponents httpclient - 4.3.5 test com.google.jimfs jimfs - 1.0 test org.apache.lucene lucene-core - ${lucene.maven.version} compile org.apache.lucene lucene-backward-codecs - ${lucene.maven.version} compile org.apache.lucene lucene-analyzers-common - ${lucene.maven.version} compile org.apache.lucene lucene-queries - ${lucene.maven.version} compile - - - jakarta-regexp - jakarta-regexp - - org.apache.lucene lucene-memory - ${lucene.maven.version} compile org.apache.lucene lucene-highlighter - ${lucene.maven.version} compile org.apache.lucene lucene-queryparser - ${lucene.maven.version} compile - - - jakarta-regexp - jakarta-regexp - - org.apache.lucene lucene-suggest - ${lucene.maven.version} compile org.apache.lucene lucene-join - ${lucene.maven.version} compile - org.apache.lucene lucene-spatial - ${lucene.maven.version} compile org.apache.lucene lucene-expressions - ${lucene.maven.version} compile true com.spatial4j spatial4j - 0.4.1 compile true com.vividsolutions jts - 1.13 compile true - - - xerces - xercesImpl - - com.github.spullara.mustache.java compiler - 0.8.13 true @@ -219,49 +155,40 @@ com.google.guava guava - 18.0 compile com.carrotsearch hppc - 0.7.1 joda-time joda-time - - - 2.7 compile org.joda joda-convert - 1.2 compile com.fasterxml.jackson.core jackson-core - 2.5.1 compile com.fasterxml.jackson.dataformat jackson-dataformat-smile - 2.5.1 compile com.fasterxml.jackson.dataformat jackson-dataformat-yaml - 2.5.1 compile @@ -274,41 +201,35 @@ com.fasterxml.jackson.dataformat jackson-dataformat-cbor - 2.5.1 compile io.netty netty - 3.10.3.Final compile com.ning compress-lzf - 1.0.2 compile com.tdunning t-digest - 3.0 compile org.apache.commons commons-lang3 - 3.3.2 commons-cli commons-cli - 1.2 @@ -316,7 +237,6 @@ org.codehaus.groovy groovy-all - 2.4.0 indy compile true @@ -325,7 +245,6 @@ log4j log4j - 1.2.17 compile true @@ -333,7 +252,6 @@ log4j apache-log4j-extras - 1.2.17 compile true @@ -341,7 +259,6 @@ org.slf4j slf4j-api - 1.6.2 compile true @@ -349,7 +266,6 @@ net.java.dev.jna jna - 4.1.0 compile true @@ -357,7 +273,6 @@ org.fusesource sigar - 1.6.4 compile true @@ -367,7 +282,6 @@ sigar sigar - 1.6.4 system ${basedir}/lib/sigar/sigar-1.6.4.jar true @@ -467,308 +381,10 @@ - - org.apache.maven.plugins - maven-enforcer-plugin - 1.3.1 - - - enforce-versions - - enforce - - - - - [1.7,) - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - true - 512m - - false - - -XDignore.symbol.file - - - - - com.carrotsearch.randomizedtesting - junit4-maven-plugin - ${testframework.version} - - - tests - test - - junit4 - - - ${jvm.executable} - 10 - pipe,warn - true - fail - - - - - - - - - - - - - - - - - - - - - - - ${tests.jvms} - - - - - - - **/*Tests.class - **/*Test.class - - - **/Abstract*.class - **/*StressTest.class - - - -Xmx${tests.heap.size} - -Xms${tests.heap.size} - ${java.permGenSpace} - -Djava.library.path=${project.basedir}/lib/sigar - -XX:MaxDirectMemorySize=512m - -Des.logger.prefix= - -XX:+HeapDumpOnOutOfMemoryError - -XX:HeapDumpPath=${tests.heapdump.path} - - ${tests.shuffle} - ${tests.verbose} - ${tests.seed} - ${tests.failfast} - - true - - - ./temp - - ${tests.bwc} - ${tests.bwc.path} - ${tests.bwc.version} - ${tests.jvm.argline} - ${tests.appendseed} - ${tests.iters} - ${tests.maxfailures} - ${tests.failfast} - ${tests.class} - ${tests.method} - ${tests.nightly} - ${tests.verbose} - ${tests.badapples} - ${tests.weekly} - ${tests.slow} - ${tests.awaitsfix} - ${tests.timeoutSuite} - ${tests.showSuccess} - ${tests.integration} - ${tests.thirdparty} - ${tests.config} - ${tests.client.ratio} - ${tests.enable_mock_modules} - ${tests.assertion.disabled} - ${tests.rest} - ${tests.rest.suite} - ${tests.rest.blacklist} - ${tests.rest.spec} - ${tests.network} - ${tests.cluster} - ${tests.heap.size} - ${tests.filter} - ${project.version} - ${tests.locale} - ${tests.timezone} - ${project.basedir} - ${settings.localRepository} - ${env.ES_TEST_LOCAL} - ${es.node.mode} - ${es.logger.level} - ${tests.security.manager} - ${tests.compatibility} - true - - true - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - validate - - run - - - - Using ${java.runtime.name} ${java.runtime.version} ${java.vendor} - - - - - set-permGen - validate - - run - - - - - - - - - true - - - - invalid-patterns - validate - - run - - - - - - - - - - - - - - - - - - - - - - - The following files contain tabs or - nocommits:${line.separator}${validate.patternsFound} - - - - - - generate-test-resources - create-heapdump-directory - - - - - - - - run - - - - tests - test - - ${skipTests} - - false - - - - - - - - - - - - - - - - - - run - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.16 - - true - - org.apache.maven.plugins maven-source-plugin - 2.2.1 - - attach-sources - - jar - - attach-test-sources @@ -794,7 +410,6 @@ org.apache.maven.plugins maven-shade-plugin - 2.3 package @@ -1018,8 +633,8 @@ + org.apache.maven.plugins maven-assembly-plugin - 2.4 false ${project.build.directory}/releases/ @@ -1038,25 +653,8 @@ - org.codehaus.mojo - buildnumber-maven-plugin - 1.2 - - - validate - - create - - - - - false - false - - - + org.apache.maven.plugins maven-dependency-plugin - 2.8 prepare-package @@ -1070,6 +668,23 @@ + + com.mycila + license-maven-plugin + + + + src/main/java/org/elasticsearch/common/inject/** + src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java + src/main/java/org/apache/lucene/**/X*.java + + src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java + + src/main/java/org/elasticsearch/http/netty/pipelining/** + + + + @@ -1455,81 +1070,9 @@ - - de.thetaphi - forbiddenapis - 1.8 - - - - check-forbidden-apis - - 1.7 - - true - - false - - jsr166e/** - - - - jdk-unsafe - jdk-deprecated - jdk-system-out - - - dev-tools/forbidden/core-signatures.txt - dev-tools/forbidden/all-signatures.txt - - ${forbidden.signatures} - **.SuppressForbidden - - compile - - check - - - - check-forbidden-test-apis - - 1.7 - - true - - false - - - jdk-unsafe - jdk-deprecated - - - - org/elasticsearch/test/disruption/LongGCDisruption.class - - - org/elasticsearch/test/ExternalNode.class - org/elasticsearch/test/ElasticsearchTestCase.class - - - - dev-tools/forbidden/test-signatures.txt - dev-tools/forbidden/all-signatures.txt - - ${forbidden.test.signatures} - **.SuppressForbidden - - test-compile - - testCheck - - - - org.apache.maven.plugins maven-jar-plugin - 2.4 prepare-package @@ -1555,209 +1098,8 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [1.0.0,) - - copy-dependencies - - - - - - - - - - de.thetaphi - forbiddenapis - [1.0.0,) - - testCheck - check - - - - - - - - - - exec-maven-plugin - org.codehaus.mojo - [1.0.0,) - - exec - - - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0.0,) - - enforce - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - [1.0.0,) - - run - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - [1.0.0,) - - copy-resources - - - - - - - - - com.mycila - license-maven-plugin - [1.0.0,) - - check - - - - - - - - - - - - org.apache.maven.plugins - maven-eclipse-plugin - 2.9 - - eclipse-build - true - - - - - - - default - - true - - - - - com.carrotsearch.randomizedtesting - junit4-maven-plugin - - ${tests.jvm.argline} - - - - com.mycila - license-maven-plugin - 2.5 - -
dev-tools/elasticsearch_license_header.txt
- - dev-tools/license_header_definition.xml - - - src/main/java/org/elasticsearch/**/*.java - src/test/java/org/elasticsearch/**/*.java - - - - src/main/java/org/elasticsearch/common/inject/** - src/main/java/org/elasticsearch/common/geo/GeoHashUtils.java - src/main/java/org/elasticsearch/common/lucene/search/XBooleanFilter.java - src/main/java/org/elasticsearch/common/lucene/search/XFilteredQuery.java - src/main/java/org/apache/lucene/queryparser/XSimpleQueryParser.java - src/main/java/org/apache/lucene/**/X*.java - - src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/TDigestState.java - src/test/java/org/elasticsearch/search/aggregations/metrics/GroupTree.java - - src/main/java/org/elasticsearch/http/netty/pipelining/** - -
- - - compile - - check - - - -
-
-
-
- - - dev - - true - - - - - de.thetaphi - forbiddenapis - - - check-forbidden-apis - none - - - check-forbidden-test-apis - none - - - - - - license diff --git a/src/test/java/org/elasticsearch/test/ExternalNode.java b/src/test/java/org/elasticsearch/test/ExternalNode.java index bc520988a68..4b6ceed0a06 100644 --- a/src/test/java/org/elasticsearch/test/ExternalNode.java +++ b/src/test/java/org/elasticsearch/test/ExternalNode.java @@ -26,6 +26,7 @@ import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.client.Client; import org.elasticsearch.client.transport.TransportClient; import org.elasticsearch.cluster.ClusterName; +import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; @@ -91,6 +92,7 @@ final class ExternalNode implements Closeable { return externalNode; } + @SuppressForbidden(reason = "needs java.io.File api to start a process") synchronized void startInternal(Client client, Settings settings, String nodeName, String clusterName) throws IOException, InterruptedException { if (process != null) { throw new IllegalStateException("Already started"); diff --git a/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java b/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java index 4348bc44e47..de4532269e4 100644 --- a/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java +++ b/src/test/java/org/elasticsearch/test/disruption/LongGCDisruption.java @@ -19,6 +19,7 @@ package org.elasticsearch.test.disruption; +import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.unit.TimeValue; import java.util.HashSet; @@ -67,6 +68,7 @@ public class LongGCDisruption extends SingleNodeDisruption { return TimeValue.timeValueMillis(0); } + @SuppressForbidden(reason = "stops/resumes threads intentionally") protected boolean stopNodeThreads(String node, Set nodeThreads) { Set allThreadsSet = Thread.getAllStackTraces().keySet(); boolean stopped = false; @@ -99,6 +101,7 @@ public class LongGCDisruption extends SingleNodeDisruption { return stopped; } + @SuppressForbidden(reason = "stops/resumes threads intentionally") protected void resumeThreads(Set threads) { for (Thread thread : threads) { thread.resume();