Fix some errors when installing the plugin

SentiOne · Jan 15, 2019 · 82fd336 · 82fd336
1 parent 252adf3
commit 82fd336
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/main/assemblies/plugin.xml b/src/main/assemblies/plugin.xml
@@ -8,13 +8,13 @@
     <files>
         <file>
             <source>src/main/resources/plugin-descriptor.properties</source>
-            <outputDirectory>elasticsearch</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <filtered>true</filtered>
         </file>
     </files>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>elasticsearch</outputDirectory>
+            <outputDirectory>/</outputDirectory>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>

diff --git a/src/main/resources/plugin-descriptor.properties b/src/main/resources/plugin-descriptor.properties
@@ -8,16 +8,7 @@ version=${project.version}
 #
 # 'name': the plugin name
 name=analysis-combo
-
-### mandatory elements for jvm plugins :
-#
-# 'jvm': true if the 'classname' class should be loaded
-#  from jar files in the root directory of the plugin.
-#  Note that only jar files in the root directory are
-#  added to the classpath for the plugin! If you need
-#  other resources, package them into a resources jar.
-jvm=true
-#
+
 # 'classname': the name of the class to load, fully-qualified.
 classname=org.elasticsearch.plugin.analysis.combo.AnalysisComboPlugin
 #