61 lines
4.1 KiB
Diff
61 lines
4.1 KiB
Diff
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
|
|
index ae8d6c88..197e104d 100644
|
|
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
|
|
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java
|
|
@@ -1,5 +1,5 @@
|
|
/*******************************************************************************
|
|
- * Copyright (c) 2011 SAP AG and others.
|
|
+ * Copyright (c) 2011, 2018 SAP AG and others.
|
|
* All rights reserved. This program and the accompanying materials
|
|
* are made available under the terms of the Eclipse Public License v1.0
|
|
* which accompanies this distribution, and is available at
|
|
@@ -29,7 +29,7 @@ public class FileLockServiceImpl implements FileLockService {
|
|
private Location anyLocation;
|
|
|
|
public FileLockServiceImpl() {
|
|
- anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>()),
|
|
+ anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(new HashMap<String, String>(), new HashMap<Throwable, Integer>()),
|
|
new EquinoxContainer(null), new AtomicBoolean(false));
|
|
}
|
|
|
|
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EquinoxResolver.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EquinoxResolver.java
|
|
index 941a84b9..b072823c 100644
|
|
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EquinoxResolver.java
|
|
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EquinoxResolver.java
|
|
@@ -1,5 +1,5 @@
|
|
/*******************************************************************************
|
|
- * Copyright (c) 2008, 2013 Sonatype Inc. and others.
|
|
+ * Copyright (c) 2008, 2018 Sonatype Inc. and others.
|
|
* All rights reserved. This program and the accompanying materials
|
|
* are made available under the terms of the Eclipse Public License v1.0
|
|
* which accompanies this distribution, and is available at
|
|
@@ -276,6 +276,7 @@ public class EquinoxResolver {
|
|
systemBundleManifest.put(Constants.BUNDLE_SYMBOLICNAME, SYSTEM_BUNDLE_SYMBOLIC_NAME);
|
|
systemBundleManifest.put(Constants.BUNDLE_VERSION, "0.0.0");
|
|
systemBundleManifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
|
|
+ systemBundleManifest.put(StateImpl.Eclipse_JREBUNDLE, "true");
|
|
if (systemPackages != null && systemPackages.trim().length() > 0) {
|
|
systemBundleManifest.put(Constants.EXPORT_PACKAGE, systemPackages);
|
|
} else {
|
|
diff --git a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/EquinoxResolverTest.java b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/EquinoxResolverTest.java
|
|
index e062e0b7..56462e8c 100644
|
|
--- a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/EquinoxResolverTest.java
|
|
+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/EquinoxResolverTest.java
|
|
@@ -1,5 +1,5 @@
|
|
/*******************************************************************************
|
|
- * Copyright (c) 2012 Sonatype Inc. and others.
|
|
+ * Copyright (c) 2012, 2018 Sonatype Inc. and others.
|
|
* All rights reserved. This program and the accompanying materials
|
|
* are made available under the terms of the Eclipse Public License v1.0
|
|
* which accompanies this distribution, and is available at
|
|
@@ -68,6 +68,8 @@ public class EquinoxResolverTest extends AbstractTychoMojoTestCase {
|
|
.getFullSpecification();
|
|
assertEquals("CDC-1.0/Foundation-1.0", ee.getProfileName());
|
|
Properties platformProperties = subject.getPlatformProperties(projects.get(2), ee);
|
|
- assertEquals("javax.microedition.io", platformProperties.get(Constants.FRAMEWORK_SYSTEMPACKAGES));
|
|
+ assertEquals(
|
|
+ "java.io,java.lang,java.lang.ref,java.lang.reflect,java.math,java.net,java.security,java.security.acl,java.security.cert,java.security.interfaces,java.security.spec,java.text,java.text.resources,java.util,java.util.jar,java.util.zip,javax.microedition.io",
|
|
+ platformProperties.get(Constants.FRAMEWORK_SYSTEMPACKAGES));
|
|
}
|
|
}
|