From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Fri, 11 Nov 2016 10:41:05 +0000 (+0200)
Subject: Merge commit 'd7afa23'
X-Git-Tag: v1.25.0~53
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=36282d240b9ac295894a6705672efa11eb26e4d2;hp=c08364c64a0bb53c45c052a3e4cea8702bbd69a0

Merge commit 'd7afa23'

Conflicts:
	bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/adapter/impl/EntityInstances.java

Sync git svn branch with SVN repository r33389.

refs #6726
---

diff --git a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
index bce9a42cf..c0b1ba43a 100644
--- a/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.tests.modelled/META-INF/MANIFEST.MF
@@ -4,15 +4,10 @@ Bundle-Name: Simantics Modelled Tests
 Bundle-SymbolicName: org.simantics.tests.modelled
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.tests.modelled.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.simantics.db,
- org.simantics.db.common,
- org.simantics.tests.modelled.ontology,
+Require-Bundle: org.simantics.tests.modelled.ontology,
  org.simantics.scl.osgi,
  org.simantics,
- org.simantics.scl.compiler,
  org.junit,
- org.simantics.db.testing,
  org.simantics.modeling;bundle-version="1.1.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy