DCausse has uploaded a new change for review.
https://gerrit.wikimedia.org/r/285286
Change subject: Fix packaging issue
......................................................................
Fix packaging issue
plugin-descriptor.properties is mandatory and must contain various properties.
Elasticsearch will now check that the plugin has been compiled against the same
version. It means that we will need to release the plugins whenever we upgrade
elastic.
Change-Id: Ib194b2cd785f74a40b920ce23f58bea35abb9e28
---
M pom.xml
M src/main/assemblies/plugin.xml
D src/main/resources/es-plugin.properties
A src/main/resources/plugin-metadata/plugin-descriptor.properties
4 files changed, 21 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/extra
refs/changes/86/285286/1
diff --git a/pom.xml b/pom.xml
index 9a5e3bd..dd185da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,8 +43,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <elasticsearch.version>2.3.0</elasticsearch.version>
+ <elasticsearch.version>2.3.1</elasticsearch.version>
<lucene.version>5.5.0</lucene.version>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
</properties>
<build>
@@ -94,7 +96,7 @@
<artifactId>forbiddenapis</artifactId>
<version>1.6.1</version>
<configuration>
- <targetVersion>1.7</targetVersion>
+ <targetVersion>${maven.compiler.target}</targetVersion>
<!-- disallow undocumented classes like sun.misc.Unsafe: -->
<internalRuntimeForbidden>true</internalRuntimeForbidden>
<!-- if the used Java version is too new, don't fail, just do
nothing: -->
@@ -142,10 +144,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
index 123fcd0..cb4fb8e 100644
--- a/src/main/assemblies/plugin.xml
+++ b/src/main/assemblies/plugin.xml
@@ -16,4 +16,14 @@
</excludes>
</dependencySet>
</dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources/plugin-metadata</directory>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>plugin-descriptor.properties</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
diff --git a/src/main/resources/es-plugin.properties
b/src/main/resources/es-plugin.properties
deleted file mode 100644
index 3acbc64..0000000
--- a/src/main/resources/es-plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-plugin=org.wikimedia.search.extra.ExtraPlugin
-version=${project.version}
-lucene=${lucene.version}
diff --git a/src/main/resources/plugin-metadata/plugin-descriptor.properties
b/src/main/resources/plugin-metadata/plugin-descriptor.properties
new file mode 100644
index 0000000..4d1bbe2
--- /dev/null
+++ b/src/main/resources/plugin-metadata/plugin-descriptor.properties
@@ -0,0 +1,7 @@
+name=${project.name}
+description=${project.description}
+version=${project.version}
+jvm=true
+classname=org.wikimedia.search.extra.ExtraPlugin
+java.version=${maven.compiler.target}
+elasticsearch.version=${elasticsearch.version}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/285286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib194b2cd785f74a40b920ce23f58bea35abb9e28
Gerrit-PatchSet: 1
Gerrit-Project: search/extra
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
