[Smartfrog-checkins] SF.net SVN: smartfrog:[8892] trunk/core/smartfrog

[<ju...@us...>]

Revision: 8892
          http://sourceforge.net/p/smartfrog/svn/8892
Author:   julgui
Date:     2017-05-15 21:22:37 +0000 (Mon, 15 May 2017)
Log Message:
-----------
Automation package has dependencies with RabitMQ and needs to be moved from Services to Components - Temp exclusion from core JavaC task.

Modified Paths:
--------------
    trunk/core/smartfrog/build.xml
    trunk/core/smartfrog/ivy.xml
    trunk/core/smartfrog/sf-build-version.properties

Modified: trunk/core/smartfrog/build.xml
===================================================================
--- trunk/core/smartfrog/build.xml	2017-05-10 23:27:14 UTC (rev 8891)
+++ trunk/core/smartfrog/build.xml	2017-05-15 21:22:37 UTC (rev 8892)
@@ -193,11 +193,11 @@
   <property name="javac.java.version" value="1.5"/>
   <property name="build.compiler" value="modern"/>
   <property name="javac.compiler" value="${build.compiler}"/>
-  <property name="javac.max.memory" value="192m" />
+  <property name="javac.max.memory" value="1024m" />
     
   <!--use the forking compiler with tuned memory use and profiling diagnostics-->
   <property name="rmic.compiler" value="forking"/>
-  <property name="rmic.max.memory" value="512m" />
+  <property name="rmic.max.memory" value="1024m" />
   <property name="rmic.forking.commandline.extras" value="" />
   <property name="rmic.forking.commandline" 
     value="-J-Xmx${rmic.max.memory} ${rmic.forking.commandline.extras}"/>
@@ -366,6 +366,7 @@
   <!-- =================================================================== -->
   <target name="compile-source" depends="initbuild,createParser" description="Compiles the source code">
     <!-- Compile the java code -->
+	<!--  @todo Automation package has dependencies with RabitMQ and needs to be moved from Services to Components -->
     <echo level="verbose">${javac.java.version}
       build.compiler=${build.compiler}
       javac.compiler=${javac.compiler}</echo>
@@ -372,6 +373,7 @@
     <javac compiler="${javac.compiler}" 
       srcdir="${src.dir}"
       includes="**/*.java" 
+	  excludes="org/smartfrog/services/automation/**"   
       destdir="${build.classes.dir}"
       debug="${javac.debug.mode}"
       debuglevel="${javac.debug.level}"

Modified: trunk/core/smartfrog/ivy.xml
===================================================================
--- trunk/core/smartfrog/ivy.xml	2017-05-10 23:27:14 UTC (rev 8891)
+++ trunk/core/smartfrog/ivy.xml	2017-05-15 21:22:37 UTC (rev 8892)
@@ -54,7 +54,13 @@
   <dependencies>
     <!--javacc is used for the javacc task-->
     <!-- this has been disabled so that the core always builds, even if the network is missing-->
-<!--    <dependency org="net.java.dev.javacc" name="javacc" rev="3.2"
-        conf="javacc->default"/>-->
+	<!--
+    <dependency org="net.java.dev.javacc" name="javacc" rev="3.2"
+        conf="javacc->default"/>
+	-->
+	<!-- 	
+    <dependency org="com.rabbitmq" name="amqp-client" rev="2.4.1"	
+        conf="services->default"/>
+	-->	
   </dependencies>
 </ivy-module>

Modified: trunk/core/smartfrog/sf-build-version.properties
===================================================================
--- trunk/core/smartfrog/sf-build-version.properties	2017-05-10 23:27:14 UTC (rev 8891)
+++ trunk/core/smartfrog/sf-build-version.properties	2017-05-15 21:22:37 UTC (rev 8892)
@@ -1,7 +1,7 @@
 # SmartFrog release properties used during build process
 sf.majorRelease=3
 sf.minorRelease=18
-sf.build=017
+sf.build=019
 #sf.status=
 sf.status=dev
 sf.full.version=${sf.majorRelease}.${sf.minorRelease}.${sf.build}${sf.status}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.