felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject svn commit: r1689855 - in /felix/trunk/connect: pom.xml src/main/java/org/apache/felix/connect/PojoSR.java src/main/java/org/apache/felix/connect/URLRevision.java
Date Wed, 08 Jul 2015 12:17:29 GMT
Author: pauls
Date: Wed Jul  8 12:17:28 2015
New Revision: 1689855

URL: http://svn.apache.org/r1689855
Log:
Add maven animal sniffer plugin and fix refs to > Java5 (FELIX-4952).

Modified:
    felix/trunk/connect/pom.xml
    felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java
    felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java

Modified: felix/trunk/connect/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/connect/pom.xml?rev=1689855&r1=1689854&r2=1689855&view=diff
==============================================================================
--- felix/trunk/connect/pom.xml (original)
+++ felix/trunk/connect/pom.xml Wed Jul  8 12:17:28 2015
@@ -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>

Modified: felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java?rev=1689855&r1=1689854&r2=1689855&view=diff
==============================================================================
--- felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/PojoSR.java Wed Jul  8 12:17:28
2015
@@ -104,7 +104,7 @@ public class PojoSR implements PojoServi
             @Override
             public Enumeration<String> getEntries()
             {
-                return Collections.emptyEnumeration();
+                return Collections.enumeration(Collections.EMPTY_LIST);
             }
 
             @Override

Modified: felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java
URL: http://svn.apache.org/viewvc/felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java?rev=1689855&r1=1689854&r2=1689855&view=diff
==============================================================================
--- felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java (original)
+++ felix/trunk/connect/src/main/java/org/apache/felix/connect/URLRevision.java Wed Jul  8
12:17:28 2015
@@ -50,7 +50,7 @@ class URLRevision implements Revision
     @Override
     public Enumeration<String> getEntries()
     {
-        return Collections.emptyEnumeration();
+        return Collections.enumeration(Collections.EMPTY_LIST);
     }
 
     @Override
@@ -68,4 +68,4 @@ class URLRevision implements Revision
             return null;
         }
     }
-}
\ No newline at end of file
+}



Mime
View raw message