Skip to content

Commit d21afc8

Browse files
dadoonetdadoonet
committed
[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.
1 parent 0bb9593 commit d21afc8

File tree

18 files changed

+60
-60
lines changed

18 files changed

+60
-60
lines changed

‎migrate.sh

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

‎plugins/analysis-icu/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-analysis-icu</artifactId>
14-
<name>Elasticsearch ICU Analysis plugin</name>
13+
<artifactId>analysis-icu</artifactId>
14+
<name>Plugin: Analysis: ICU</name>
1515
<description>The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components.</description>
1616

1717
<properties>

‎plugins/analysis-kuromoji/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-analysis-kuromoji</artifactId>
14-
<packaging>jar</packaging>
15-
<name>Elasticsearch Japanese (kuromoji) Analysis plugin</name>
13+
<artifactId>analysis-kuromoji</artifactId>
14+
<name>Plugin: Analysis: Japanese (kuromoji)</name>
1615
<description>The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.</description>
1716

1817
<properties>

‎plugins/analysis-phonetic/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-analysis-phonetic</artifactId>
14-
<name>Elasticsearch Phonetic Analysis plugin</name>
13+
<artifactId>analysis-phonetic</artifactId>
14+
<name>Plugin: Analysis: Phonetic</name>
1515
<description>The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.</description>
1616

1717
<properties>

‎plugins/analysis-smartcn/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-analysis-smartcn</artifactId>
14-
<name>Elasticsearch Smart Chinese Analysis plugin</name>
13+
<artifactId>analysis-smartcn</artifactId>
14+
<name>Plugin: Analysis: Smart Chinese (smartcn)</name>
1515
<description>Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.</description>
1616

1717
<properties>

‎plugins/analysis-stempel/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-analysis-stempel</artifactId>
14-
<name>Elasticsearch Stempel (Polish) Analysis plugin</name>
13+
<artifactId>analysis-stempel</artifactId>
14+
<name>Plugin: Analysis: Polish (stempel)</name>
1515
<description>The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.</description>
1616

1717
<properties>

‎plugins/cloud-aws/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-cloud-aws</artifactId>
14-
<name>Elasticsearch AWS cloud plugin</name>
13+
<artifactId>cloud-aws</artifactId>
14+
<name>Plugin: Cloud: AWS</name>
1515
<description>The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.</description>
1616

1717
<properties>

‎plugins/cloud-azure/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
1717

1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
20-
<artifactId>elasticsearch-plugin</artifactId>
20+
<artifactId>plugins</artifactId>
2121
<version>2.1.0-SNAPSHOT</version>
2222
</parent>
2323

24-
<artifactId>elasticsearch-cloud-azure</artifactId>
25-
<name>Elasticsearch Azure cloud plugin</name>
24+
<artifactId>cloud-azure</artifactId>
25+
<name>Plugin: Cloud: Azure</name>
2626
<description>The Azure Cloud plugin allows to use Azure API for the unicast discovery mechanism and add Azure storage repositories.</description>
2727

2828
<properties>

‎plugins/cloud-gce/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
1717

1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
20-
<artifactId>elasticsearch-plugin</artifactId>
20+
<artifactId>plugins</artifactId>
2121
<version>2.1.0-SNAPSHOT</version>
2222
</parent>
2323

24-
<artifactId>elasticsearch-cloud-gce</artifactId>
25-
<name>Elasticsearch Google Compute Engine cloud plugin</name>
24+
<artifactId>cloud-gce</artifactId>
25+
<name>Plugin: Cloud: Google Compute Engine</name>
2626
<description>The Google Compute Engine (GCE) Cloud plugin allows to use GCE API for the unicast discovery mechanism.</description>
2727

2828
<properties>

‎plugins/delete-by-query/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
1717

1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
20-
<artifactId>elasticsearch-plugin</artifactId>
20+
<artifactId>plugins</artifactId>
2121
<version>2.1.0-SNAPSHOT</version>
2222
</parent>
2323

24-
<artifactId>elasticsearch-delete-by-query</artifactId>
25-
<name>Elasticsearch Delete By Query plugin</name>
24+
<artifactId>delete-by-query</artifactId>
25+
<name>Plugin: Delete By Query</name>
2626
<description>The Delete By Query plugin allows to delete documents in Elasticsearch with a single query.</description>
2727

2828
<properties>

‎plugins/jvm-example/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-jvm-example</artifactId>
14-
<name>Elasticsearch example JVM plugin</name>
13+
<artifactId>jvm-example</artifactId>
14+
<name>Plugin: JVM example</name>
1515
<description>Demonstrates all the pluggable Java entry points in Elasticsearch</description>
1616

1717
<properties>

‎plugins/lang-javascript/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-lang-javascript</artifactId>
14-
<name>Elasticsearch JavaScript language plugin</name>
13+
<artifactId>lang-javascript</artifactId>
14+
<name>Plugin: Language: JavaScript</name>
1515
<description>The JavaScript language plugin allows to have javascript as the language of scripts to execute.</description>
1616

1717
<properties>

‎plugins/lang-python/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-lang-python</artifactId>
14-
<name>Elasticsearch Python language plugin</name>
13+
<artifactId>lang-python</artifactId>
14+
<name>Plugin: Language: Python</name>
1515
<description>The Python language plugin allows to have python as the language of scripts to execute.</description>
1616

1717
<properties>

‎plugins/mapper-size/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ governing permissions and limitations under the License. -->
1717

1818
<parent>
1919
<groupId>org.elasticsearch.plugin</groupId>
20-
<artifactId>elasticsearch-plugin</artifactId>
20+
<artifactId>plugins</artifactId>
2121
<version>2.1.0-SNAPSHOT</version>
2222
</parent>
2323

24-
<artifactId>elasticsearch-mapper-size</artifactId>
25-
<name>Elasticsearch Mapper size plugin</name>
24+
<artifactId>mapper-size</artifactId>
25+
<name>Plugin: Mapper: Size</name>
2626
<description>The Mapper Size plugin allows document to record their uncompressed size at index time.</description>
2727

2828
<properties>

‎plugins/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
<packaging>pom</packaging>
12-
<name>Elasticsearch Plugin POM</name>
12+
<name>Plugin: Parent POM</name>
1313
<inceptionYear>2009</inceptionYear>
1414
<description>A parent project for Elasticsearch plugins</description>
1515

‎plugins/site-example/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
<parent>
88
<groupId>org.elasticsearch.plugin</groupId>
9-
<artifactId>elasticsearch-plugin</artifactId>
9+
<artifactId>plugins</artifactId>
1010
<version>2.1.0-SNAPSHOT</version>
1111
</parent>
1212

13-
<artifactId>elasticsearch-site-example</artifactId>
14-
<name>Elasticsearch Example site plugin</name>
13+
<artifactId>site-example</artifactId>
14+
<name>Plugin: Example site</name>
1515
<description>Demonstrates how to serve resources via elasticsearch.</description>
1616

1717
<properties>

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1216,6 +1216,7 @@ org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UT
12161216
<arg value="--check"/>
12171217
<arg value="${project.licenses.dir}"/>
12181218
<arg value="${project.licenses.check_target}"/>
1219+
<arg value="${project.build.finalName}"/>
12191220
</exec>
12201221
</target>
12211222
</configuration>

‎qa/smoke-test-plugins/pom.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -247,87 +247,87 @@
247247
<!-- plugins -->
248248
<artifactItem>
249249
<groupId>org.elasticsearch.plugin</groupId>
250-
<artifactId>elasticsearch-analysis-kuromoji</artifactId>
250+
<artifactId>analysis-kuromoji</artifactId>
251251
<version>${elasticsearch.version}</version>
252252
<type>zip</type>
253253
<overWrite>true</overWrite>
254254
</artifactItem>
255255

256256
<artifactItem>
257257
<groupId>org.elasticsearch.plugin</groupId>
258-
<artifactId>elasticsearch-analysis-smartcn</artifactId>
258+
<artifactId>analysis-smartcn</artifactId>
259259
<version>${elasticsearch.version}</version>
260260
<type>zip</type>
261261
<overWrite>true</overWrite>
262262
</artifactItem>
263263

264264
<artifactItem>
265265
<groupId>org.elasticsearch.plugin</groupId>
266-
<artifactId>elasticsearch-analysis-stempel</artifactId>
266+
<artifactId>analysis-stempel</artifactId>
267267
<version>${elasticsearch.version}</version>
268268
<type>zip</type>
269269
<overWrite>true</overWrite>
270270
</artifactItem>
271271

272272
<artifactItem>
273273
<groupId>org.elasticsearch.plugin</groupId>
274-
<artifactId>elasticsearch-analysis-phonetic</artifactId>
274+
<artifactId>analysis-phonetic</artifactId>
275275
<version>${elasticsearch.version}</version>
276276
<type>zip</type>
277277
<overWrite>true</overWrite>
278278
</artifactItem>
279279

280280
<artifactItem>
281281
<groupId>org.elasticsearch.plugin</groupId>
282-
<artifactId>elasticsearch-analysis-icu</artifactId>
282+
<artifactId>analysis-icu</artifactId>
283283
<version>${elasticsearch.version}</version>
284284
<type>zip</type>
285285
<overWrite>true</overWrite>
286286
</artifactItem>
287287

288288
<artifactItem>
289289
<groupId>org.elasticsearch.plugin</groupId>
290-
<artifactId>elasticsearch-cloud-gce</artifactId>
290+
<artifactId>cloud-gce</artifactId>
291291
<version>${elasticsearch.version}</version>
292292
<type>zip</type>
293293
<overWrite>true</overWrite>
294294
</artifactItem>
295295

296296
<artifactItem>
297297
<groupId>org.elasticsearch.plugin</groupId>
298-
<artifactId>elasticsearch-cloud-azure</artifactId>
298+
<artifactId>cloud-azure</artifactId>
299299
<version>${elasticsearch.version}</version>
300300
<type>zip</type>
301301
<overWrite>true</overWrite>
302302
</artifactItem>
303303

304304
<artifactItem>
305305
<groupId>org.elasticsearch.plugin</groupId>
306-
<artifactId>elasticsearch-cloud-aws</artifactId>
306+
<artifactId>cloud-aws</artifactId>
307307
<version>${elasticsearch.version}</version>
308308
<type>zip</type>
309309
<overWrite>true</overWrite>
310310
</artifactItem>
311311

312312
<artifactItem>
313313
<groupId>org.elasticsearch.plugin</groupId>
314-
<artifactId>elasticsearch-delete-by-query</artifactId>
314+
<artifactId>delete-by-query</artifactId>
315315
<version>${elasticsearch.version}</version>
316316
<type>zip</type>
317317
<overWrite>true</overWrite>
318318
</artifactItem>
319319

320320
<artifactItem>
321321
<groupId>org.elasticsearch.plugin</groupId>
322-
<artifactId>elasticsearch-lang-python</artifactId>
322+
<artifactId>lang-python</artifactId>
323323
<version>${elasticsearch.version}</version>
324324
<type>zip</type>
325325
<overWrite>true</overWrite>
326326
</artifactItem>
327327

328328
<artifactItem>
329329
<groupId>org.elasticsearch.plugin</groupId>
330-
<artifactId>elasticsearch-lang-javascript</artifactId>
330+
<artifactId>lang-javascript</artifactId>
331331
<version>${elasticsearch.version}</version>
332332
<type>zip</type>
333333
<overWrite>true</overWrite>
@@ -343,23 +343,23 @@
343343

344344
<artifactItem>
345345
<groupId>org.elasticsearch.plugin</groupId>
346-
<artifactId>elasticsearch-mapper-size</artifactId>
346+
<artifactId>mapper-size</artifactId>
347347
<version>${elasticsearch.version}</version>
348348
<type>zip</type>
349349
<overWrite>true</overWrite>
350350
</artifactItem>
351351

352352
<artifactItem>
353353
<groupId>org.elasticsearch.plugin</groupId>
354-
<artifactId>elasticsearch-site-example</artifactId>
354+
<artifactId>site-example</artifactId>
355355
<version>${elasticsearch.version}</version>
356356
<type>zip</type>
357357
<overWrite>true</overWrite>
358358
</artifactItem>
359359

360360
<artifactItem>
361361
<groupId>org.elasticsearch.plugin</groupId>
362-
<artifactId>elasticsearch-jvm-example</artifactId>
362+
<artifactId>jvm-example</artifactId>
363363
<version>${elasticsearch.version}</version>
364364
<type>zip</type>
365365
<overWrite>true</overWrite>

0 commit comments

Comments
 (0)