From 835994a582f5145b1dabeadab75d979a3a354018 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Sat, 7 Nov 2015 01:11:05 -0800
Subject: [PATCH] Fix groupid and remove more legacy files

---
 README.md                               |  2 +-
 build.gradle                            |  6 ++---
 src/main/assemblies/plugin.xml          | 33 -------------------------
 src/main/resources/es-plugin.properties |  2 --
 4 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/assemblies/plugin.xml
 delete mode 100644 src/main/resources/es-plugin.properties

diff --git a/README.md b/README.md
index b712aa2996d..054f3c18175 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ You need to install a version matching your Elasticsearch version:
 To build a `SNAPSHOT` version, you need to build it with Maven:
 
 ```bash
-mvn clean install
+gradle clean assemble
 plugin --install mapper-attachments \
        --url file:target/releases/elasticsearch-mapper-attachments-X.X.X-SNAPSHOT.zip
 ```
diff --git a/build.gradle b/build.gradle
index 8df1890d9e8..4ca61f70527 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,9 +41,9 @@ esplugin {
   classname 'org.elasticsearch.plugin.mapper.attachments.MapperAttachmentsPlugin'
 }
 
-project.group = 'org.elasticsearch'
-project.version = ElasticsearchProperties.version
-project.ext.luceneVersion = ElasticsearchProperties.luceneVersion
+group = 'org.elasticsearch.plugin'
+version = ElasticsearchProperties.version
+ext.luceneVersion = ElasticsearchProperties.luceneVersion
 repositories {
   mavenCentral()
   maven {
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
deleted file mode 100644
index c0e851aa071..00000000000
--- a/src/main/assemblies/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<assembly>
-    <id>plugin</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <files>
-        <file>
-            <source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
-            <outputDirectory></outputDirectory>
-            <filtered>true</filtered>
-        </file>
-    </files>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            <excludes>
-                <exclude>org.elasticsearch:elasticsearch</exclude>
-            </excludes>
-        </dependencySet>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            <includes>
-                <include>org.apache.tika:tika-parsers</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-</assembly>
diff --git a/src/main/resources/es-plugin.properties b/src/main/resources/es-plugin.properties
deleted file mode 100644
index bd6c82accc0..00000000000
--- a/src/main/resources/es-plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-plugin=org.elasticsearch.plugin.mapper.attachments.MapperAttachmentsPlugin
-version=${project.version}