commit e95d84554c96e1a3abbe59718da4165da4e6742d
author David Bosschaert <bosschae@adobe.com> Wed Nov 07 14:56:08 2018 +0000
committer David Bosschaert <bosschae@adobe.com> Wed Nov 07 14:56:08 2018 +0000
tree 3aec9a7673ffb91dc9732281de50a88e0305e86e
parent bf77749d0788a1fedb8d9cf7a47c68cba3e1c007

Make code compatible with Java 7.

pom.xml

diff --git a/pom.xml b/pom.xml
index e95dee4..c4c8c1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     </scm>
 
     <properties>
-        <sling.java.version>8</sling.java.version>
+        <sling.java.version>7</sling.java.version>
     </properties>
 
     <build>

src/test/java/org/apache/sling/feature/apiregions/impl/RegionEnforcerTest.java

diff --git a/src/test/java/org/apache/sling/feature/apiregions/impl/RegionEnforcerTest.java b/src/test/java/org/apache/sling/feature/apiregions/impl/RegionEnforcerTest.java
index 5d3fa22..322c3f3 100644
--- a/src/test/java/org/apache/sling/feature/apiregions/impl/RegionEnforcerTest.java
+++ b/src/test/java/org/apache/sling/feature/apiregions/impl/RegionEnforcerTest.java
@@ -55,7 +55,7 @@
 
     @Test
     public void testRegionEnforcerNoConfiguration() throws Exception {
-        RegionEnforcer re = new RegionEnforcer(new Hashtable<>(), "*");
+        RegionEnforcer re = new RegionEnforcer(new Hashtable<String, Object>(), "*");
         assertEquals(0, re.bsnVerMap.size());
         assertEquals(0, re.bundleFeatureMap.size());
         assertEquals(0, re.featureRegionMap.size());
@@ -135,7 +135,7 @@
         System.setProperty(PROPERTIES_FILE_PREFIX + REGION_PACKAGE_FILENAME,
                 getClass().getResource("/regions1.properties").getFile());
 
-        RegionEnforcer re = new RegionEnforcer(new Hashtable<>(), "*");
+        RegionEnforcer re = new RegionEnforcer(new Hashtable<String, Object>(), "*");
         assertTrue(re.bsnVerMap.size() > 0);
         assertTrue(re.bundleFeatureMap.size() > 0);
         assertTrue(re.featureRegionMap.size() > 0);

src/test/java/org/apache/sling/feature/apiregions/impl/ResolverHookImplTest.java

diff --git a/src/test/java/org/apache/sling/feature/apiregions/impl/ResolverHookImplTest.java b/src/test/java/org/apache/sling/feature/apiregions/impl/ResolverHookImplTest.java
index c27ccd4..d92935f 100644
--- a/src/test/java/org/apache/sling/feature/apiregions/impl/ResolverHookImplTest.java
+++ b/src/test/java/org/apache/sling/feature/apiregions/impl/ResolverHookImplTest.java
@@ -215,7 +215,7 @@
 
     private BundleCapability mockCapability(String pkg, long bundleID, String bsn, Version version) {
         Map<String, Object> attrs =
-                Collections.singletonMap(PackageNamespace.PACKAGE_NAMESPACE, pkg);
+                Collections.<String, Object>singletonMap(PackageNamespace.PACKAGE_NAMESPACE, pkg);
 
         Bundle bundle = Mockito.mock(Bundle.class);
         Mockito.when(bundle.getBundleId()).thenReturn(bundleID);