Merge pull request elastic/elasticsearch#1003 from rjernst/maven_cleanup
Build: Remove leftover ant and maven files Original commit: elastic/x-pack-elasticsearch@a3bdc7917d
This commit is contained in:
Ryan Ernst
commit
5f30602d1a
|
|
@ -1,11 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<project name="commercial-integration-tests">
|
|
||||||
|
|
||||||
<import file="${elasticsearch.integ.antfile.default}"/>
|
|
||||||
|
|
||||||
<target name="start-external-cluster-with-plugin" depends="setup-workspace">
|
|
||||||
<install-plugin name="license" file="${integ.deps}/license-${project.version}.zip" />
|
|
||||||
<install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
|
|
||||||
<startup-elasticsearch/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<!--
|
|
||||||
~ ELASTICSEARCH CONFIDENTIAL
|
|
||||||
~ __________________
|
|
||||||
~
|
|
||||||
~ [2014] Elasticsearch Incorporated. All Rights Reserved.
|
|
||||||
~
|
|
||||||
~ NOTICE: All information contained herein is, and remains
|
|
||||||
~ the property of Elasticsearch Incorporated and its suppliers,
|
|
||||||
~ if any. The intellectual and technical concepts contained
|
|
||||||
~ herein are proprietary to Elasticsearch Incorporated
|
|
||||||
~ and its suppliers and may be covered by U.S. and Foreign Patents,
|
|
||||||
~ patents in process, and are protected by trade secret or copyright law.
|
|
||||||
~ Dissemination of this information or reproduction of this material
|
|
||||||
~ is strictly forbidden unless prior written permission is obtained
|
|
||||||
~ from Elasticsearch Incorporated.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<assembly>
|
|
||||||
<id>plugin</id>
|
|
||||||
<formats>
|
|
||||||
<format>zip</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<dependencySets>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<useProjectArtifact>true</useProjectArtifact>
|
|
||||||
<useTransitiveDependencies>false</useTransitiveDependencies>
|
|
||||||
<includes>
|
|
||||||
<include>org.elasticsearch.plugin:marvel-agent</include>
|
|
||||||
</includes>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
<files>
|
|
||||||
<file>
|
|
||||||
<source>LICENSE.txt</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<source>NOTICE.txt</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
|
|
||||||
<outputDirectory></outputDirectory>
|
|
||||||
<filtered>true</filtered>
|
|
||||||
</file>
|
|
||||||
</files>
|
|
||||||
</assembly>
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<project name="commercial-integration-tests">
|
|
||||||
|
|
||||||
<import file="${elasticsearch.integ.antfile.default}"/>
|
|
||||||
|
|
||||||
<!-- redefined to work with auth -->
|
|
||||||
<macrodef name="waitfor-elasticsearch">
|
|
||||||
<attribute name="port"/>
|
|
||||||
<attribute name="timeoutproperty"/>
|
|
||||||
<sequential>
|
|
||||||
<echo>Waiting for elasticsearch to become available on port @{port}...</echo>
|
|
||||||
<waitfor maxwait="30" maxwaitunit="second"
|
|
||||||
checkevery="500" checkeveryunit="millisecond"
|
|
||||||
timeoutproperty="@{timeoutproperty}">
|
|
||||||
<socket server="127.0.0.1" port="@{port}"/>
|
|
||||||
</waitfor>
|
|
||||||
</sequential>
|
|
||||||
</macrodef>
|
|
||||||
|
|
||||||
<target name="start-external-cluster-with-plugin" depends="setup-workspace">
|
|
||||||
<local name="home"/>
|
|
||||||
<property name="home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
|
|
||||||
<install-plugin name="license" file="${integ.deps}/license-${project.version}.zip" />
|
|
||||||
<install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
|
|
||||||
<run-script script="${home}/bin/shield/esusers">
|
|
||||||
<nested>
|
|
||||||
<arg value="useradd"/>
|
|
||||||
<arg value="test_user"/>
|
|
||||||
<arg value="-p"/>
|
|
||||||
<arg value="changeme"/>
|
|
||||||
<arg value="-r"/>
|
|
||||||
<arg value="admin"/>
|
|
||||||
</nested>
|
|
||||||
</run-script>
|
|
||||||
<startup-elasticsearch/>
|
|
||||||
<echo>Checking we can connect with basic auth on port ${integ.http.port}...</echo>
|
|
||||||
<local name="temp.file"/>
|
|
||||||
<tempfile property="temp.file" destdir="${java.io.tmpdir}"/>
|
|
||||||
<get src="http://127.0.0.1:${integ.http.port}" dest="${temp.file}"
|
|
||||||
username="test_user" password="changeme" verbose="true" retries="10"/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<assembly>
|
|
||||||
<id>plugin</id>
|
|
||||||
<formats>
|
|
||||||
<format>zip</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<fileSets>
|
|
||||||
<fileSet>
|
|
||||||
<filtered>false</filtered>
|
|
||||||
<directory>bin/shield</directory>
|
|
||||||
<outputDirectory>bin</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>config/shield</directory>
|
|
||||||
<outputDirectory>config</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
</fileSets>
|
|
||||||
<dependencySets>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<useProjectArtifact>true</useProjectArtifact>
|
|
||||||
<useTransitiveDependencies>false</useTransitiveDependencies>
|
|
||||||
<includes>
|
|
||||||
<include>org.elasticsearch.plugin:shield</include>
|
|
||||||
<include>dk.brics.automaton:automaton</include>
|
|
||||||
<include>com.unboundid:unboundid-ldapsdk</include>
|
|
||||||
</includes>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
<files>
|
|
||||||
<file>
|
|
||||||
<source>LICENSE.txt</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<source>NOTICE.txt</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
|
|
||||||
<outputDirectory></outputDirectory>
|
|
||||||
<filtered>true</filtered>
|
|
||||||
</file>
|
|
||||||
</files>
|
|
||||||
</assembly>
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<project name="commercial-integration-tests">
|
|
||||||
|
|
||||||
<import file="${elasticsearch.integ.antfile.default}"/>
|
|
||||||
|
|
||||||
<target name="start-external-cluster-with-plugin" depends="setup-workspace">
|
|
||||||
<install-plugin name="license" file="${integ.deps}/license-${project.version}.zip" />
|
|
||||||
<install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
|
|
||||||
<startup-elasticsearch/>
|
|
||||||
</target>
|
|
||||||
</project>
|
|
||||||
|
|
@ -1,57 +0,0 @@
|
||||||
<?xml version="1.0"?>
|
|
||||||
<assembly>
|
|
||||||
<id>plugin</id>
|
|
||||||
<formats>
|
|
||||||
<format>zip</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<fileSets>
|
|
||||||
<fileSet>
|
|
||||||
<filtered>false</filtered>
|
|
||||||
<directory>bin/watcher</directory>
|
|
||||||
<outputDirectory>bin</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.basedir}/src/main/plugin-metadata</directory>
|
|
||||||
<includes>
|
|
||||||
<include>plugin-security.policy</include>
|
|
||||||
</includes>
|
|
||||||
<outputDirectory></outputDirectory>
|
|
||||||
<filtered>false</filtered>
|
|
||||||
</fileSet>
|
|
||||||
</fileSets>
|
|
||||||
<dependencySets>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<useProjectArtifact>true</useProjectArtifact>
|
|
||||||
<useTransitiveFiltering>true</useTransitiveFiltering>
|
|
||||||
<excludes>
|
|
||||||
<exclude>org.elasticsearch:elasticsearch</exclude>
|
|
||||||
</excludes>
|
|
||||||
</dependencySet>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<useTransitiveDependencies>false</useTransitiveDependencies>
|
|
||||||
<includes>
|
|
||||||
<include>com.sun.mail:javax.mail</include>
|
|
||||||
<include>javax.activation:activation</include>
|
|
||||||
<include>com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer</include>
|
|
||||||
</includes>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
<files>
|
|
||||||
<file>
|
|
||||||
<source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
|
|
||||||
<outputDirectory></outputDirectory>
|
|
||||||
<filtered>true</filtered>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<source>LICENSE.txt</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</file>
|
|
||||||
<file>
|
|
||||||
<source>NOTICE.txt</source>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
</file>
|
|
||||||
</files>
|
|
||||||
</assembly>
|
|
||||||
Loading…
Reference in New Issue