Add maven animal sniffer plugin and fix refs to > Java5 (FELIX-4952).
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1689855 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/connect/pom.xml b/connect/pom.xml
index 4f073cc..ba76c0a 100644
--- a/connect/pom.xml
+++ b/connect/pom.xml
@@ -95,11 +95,32 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <target>1.6</target>
- <source>1.6</source>
+ <target>1.5</target>
+ <source>1.5</source>
</configuration>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>check-java-version</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java15</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.1.2</version>
@@ -117,6 +138,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ </configuration>
<executions>
<execution>
<id>attach-javadoc</id>
diff --git a/connect/src/main/java/org/apache/felix/connect/PojoSR.java b/connect/src/main/java/org/apache/felix/connect/PojoSR.java
index aea9b92..7f571f4 100644
--- a/connect/src/main/java/org/apache/felix/connect/PojoSR.java
+++ b/connect/src/main/java/org/apache/felix/connect/PojoSR.java
@@ -104,7 +104,7 @@
@Override
public Enumeration<String> getEntries()
{
- return Collections.emptyEnumeration();
+ return Collections.enumeration(Collections.EMPTY_LIST);
}
@Override
diff --git a/connect/src/main/java/org/apache/felix/connect/URLRevision.java b/connect/src/main/java/org/apache/felix/connect/URLRevision.java
index 4cf45cb..a084d25 100644
--- a/connect/src/main/java/org/apache/felix/connect/URLRevision.java
+++ b/connect/src/main/java/org/apache/felix/connect/URLRevision.java
@@ -50,7 +50,7 @@
@Override
public Enumeration<String> getEntries()
{
- return Collections.emptyEnumeration();
+ return Collections.enumeration(Collections.EMPTY_LIST);
}
@Override
@@ -68,4 +68,4 @@
return null;
}
}
-}
\ No newline at end of file
+}