Author: reschke
Date: Fri Jul 27 08:41:24 2018
New Revision: 1836793
URL: http://svn.apache.org/viewvc?rev=1836793&view=rev
Log:
OAK-7414: oak-it-osgi fails on Java 10 (ported to 1.8)
upgrade felix.framework, use forked pax-exam-container, tune VM parameters
Thanks to Karl Pauls for the changes!
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-it-osgi/pom.xml
jackrabbit/oak/branches/1.8/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 27 08:41:24 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828439,1828529,1828948,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833833,1834610,1834648-1834649
,1834681,1834823,1834857-1834858,1835060,1835780
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827977,1828439,1828529,1828948,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830347,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833833,1834610,1834648
-1834649,1834681,1834823,1834857-1834858,1835060,1835780
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-it-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it-osgi/pom.xml?rev=1836793&r1=1836792&r2=1836793&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-it-osgi/pom.xml Fri Jul 27 08:41:24 2018
@@ -156,14 +156,14 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-native</artifactId>
+ <artifactId>pax-exam-container-forked</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.8</version>
+ <version>5.6.10</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
jackrabbit/oak/branches/1.8/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1836793&r1=1836792&r2=1836793&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it-osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Fri Jul 27 08:41:24 2018
@@ -22,9 +22,11 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperties;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
import java.io.File;
import java.io.IOException;
+import java.net.URI;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
@@ -47,6 +49,7 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Version;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
@@ -63,7 +66,29 @@ public class OSGiIT {
mavenBundle( "org.ops4j.pax.logging", "pax-logging-api",
"1.7.2" ),
frameworkProperty("repository.home").value("target"),
systemProperties(new
SystemPropertyOption("felix.fileinstall.dir").value(getConfigDir())),
- jarBundles());
+ jarBundles(),
+ jpmsOptions());
+ }
+
+ private Option jpmsOptions(){
+ DefaultCompositeOption composite = new DefaultCompositeOption();
+ if
(Version.parseVersion(System.getProperty("java.specification.version")).getMajor()
> 1){
+ if
(java.nio.file.Files.exists(java.nio.file.FileSystems.getFileSystem(URI.create("jrt:/")).getPath("modules",
"java.se.ee"))){
+ composite.add(vmOption("--add-modules=java.se.ee"));
+ }
+
composite.add(vmOption("--add-opens=java.base/jdk.internal.loader=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.lang=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.lang.invoke=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.io=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.net=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.nio=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.util=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.util.jar=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.util.regex=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/java.util.zip=ALL-UNNAMED"));
+
composite.add(vmOption("--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"));
+ }
+ return composite;
}
private String getConfigDir(){
@@ -91,7 +116,7 @@ public class OSGiIT {
Bundle.ACTIVE, bundle.getState());
}
}
-
+
@Test
public void listBundles() {
for (Bundle bundle : context.getBundles()) {
