Author: challngr Date: Tue Jun 10 19:16:59 2014 New Revision: 1601748 URL: http://svn.apache.org/r1601748 Log: UIMA-3727 Synchronize RM and SM internal versions with release version.
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1601748&r1=1601747&r2=1601748&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java Tue Jun 10 19:16:59 2014 @@ -137,9 +137,10 @@ public class Scheduler // 1.0.1 - RM can purge non-preemptables except for Unmanaged Reservations. UIMA-3614 // 1.0.2 - vary-on, vary-off // 1.0.3 - fix bad check in recursion in NodepoolScheduler.doEvictions + // 1.1.0 - Syncnronize with release final static int rmversion_major = 1; - final static int rmversion_minor = 0; - final static int rmversion_ptf = 4; + final static int rmversion_minor = 1; + final static int rmversion_ptf = 0; final static String rmversion_string = null; boolean initialized = false; // we refuse nodeupdates until this is true Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java?rev=1601748&r1=1601747&r2=1601748&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java Tue Jun 10 19:16:59 2014 @@ -120,7 +120,8 @@ public class ServiceManagerComponent // 1.1.0 - reworked SM // 1.1.3 - added shutdown hook, pinger last-use, pinger disable autostart // 1.1.4 - dynamic mod of all registration parms. Add debug and max-init-time parms. - String version = "1.1.4"; + // 1.1.0 - resync with release, sigh. + String version = "1.1.0"; public ServiceManagerComponent(CamelContext context) {