Packaging: Changing groupId to org.elasticsearch.plugin

This commit changes the groupId to the above mentioned one
so that S3 uploads will end up in the right bucket. This will
allow the Elasticsearch plugin manager to install the commercial
plugins like

```
bin/plugin install {watcher,shield,license,marvel}
```

like the official ones.

Original commit: elastic/x-pack-elasticsearch@642f1f006a

marvel/dev-tools/integration-tests.xml

@@ -4,7 +4,7 @@
   <import file="${elasticsearch.integ.antfile.default}"/>
 
   <target name="start-external-cluster-with-plugin" depends="setup-workspace">
-    <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-plugin-${project.version}.zip" />
+    <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-${project.version}.zip" />
     <install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
     <startup-elasticsearch/>
   </target>

marvel/pom.xml

@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-marvel</artifactId>
     <name>Elasticsearch X-Plugins - Marvel</name>
     <description>Elasticsearch Marvel</description>
@@ -28,8 +27,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch-license-plugin</artifactId>
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>elasticsearch-license</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -66,8 +65,8 @@
                         <configuration>
                             <artifactItems combine.children="append">
                                 <artifactItem>
-                                    <groupId>org.elasticsearch</groupId>
-                                    <artifactId>elasticsearch-license-plugin</artifactId>
+                                    <groupId>org.elasticsearch.plugin</groupId>
+                                    <artifactId>elasticsearch-license</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>

shield/dev-tools/integration-tests.xml

@@ -20,7 +20,7 @@
   <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="elasticsearch-license" file="${integ.deps}/elasticsearch-license-plugin-${project.version}.zip" />
+    <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-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" args="useradd test_user -p changeme -r admin"/>
     <startup-elasticsearch/>

shield/docs/public/configuring-clients-integrations/java.asciidoc

@@ -15,7 +15,7 @@ To use the transport client with Shield, you need to:
 `transport_client` role is defined in `roles.yml` that grants the `cluster:monitor/nodes/info` cluster permission. The transport client uses the node info API to fetch information about the nodes in the cluster. If the client is configured to use sniffing, you need to add the
 `cluster:monitor/state` cluster permission to the `transport_client` role.
 
-. Add the Shield JAR file (`elasticsearch-shield-2.0.0.jar`) to your CLASSPATH. You can download the Shield distribution and extract the JAR file manually or you can get it from the http://maven.elasticsearch.org/releases/org/elasticsearch/elasticsearch-shield/2.0.0/elasticsearch-shield-2.0.0.jar[Elasticsearch Maven repository].
+. Add the Shield JAR file (`elasticsearch-shield-2.0.0.jar`) to your CLASSPATH. You can download the Shield distribution and extract the JAR file manually or you can get it from the http://maven.elasticsearch.org/releases/org/elasticsearch/plugin/elasticsearch-shield/2.0.0/elasticsearch-shield-2.0.0.jar[Elasticsearch Maven repository].
 +
 If you are using Maven, you need to add the Shield JAR file as a dependency in your project's `pom.xml` file:
 +
@@ -42,7 +42,7 @@ If you are using Maven, you need to add the Shield JAR file as a dependency in y
    <dependencies>
       <!-- add the shield jar as a dependency -->
       <dependency>
-         <groupId>org.elasticsearch</groupId>
+         <groupId>org.elasticsearch.plugin</groupId>
          <artifactId>elasticsearch-shield</artifactId>
          <version>2.0.0</version>
       </dependency>
@@ -69,7 +69,7 @@ repositories {
 dependencies {
   // Provide the Shield jar on the classpath for compilation and at runtime
   // Note: Many projects can use the Shield jar as a runtime dependency
-  compile "org.elasticsearch:elasticsearch-shield:2.0.0"
+  compile "org.elasticsearch.plugin:elasticsearch-shield:2.0.0"
 
   /* ... */
 }

shield/docs/public/getting-started.asciidoc

@@ -13,14 +13,14 @@ To install and run Shield:
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin install elasticsearch/license/latest
+bin/plugin install license
 ----------------------------------------------------------
 
 . Run `bin/plugin install` to install the Shield plugin.
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin install elasticsearch/shield/latest
+bin/plugin install shield
 ----------------------------------------------------------
 +
 NOTE: If you are using a <<deb-rpm-install, DEB/RPM distribution>> of Elasticsearch, you need to specify the configuration directory and run the installation with superuser permissions. To perform an offline installation, <<offline-install,download the Shield binaries>>.

shield/docs/public/release-notes.asciidoc

@@ -19,10 +19,8 @@ will be preserved and you do this with a rolling upgrade of Elasticsearch. On ea
 [source,shell]
 ---------------------------------------------------
 bin/plugin remove shield
-bin/plugin install elasticsearch/shield/latest <1>
+bin/plugin install shield
 ---------------------------------------------------
-<1> `latest` will install the latest version of Shield compatible with your version of Elasticsearch. A specific version,
-such as `1.1.0` can also be specified.
 
 Then start the node. Larger sites should follow the steps in the {ref}/setup-upgrade.html#_1_0_and_later[rolling upgrade section]
 in order to ensure recovery is as quick as possible.

shield/pom.xml

@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-shield</artifactId>
     <name>Elasticsearch X-Plugins - Shield</name>
     <description>Elasticsearch Shield (security)</description>
@@ -44,8 +43,8 @@
 
         <!-- real dependencies -->
         <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch-license-plugin</artifactId>
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>elasticsearch-license</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -97,8 +96,8 @@
                         <configuration>
                             <artifactItems combine.children="append">
                                 <artifactItem>
-                                    <groupId>org.elasticsearch</groupId>
-                                    <artifactId>elasticsearch-license-plugin</artifactId>
+                                    <groupId>org.elasticsearch.plugin</groupId>
+                                    <artifactId>elasticsearch-license</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>

shield/src/main/assemblies/plugin.xml

@@ -22,7 +22,7 @@
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveDependencies>false</useTransitiveDependencies>
             <includes>
-                <include>org.elasticsearch:elasticsearch-shield</include>
+                <include>org.elasticsearch.plugin:elasticsearch-shield</include>
                 <include>dk.brics.automaton:automaton</include>
                 <include>com.unboundid:unboundid-ldapsdk</include>
             </includes>

watcher/dev-tools/integration-tests.xml

@@ -4,7 +4,7 @@
   <import file="${elasticsearch.integ.antfile.default}"/>
 
   <target name="start-external-cluster-with-plugin" depends="setup-workspace">
-    <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-plugin-${project.version}.zip" />
+    <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-${project.version}.zip" />
     <install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
     <startup-elasticsearch/>
   </target>

watcher/docs/getting-started.asciidoc

@@ -11,7 +11,7 @@ To install and run Watcher:
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin install elasticsearch/license/latest
+bin/plugin install license
 ----------------------------------------------------------
 +
 NOTE:   You need to install the License and Watcher plugins on each node in your cluster. 
@@ -20,7 +20,7 @@ NOTE:   You need to install the License and Watcher plugins on each node in your
 +
 [source,shell]
 ----------------------------------------------------------
-bin/plugin install elasticsearch/watcher/latest
+bin/plugin install watcher
 ----------------------------------------------------------
 +
 NOTE:   If you are using a <<package-installation, DEB/RPM distribution>> of Elasticsearch, 

watcher/docs/installing-watcher.asciidoc

@@ -69,8 +69,8 @@ is slightly different. You need to install the License and Watcher plugins from
 [source,shell]
 ----------------------------------------------------------
 cd /usr/share/elasticsearch
-sudo bin/plugin install elasticsearch/license/latest
-sudo bin/plugin install elasticsearch/watcher/latest
+sudo bin/plugin install license
+sudo bin/plugin install watcher
 ----------------------------------------------------------
 
 [float]
@@ -92,12 +92,3 @@ https://download.elastic.co/elasticsearch/watcher/watcher-1.0.0.zip].
 bin/plugin install watcher -u file://<path_to_zip_file>
 ----------------------------------------------------------
 
-
-
-
-
-
-
-
-
-

watcher/docs/reference/java.asciidoc

@@ -34,9 +34,9 @@ If you use Maven to manage dependencies, add the following to the `pom.xml`:
    <dependencies>
       <!-- add the Watcher jar as a dependency -->
       <dependency>
-         <groupId>org.elasticsearch</groupId>
+         <groupId>org.elasticsearch.plugin</groupId>
          <artifactId>elasticsearch-watcher</artifactId>
-         <version>1.0.0-Beta1</version>
+         <version>2.0.0</version>
       </dependency>
       ...
    </dependencies>
@@ -60,13 +60,13 @@ repositories {
 
 dependencies {
   // Provide the Watcher jar on the classpath for compilation and at runtime
-  compile "org.elasticsearch:elasticsearch-watcher:1.0.0-Beta1"
+  compile "org.elasticsearch.plugin:elasticsearch-watcher:2.0.0"
 
   /* ... */
 }
 --------------------------------------------------------------
 
-You can manually download the http://maven.elasticsearch.org/releases/org/elasticsearch/elasticsearch-watcher/1.0.0-Beta1/elasticsearch-watcher-1.0.0-Beta1.jar[Watcher JAR]
+You can manually download the http://maven.elasticsearch.org/releases/org/elasticsearch/plugin/elasticsearch-watcher/2.0.0/elasticsearch-watcher-2.0.0.jar[Watcher JAR]
 directly from our Maven repository.
 
 ==== Creating the WatcherClient

watcher/pom.xml

@@ -5,7 +5,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-watcher</artifactId>
     <name>Elasticsearch X-Plugins - Watcher</name>
     <description>Elasticsearch Watcher</description>
@@ -52,14 +51,14 @@
         <!-- Regular dependencies -->
 
         <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch-license-plugin</artifactId>
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>elasticsearch-license</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.elasticsearch</groupId>
+            <groupId>org.elasticsearch.plugin</groupId>
             <artifactId>elasticsearch-shield</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
@@ -150,8 +149,8 @@
                         <configuration>
                             <artifactItems combine.children="append">
                                 <artifactItem>
-                                    <groupId>org.elasticsearch</groupId>
-                                    <artifactId>elasticsearch-license-plugin</artifactId>
+                                    <groupId>org.elasticsearch.plugin</groupId>
+                                    <artifactId>elasticsearch-license</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>

x-dev-tools/smoke_test_watcher.py

@@ -206,11 +206,11 @@ if __name__ == '__main__':
             es_dir = version_tmp_dir + 'elasticsearch-%s/' % (es_version)
             print('Installing License plugin...')
             url = 'file://%s' % license_artifact
-            run('%s; %s install %s --url %s' % (JAVA_ENV, es_dir + 'bin/plugin', 'elasticsearch/license', url))
+            run('%s; %s install %s --url %s' % (JAVA_ENV, es_dir + 'bin/plugin', 'license', url))
 
             url = 'file://%s' % watcher_artifact
             print('Installing Watcher plugin...')
-            run('%s; %s install %s --url %s' % (JAVA_ENV, es_dir + 'bin/plugin', 'elasticsearch/watcher', url))
+            run('%s; %s install %s --url %s' % (JAVA_ENV, es_dir + 'bin/plugin', 'watcher', url))
 
             p = None
             try:
@@ -300,4 +300,4 @@ if __name__ == '__main__':
         shutil.rmtree(base_tmp_dir)
 
     print('> Smoke tester has successfully completed')
-    print('> The following es version were test [%s] with Watcher version [%s]' % (supported_es_version, expected_watcher_version))
+    print('> The following es version were test [%s] with Watcher version [%s]' % (supported_es_version, expected_watcher_version))