Build against 2.4 branch in Travis

cvtienhoven · Jan 26, 2018 · aad988d · aad988d
1 parent 8b3e313
commit aad988d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ addons:
 before_install:
 - sed -i.bak -e 's|https://nexus.codehaus.org/snapshots/|https://oss.sonatype.org/content/repositories/codehaus-snapshots/|g'
   ~/.m2/settings.xml
-- git clone --depth=50 --branch=2.3 https://github.com/Graylog2/graylog2-server.git  /home/travis/build/cvtienhoven/graylog2-server
-- cd /home/travis/build/cvtienhoven/graylog2-server; git checkout tags/2.3.0-rc.1; mvn install -DskipTests=true -Dmaven.javadoc.skip=true
+- git clone --depth=50 --branch=2.4 https://github.com/Graylog2/graylog2-server.git  /home/travis/build/cvtienhoven/graylog2-server
+- cd /home/travis/build/cvtienhoven/graylog2-server; git checkout tags/2.4.3; mvn install -DskipTests=true -Dmaven.javadoc.skip=true
 - cd /home/travis/build/cvtienhoven/graylog-plugin-aggregates
 - echo "finished before_install"
 - pwd

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>org.graylog.plugins.aggregates</groupId>
     <artifactId>graylog-plugin-aggregates</artifactId>
-    <version>2.2.1</version>
+    <version>2.2.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -37,7 +37,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <graylog.version>2.3.0-rc.1</graylog.version>
+        <graylog.version>2.4.3</graylog.version>
         <graylog.plugin-dir>/usr/share/graylog-server/plugin</graylog.plugin-dir>
     </properties>
 

diff --git a/src/main/java/org/graylog/plugins/aggregates/AggregatesMetaData.java b/src/main/java/org/graylog/plugins/aggregates/AggregatesMetaData.java
@@ -34,7 +34,7 @@ public URI getURL() {
 
     @Override
     public Version getVersion() {
-        return new Version(2, 2, 1);
+        return new Version(2, 2, 2);
     }
 
     @Override

diff --git a/src/web/aggregates/AggregatesConfig.jsx b/src/web/aggregates/AggregatesConfig.jsx
@@ -112,8 +112,7 @@ const AggregatesConfig = React.createClass({
             <Input id="purge-history-checkbox"
                    type="checkbox"
                    ref="purgeHistory"
-                   label="Purge historic hits beyond the either retention period or the longest report interval (automatically determined).
-                          Recommended to leave enabled to prevent MongoDB filling up."
+                   label="Purge historic hits beyond the either retention period or the longest report interval (automatically determined). Recommended to leave enabled to prevent MongoDB filling up."
                    name="purgeHistory"
                    checked={this.state.config.purgeHistory}
                    onChange={this._onCheckboxClick('purgeHistory', 'purgeHistory')}/>