Switch to graylog-plugin.properties and use graylog plugin parent

Author: bernd

pom.xml

@@ -2,10 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <prerequisites>
-        <maven>3.0</maven>
+        <maven>3.1</maven>
     </prerequisites>
 
-    <groupId>org.graylog.plugins</groupId>
+    <parent>
+        <groupId>org.graylog.plugins</groupId>
+        <artifactId>graylog-plugin-parent</artifactId>
+        <version>2.3.0-rc.2-SNAPSHOT</version>
+        <relativePath>../graylog2-server/graylog-plugin-parent</relativePath>
+    </parent>
+
     <artifactId>graylog-plugin-netflow</artifactId>
     <version>0.1.2-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -26,29 +32,48 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.source.skip>true</maven.source.skip>
+        <maven.javadoc.skip>true</maven.javadoc.skip>
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.site.skip>true</maven.site.skip>
-        <graylog2.version>2.0.0</graylog2.version>
-        <graylog2.plugin-dir>/usr/share/graylog-server/plugin</graylog2.plugin-dir>
+
+        <graylog.version>2.3.0-rc.2-SNAPSHOT</graylog.version>
+        <graylog.plugin-dir>/usr/share/graylog-server/plugin</graylog.plugin-dir>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.graylog2</groupId>
             <artifactId>graylog2-server</artifactId>
-            <version>${graylog2.version}</version>
+            <version>${graylog.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.auto.value</groupId>
+            <artifactId>auto-value</artifactId>
+            <version>${auto-value.version}</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>build</directory>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -75,7 +100,7 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>2.11</version>
+                <version>${license-maven.version}</version>
                 <configuration>
                     <header>src/main/resources/templates/APACHE-2.txt</header>
                     <properties>
@@ -117,7 +142,7 @@
             <plugin>
                 <artifactId>jdeb</artifactId>
                 <groupId>org.vafer</groupId>
-                <version>1.5</version>
+                <version>${jdeb.version}</version>
                 <configuration>
                     <deb>${project.build.directory}/${project.artifactId}-${project.version}.deb</deb>
                     <dataSet>
@@ -126,7 +151,7 @@
                             <type>file</type>
                             <mapper>
                                 <type>perm</type>
-                                <prefix>${graylog2.plugin-dir}</prefix>
+                                <prefix>${graylog.plugin-dir}</prefix>
                                 <filemode>644</filemode>
                                 <user>root</user>
                                 <group>root</group>
@@ -139,7 +164,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>rpm-maven-plugin</artifactId>
-                <version>2.1.5</version>
+                <version>${rpm-maven.version}</version>
                 <configuration>
                     <group>Application/Internet</group>
                     <prefixes>
@@ -155,7 +180,7 @@
                     <defaultGroupname>root</defaultGroupname>
                     <mappings>
                         <mapping>
-                            <directory>${graylog2.plugin-dir}</directory>
+                            <directory>${graylog.plugin-dir}</directory>
                             <sources>
                                 <source>
                                     <location>${project.build.directory}/</location>

src/main/java/org/graylog/plugins/netflow/NetFlowPluginMetaData.java

@@ -25,6 +25,8 @@
 import java.util.Set;
 
 public class NetFlowPluginMetaData implements PluginMetaData {
+    private static final String PLUGIN_PROPERTIES = "org.graylog.plugins.graylog-plugin-netflow/graylog-plugin.properties";
+
     @Override
     public String getUniqueId() {
         return "org.graylog.plugins.netflow.NetFlowPlugin";
@@ -47,7 +49,7 @@ public URI getURL() {
 
     @Override
     public Version getVersion() {
-        return new Version(0, 1, 0);
+        return Version.fromPluginProperties(this.getClass(), PLUGIN_PROPERTIES, "version", Version.from(0, 0, 0, "unknown"));
     }
 
     @Override
@@ -57,7 +59,7 @@ public String getDescription() {
 
     @Override
     public Version getRequiredVersion() {
-        return new Version(2, 0, 0);
+        return Version.fromPluginProperties(this.getClass(), PLUGIN_PROPERTIES, "graylog.version", Version.CURRENT_CLASSPATH);
     }
 
     @Override

src/main/resources/org.graylog.plugins.graylog-plugin-netflow/graylog-plugin.properties

@@ -0,0 +1,12 @@
+# The plugin version
+version=${project.version}
+
+# The required Graylog server version
+graylog.version=${graylog.version}
+
+# When set to true (the default) the plugin gets a separate class loader
+# when loading the plugin. When set to false, the plugin shares a class loader
+# with other plugins that have isolated=false.
+#
+# Do not disable this unless this plugin depends on another plugin!
+isolated=true