Mercurial > hg > thermostat-ng

changeset 24:e7a2adb465d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Little fix for Schema review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-September/025194.html reviewed-by: jkang
author Mario Torre <neugens.limasoftware@gmail.com>
date Thu, 28 Sep 2017 10:50:29 +0200
parents ab2706b9b1e3
children dd0992bd51aa
files common/type-system/pom.xml thermostat-ng.sh
diffstat 2 files changed, 14 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/common/type-system/pom.xml	Fri Sep 15 11:41:22 2017 -0400
+++ b/common/type-system/pom.xml	Thu Sep 28 10:50:29 2017 +0200
@@ -80,6 +80,18 @@
                     </instructions>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>generate-scr-scrdescriptor</id>
+                        <goals>
+                            <goal>scr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
--- a/thermostat-ng.sh	Fri Sep 15 11:41:22 2017 -0400
+++ b/thermostat-ng.sh	Thu Sep 28 10:50:29 2017 +0200
@@ -236,10 +236,7 @@
 }
 
 build_support_libs() {
-  for i in "${SUPPORT_LIBS_ROOTS[@]}"
-  do
-      build "$i" mvn_install
-  done
+  build "$SUPPORT_LIBS_ROOTS" mvn_install
 }
 
 build_agent() {
@@ -307,7 +304,7 @@
 AGENT_ROOT="${TOP_DIR}/agent"
 WEB_CLIENT_ROOT="${TOP_DIR}/web-client"
 GATEWAY_URL="$(get_gateway_url)"
-SUPPORT_LIBS_ROOTS="${TOP_DIR}/common"
+SUPPORT_LIBS_ROOTS="${TOP_DIR}/"
 
 DO_BUILD=${BUILD:-true}
 RUN_DATA_DIR="$TOP_DIR/data"