From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Thu, 4 May 2017 13:57:22 +0000 (+0300)
Subject: Merge "(refs #7178) Validator for build.properties"
X-Git-Tag: v1.29.0~75
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=e3f78a075fb589c0c940f6e13d92a45a39a3ac0f;hp=53062e8f34c2d2a910e4e81835c81ebafef1a374

Merge "(refs #7178) Validator for build.properties"
---

diff --git a/bundles/org.simantics.datatypes/build.properties b/bundles/org.simantics.datatypes/build.properties
index 3d44016b3..85d0023b2 100644
--- a/bundles/org.simantics.datatypes/build.properties
+++ b/bundles/org.simantics.datatypes/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               scl/
+               scl/,\
+               adapters.xml
diff --git a/bundles/org.simantics.debug.graphical/build.properties b/bundles/org.simantics.debug.graphical/build.properties
index 79785acae..9d29fa343 100644
--- a/bundles/org.simantics.debug.graphical/build.properties
+++ b/bundles/org.simantics.debug.graphical/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                icons/,\
-               plugin.xml
+               plugin.xml,\
+               scl/
diff --git a/bundles/org.simantics.scl.compiler/build.properties b/bundles/org.simantics.scl.compiler/build.properties
index 55856a03e..b7f9238d6 100644
--- a/bundles/org.simantics.scl.compiler/build.properties
+++ b/bundles/org.simantics.scl.compiler/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/org.simantics.scl.compiler.source.repository.BuiltinModuleSourceRepository.xml,\
-               OSGI-INF/org.simantics.scl.compiler.elaboration.java.LoggingModule.xml
+               OSGI-INF/org.simantics.scl.compiler.elaboration.java.LoggingModule.xml,\
+               sclTests/
diff --git a/bundles/org.simantics.tests.modelled.ui/build.properties b/bundles/org.simantics.tests.modelled.ui/build.properties
index 865f3dc33..3155a9ae1 100644
--- a/bundles/org.simantics.tests.modelled.ui/build.properties
+++ b/bundles/org.simantics.tests.modelled.ui/build.properties
@@ -3,5 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               scl/
+               scl/,\
+               adapters.xml
 src.includes = scl/
diff --git a/bundles/org.simantics.views/adapters.xml b/bundles/org.simantics.views/adapters.xml
deleted file mode 100644
index fe43beb18..000000000
--- a/bundles/org.simantics.views/adapters.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2007, 2010 Association for Decentralized Information Management
-    in Industry THTH ry.
-    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
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-        VTT Technical Research Centre of Finland - initial API and implementation
- -->
-
-<adapters>
-
-</adapters>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index ea1d0334c..2df2507f7 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -18,7 +18,7 @@
 			<plugin>
 				<groupId>org.simantics</groupId>
 				<artifactId>graph-builder-maven-plugin</artifactId>
-				<version>0.0.5</version>
+				<version>0.0.7</version>
 				<executions>
 					<execution>
 						<goals><goal>compile-graphs</goal></goals>