Merge pull request #1018 from hazendaz/master

Bring back travis ci java 6 builds due to special annotations for java 7/8

Author: hazendaz

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.2.5/apache-maven-3.2.5-bin.zip

.travis.yml

@@ -5,6 +5,7 @@ jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk7
+  - openjdk6
 
 before_install:
   - echo "MAVEN_OPTS='-Dlicense.skip=true'" > ~/.mavenrc

pom.xml

@@ -391,8 +391,20 @@
                 </testExcludes>
               </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <version>2.5.4</version> <!-- For java 6, remain at older version -->
+            </plugin>
           </plugins>
         </pluginManagement>
+        <plugins>
+            <plugin>
+              <groupId>org.apache.felix</groupId>
+              <artifactId>maven-bundle-plugin</artifactId>
+              <version>2.5.4</version> <!-- For java 6, remain at older version -->
+            </plugin>
+        </plugins>
       </build>
     </profile>
     <profile>