DCausse has uploaded a new change for review.
https://gerrit.wikimedia.org/r/285291
Change subject: Fix packaging issues
......................................................................
Fix packaging issues
Added plugin-descriptor.properties.
Setting direct dep to 2.3.1 for testing I'll try to make the plugin version to
match elastic version when releasing.
Change-Id: Ic5daa12112202003493420256545e307e62defb0
---
M experimental-highlighter-elasticsearch-plugin/pom.xml
M experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
D
experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
A
experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
M pom.xml
5 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/search/highlighter
refs/changes/91/285291/1
diff --git a/experimental-highlighter-elasticsearch-plugin/pom.xml
b/experimental-highlighter-elasticsearch-plugin/pom.xml
index b0cb7db..4155b59 100644
--- a/experimental-highlighter-elasticsearch-plugin/pom.xml
+++ b/experimental-highlighter-elasticsearch-plugin/pom.xml
@@ -9,6 +9,10 @@
<packaging>jar</packaging>
<name>Elasticsearch plugin for experimental highlighter</name>
+ <description>Experimental Highlighter plugin</description>
+ <properties>
+ <elasticsearch.plugin.name>experimental
highlighter</elasticsearch.plugin.name>
+ </properties>
<dependencies>
<dependency>
diff --git
a/experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
b/experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
index 123fcd0..cb4fb8e 100644
---
a/experimental-highlighter-elasticsearch-plugin/src/main/assemblies/plugin.xml
+++
b/experimental-highlighter-elasticsearch-plugin/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/experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
b/experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
deleted file mode 100644
index 4b2bf8a..0000000
---
a/experimental-highlighter-elasticsearch-plugin/src/main/resources/es-plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-plugin=org.wikimedia.highlighter.experimental.elasticsearch.plugin.ExperimentalHighlighterPlugin
-version=${project.version}
-lucene=${lucene.version}
diff --git
a/experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
b/experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
new file mode 100644
index 0000000..bc10f10
--- /dev/null
+++
b/experimental-highlighter-elasticsearch-plugin/src/main/resources/plugin-metadata/plugin-descriptor.properties
@@ -0,0 +1,7 @@
+name=${elasticsearch.plugin.name}
+description=${project.description}
+version=${project.version}
+jvm=true
+classname=org.wikimedia.highlighter.experimental.elasticsearch.plugin.ExperimentalHighlighterPlugin
+java.version=${maven.compiler.target}
+elasticsearch.version=${elasticsearch.version}
diff --git a/pom.xml b/pom.xml
index 74d121f..967ef6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,10 +49,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <elasticsearch.version>2.3.0</elasticsearch.version>
+ <elasticsearch.version>2.3.1</elasticsearch.version>
<!-- For the Elasticsearch plugin to work this should match the version of
Lucene that Elasticsearch
uses. -->
<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>
@@ -78,10 +80,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>
@@ -228,7 +226,7 @@
<artifactId>forbiddenapis</artifactId>
<version>1.5</version>
<configuration>
- <targetVersion>1.7</targetVersion>
+ <targetVersion>${maven.compiler.target}</targetVersion>
<failOnMissingClasses>false</failOnMissingClasses> <!-- this is a
bug in forbidden APIs since 1.5 looks also at annotations -->
<!-- disallow undocumented classes like sun.misc.Unsafe: -->
<internalRuntimeForbidden>true</internalRuntimeForbidden>
--
To view, visit https://gerrit.wikimedia.org/r/285291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5daa12112202003493420256545e307e62defb0
Gerrit-PatchSet: 1
Gerrit-Project: search/highlighter
Gerrit-Branch: master
Gerrit-Owner: DCausse <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
