You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/11/07 14:56:27 UTC
[sling-org-apache-sling-feature-apiregions] branch master updated:
Make code compatible with Java 7.
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-apiregions.git
The following commit(s) were added to refs/heads/master by this push:
new e95d845 Make code compatible with Java 7.
e95d845 is described below
commit e95d84554c96e1a3abbe59718da4165da4e6742d
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Wed Nov 7 14:56:08 2018 +0000
Make code compatible with Java 7.
---
pom.xml | 2 +-
.../org/apache/sling/feature/apiregions/impl/RegionEnforcerTest.java | 4 ++--
.../apache/sling/feature/apiregions/impl/ResolverHookImplTest.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
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>
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 @@ public class RegionEnforcerTest {
@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 @@ public class RegionEnforcerTest {
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);
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 @@ public class ResolverHookImplTest {
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);