[maven] rename artifactIds from `elasticsearch-something` to `something`

In plugins, we are using non consistent naming. We use `elasticsearch-cloud-aws` as the artifactId, which generates a jar file called `elasticsearch-cloud-aws-VERSION.jar`.

But when you want to install the plugin, you will end up with a shorter name for the plugin `cloud-aws`.

```
bin/plugin install cloud-aws
```

This commit changes that and use consistent names for `artifactId`, so `finalName`.

Also changed maven names.
This commit is contained in:
David Pilato 2015-08-14 16:52:55 +02:00
parent 0bb9593596
commit d21afc8090
18 changed files with 60 additions and 60 deletions

View File

@ -68,7 +68,7 @@ function migratePlugin() {
mkdir -p plugins/$1 mkdir -p plugins/$1
git mv -k * plugins/$1 > /dev/null 2>/dev/null git mv -k * plugins/$1 > /dev/null 2>/dev/null
git rm .gitignore > /dev/null 2>/dev/null git rm .gitignore > /dev/null 2>/dev/null
# echo "### change $1 groupId to org.elasticsearch.plugins" # echo "### change $1 groupId to org.elasticsearch.plugin"
# Change the groupId to avoid conflicts with existing 2.0.0 versions. # Change the groupId to avoid conflicts with existing 2.0.0 versions.
replaceLine " <groupId>org.elasticsearch<\/groupId>" " <groupId>org.elasticsearch.plugin<\/groupId>" "plugins/$1/pom.xml" replaceLine " <groupId>org.elasticsearch<\/groupId>" " <groupId>org.elasticsearch.plugin<\/groupId>" "plugins/$1/pom.xml"

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-icu</artifactId> <artifactId>analysis-icu</artifactId>
<name>Elasticsearch ICU Analysis plugin</name> <name>Plugin: Analysis: ICU</name>
<description>The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components.</description> <description>The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components.</description>
<properties> <properties>

View File

@ -6,13 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-kuromoji</artifactId> <artifactId>analysis-kuromoji</artifactId>
<packaging>jar</packaging> <name>Plugin: Analysis: Japanese (kuromoji)</name>
<name>Elasticsearch Japanese (kuromoji) Analysis plugin</name>
<description>The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.</description> <description>The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-phonetic</artifactId> <artifactId>analysis-phonetic</artifactId>
<name>Elasticsearch Phonetic Analysis plugin</name> <name>Plugin: Analysis: Phonetic</name>
<description>The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.</description> <description>The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-smartcn</artifactId> <artifactId>analysis-smartcn</artifactId>
<name>Elasticsearch Smart Chinese Analysis plugin</name> <name>Plugin: Analysis: Smart Chinese (smartcn)</name>
<description>Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.</description> <description>Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-analysis-stempel</artifactId> <artifactId>analysis-stempel</artifactId>
<name>Elasticsearch Stempel (Polish) Analysis plugin</name> <name>Plugin: Analysis: Polish (stempel)</name>
<description>The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.</description> <description>The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-cloud-aws</artifactId> <artifactId>cloud-aws</artifactId>
<name>Elasticsearch AWS cloud plugin</name> <name>Plugin: Cloud: AWS</name>
<description>The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.</description> <description>The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.</description>
<properties> <properties>

View File

@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-cloud-azure</artifactId> <artifactId>cloud-azure</artifactId>
<name>Elasticsearch Azure cloud plugin</name> <name>Plugin: Cloud: Azure</name>
<description>The Azure Cloud plugin allows to use Azure API for the unicast discovery mechanism and add Azure storage repositories.</description> <description>The Azure Cloud plugin allows to use Azure API for the unicast discovery mechanism and add Azure storage repositories.</description>
<properties> <properties>

View File

@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-cloud-gce</artifactId> <artifactId>cloud-gce</artifactId>
<name>Elasticsearch Google Compute Engine cloud plugin</name> <name>Plugin: Cloud: Google Compute Engine</name>
<description>The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism.</description> <description>The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism.</description>
<properties> <properties>

View File

@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-delete-by-query</artifactId> <artifactId>delete-by-query</artifactId>
<name>Elasticsearch Delete By Query plugin</name> <name>Plugin: Delete By Query</name>
<description>The Delete By Query plugin allows to delete documents in Elasticsearch with a single query.</description> <description>The Delete By Query plugin allows to delete documents in Elasticsearch with a single query.</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-jvm-example</artifactId> <artifactId>jvm-example</artifactId>
<name>Elasticsearch example JVM plugin</name> <name>Plugin: JVM example</name>
<description>Demonstrates all the pluggable Java entry points in Elasticsearch</description> <description>Demonstrates all the pluggable Java entry points in Elasticsearch</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-lang-javascript</artifactId> <artifactId>lang-javascript</artifactId>
<name>Elasticsearch JavaScript language plugin</name> <name>Plugin: Language: JavaScript</name>
<description>The JavaScript language plugin allows to have javascript as the language of scripts to execute.</description> <description>The JavaScript language plugin allows to have javascript as the language of scripts to execute.</description>
<properties> <properties>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-lang-python</artifactId> <artifactId>lang-python</artifactId>
<name>Elasticsearch Python language plugin</name> <name>Plugin: Language: Python</name>
<description>The Python language plugin allows to have python as the language of scripts to execute.</description> <description>The Python language plugin allows to have python as the language of scripts to execute.</description>
<properties> <properties>

View File

@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-mapper-size</artifactId> <artifactId>mapper-size</artifactId>
<name>Elasticsearch Mapper size plugin</name> <name>Plugin: Mapper: Size</name>
<description>The Mapper Size plugin allows document to record their uncompressed size at index time.</description> <description>The Mapper Size plugin allows document to record their uncompressed size at index time.</description>
<properties> <properties>

View File

@ -6,10 +6,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Elasticsearch Plugin POM</name> <name>Plugin: Parent POM</name>
<inceptionYear>2009</inceptionYear> <inceptionYear>2009</inceptionYear>
<description>A parent project for Elasticsearch plugins</description> <description>A parent project for Elasticsearch plugins</description>

View File

@ -6,12 +6,12 @@
<parent> <parent>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-plugin</artifactId> <artifactId>plugins</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>elasticsearch-site-example</artifactId> <artifactId>site-example</artifactId>
<name>Elasticsearch Example site plugin</name> <name>Plugin: Example site</name>
<description>Demonstrates how to serve resources via elasticsearch.</description> <description>Demonstrates how to serve resources via elasticsearch.</description>
<properties> <properties>

View File

@ -1216,6 +1216,7 @@ org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UT
<arg value="--check"/> <arg value="--check"/>
<arg value="${project.licenses.dir}"/> <arg value="${project.licenses.dir}"/>
<arg value="${project.licenses.check_target}"/> <arg value="${project.licenses.check_target}"/>
<arg value="${project.build.finalName}"/>
</exec> </exec>
</target> </target>
</configuration> </configuration>

View File

@ -247,7 +247,7 @@
<!-- plugins --> <!-- plugins -->
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-analysis-kuromoji</artifactId> <artifactId>analysis-kuromoji</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -255,7 +255,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-analysis-smartcn</artifactId> <artifactId>analysis-smartcn</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -263,7 +263,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-analysis-stempel</artifactId> <artifactId>analysis-stempel</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -271,7 +271,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-analysis-phonetic</artifactId> <artifactId>analysis-phonetic</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -279,7 +279,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-analysis-icu</artifactId> <artifactId>analysis-icu</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -287,7 +287,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-cloud-gce</artifactId> <artifactId>cloud-gce</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -295,7 +295,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-cloud-azure</artifactId> <artifactId>cloud-azure</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -303,7 +303,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-cloud-aws</artifactId> <artifactId>cloud-aws</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -311,7 +311,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-delete-by-query</artifactId> <artifactId>delete-by-query</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -319,7 +319,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-lang-python</artifactId> <artifactId>lang-python</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -327,7 +327,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-lang-javascript</artifactId> <artifactId>lang-javascript</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -343,7 +343,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-mapper-size</artifactId> <artifactId>mapper-size</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -351,7 +351,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-site-example</artifactId> <artifactId>site-example</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>
@ -359,7 +359,7 @@
<artifactItem> <artifactItem>
<groupId>org.elasticsearch.plugin</groupId> <groupId>org.elasticsearch.plugin</groupId>
<artifactId>elasticsearch-jvm-example</artifactId> <artifactId>jvm-example</artifactId>
<version>${elasticsearch.version}</version> <version>${elasticsearch.version}</version>
<type>zip</type> <type>zip</type>
<overWrite>true</overWrite> <overWrite>true</overWrite>