From 1a5f72c28d93240993123a95900cdb9da6f8b7a1 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Thu, 23 Oct 2014 22:02:26 -0400
Subject: [PATCH] Packaging system cleanup

Original commit: elastic/x-pack-elasticsearch@9a8b2b71588b9d3326923b66c4c8883f68f1230a
---
 pom.xml                                 | 17 ++++++++++++-----
 src/main/resources/es-plugin.properties |  3 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d1871624a16..1151ad1fb1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,19 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-license</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.sonatype.oss</groupId>
+        <artifactId>oss-parent</artifactId>
+        <version>7</version>
+    </parent>
 
     <properties>
         <elasticsearch.version>1.4.0-SNAPSHOT</elasticsearch.version>
         <lucene.version>4.10.1</lucene.version>
+        <!-- TODO: do we want to always enforce non-default keys -->
         <keys.path>${basedir}/src/test/resources</keys.path>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
@@ -137,7 +143,7 @@
         <resources>
             <resource>
                 <directory>${keys.path}</directory>
-                <filtering>true</filtering>
+                <filtering>false</filtering>
                 <includes>
                     <include>public.key</include>
                 </includes>
@@ -241,7 +247,7 @@
                         </configuration>
                     </execution>
                     <!-- TODO: do we want to always enforce non-default keys -->
-                    <!-- execution>
+                    <execution>
                         <id>enforce-property</id>
                         <goals>
                             <goal>enforce</goal>
@@ -255,7 +261,7 @@
                             </rules>
                             <fail>true</fail>
                         </configuration>
-                    </execution -->
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -288,6 +294,7 @@
                                 <!-- exclude public key -->
                                 <exclude>public.key</exclude>
                                 <!-- exclude plugin-related classes -->
+                                <exclude>es-plugin.properties</exclude>
                                 <exclude>org/elasticsearch/license/plugin/**/*</exclude>
                             </excludes>
                         </configuration>
diff --git a/src/main/resources/es-plugin.properties b/src/main/resources/es-plugin.properties
index 4c64a9302c6..c3e279e70bf 100644
--- a/src/main/resources/es-plugin.properties
+++ b/src/main/resources/es-plugin.properties
@@ -1 +1,2 @@
-plugin=org.elasticsearch.license.plugin.LicensePlugin
\ No newline at end of file
+plugin=org.elasticsearch.license.plugin.LicensePlugin
+version=${project.version}