]> gerrit.simantics Code Review - simantics/platform.git/commitdiff
Merge "(refs #7178) Validator for build.properties"
authorHannu Niemistö <hannu.niemisto@semantum.fi>
Thu, 4 May 2017 13:57:22 +0000 (16:57 +0300)
committerGerrit Code Review <gerrit2@www.simantics.org>
Thu, 4 May 2017 13:57:22 +0000 (16:57 +0300)
bundles/org.simantics.datatypes/build.properties
bundles/org.simantics.debug.graphical/build.properties
bundles/org.simantics.scl.compiler/build.properties
bundles/org.simantics.tests.modelled.ui/build.properties
bundles/org.simantics.views/adapters.xml [deleted file]
bundles/pom.xml

index 3d44016b3cc4bb412b14abcbf9c377ed75d61b02..85d0023b2c514c2e14b710554ec416df0a286b2b 100644 (file)
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               scl/
+               scl/,\
+               adapters.xml
index 79785acaeea2f69bbe4b5e556221958fef4b9f55..9d29fa343c7070c9ece63fdd8f4187a34ec4448b 100644 (file)
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                icons/,\
-               plugin.xml
+               plugin.xml,\
+               scl/
index 55856a03e90fdc9712885feb95cf76bd983aa8a7..b7f9238d647c94be05c2d121697ad202f0a1b20d 100644 (file)
@@ -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/
index 865f3dc3313c89e983f19cbd821ba51b2532249e..3155a9ae10f92e833a7fac84b51393ac1f3c62b1 100644 (file)
@@ -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 (file)
index fe43beb..0000000
+++ /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>
index ea1d0334c648722e1b0aac94c36efc32b1583d02..2df2507f771856901c27117fecaf107b56e5c114 100644 (file)
@@ -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>