Merge pull request #374 from jitsi/move-version

Move version

Author: bgrozev

pom.xml

@@ -17,7 +17,7 @@
     <jetty.version>9.4.15.v20190215</jetty.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <smack.version>4.2.4-47d17fc</smack.version>
-    <jitsi-desktop.version>2.13.3ee5751</jitsi-desktop.version>
+    <jitsi-desktop.version>2.13.cb5485e</jitsi-desktop.version>
     <slf4j.version>1.7.26</slf4j.version>
   </properties>
 
@@ -98,7 +98,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jicoco</artifactId>
-      <version>1.1-20190509.130302-15</version>
+      <version>1.1-1-ge7184ab</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -135,11 +135,6 @@
       <artifactId>jitsi-protocol-media</artifactId>
       <version>${jitsi-desktop.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>jitsi-ui-service</artifactId>
-      <version>${jitsi-desktop.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-util</artifactId>
@@ -148,12 +143,12 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-utils</artifactId>
-      <version>1.0-20190723.110846-12</version>
+      <version>1.0-1-gaca0e20</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-xmpp-extensions</artifactId>
-      <version>1.0-20190613.110850-6</version>
+      <version>1.0-0-gf132d05 </version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

src/main/java/org/jitsi/jicofo/FocusManager.java

@@ -19,11 +19,11 @@
 
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.protocol.event.*;
-import net.java.sip.communicator.service.shutdown.*;
 import net.java.sip.communicator.util.*;
 
 import org.jitsi.jicofo.event.*;
 import org.jitsi.jicofo.util.*;
+import org.jitsi.meet.*;
 import org.jitsi.service.configuration.*;
 import org.jitsi.eventadmin.*;
 import org.jitsi.utils.logging.Logger;
@@ -599,8 +599,8 @@ private void maybeDoShutdown()
                 // multiple times.
                 ShutdownService shutdownService
                     = ServiceUtils.getService(
-                    FocusBundleActivator.bundleContext,
-                    ShutdownService.class);
+                        FocusBundleActivator.bundleContext,
+                        ShutdownService.class);
 
                 shutdownService.beginShutdown();
             }

src/main/java/org/jitsi/jicofo/VersionBroadcaster.java

@@ -17,6 +17,7 @@
  */
 package org.jitsi.jicofo;
 
+import org.jitsi.utils.version.*;
 import org.jitsi.xmpp.extensions.jitsimeet.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.util.*;
@@ -25,7 +26,6 @@
 import org.jitsi.jicofo.discovery.Version;
 import org.jitsi.jicofo.event.*;
 import org.jitsi.osgi.*;
-import org.jitsi.service.version.*;
 
 import org.jxmpp.jid.*;
 import org.osgi.framework.*;
@@ -163,7 +163,7 @@ public void handleEvent(Event event)
         }
 
         // Conference focus
-        org.jitsi.service.version.Version jicofoVersion
+        org.jitsi.utils.version.Version jicofoVersion
             = versionService.getCurrentVersion();
         versionsExtension.addComponentVersion(
                 ComponentVersionsExtension.COMPONENT_FOCUS,

src/main/java/org/jitsi/jicofo/version/CurrentVersionImpl.java

@@ -15,15 +15,18 @@
  */
 package org.jitsi.jicofo.version;
 
-import org.jitsi.version.*;
+import org.jitsi.utils.version.*;
 
 /**
- * A static implementation of the {@link CurrentVersion} interface for Jicofo
+ * Keeps constants for the application version.
+ *
+ * Note that the constants are modified at build time, so changes to this file
+ * must be synchronized with the build system.
  *
  * @author Pawel Domas
+ * @author Boris Grozev
  */
 public class CurrentVersionImpl
-    implements CurrentVersion
 {
     /**
      * The version major of the current application version. In an example
@@ -51,48 +54,11 @@ public class CurrentVersionImpl
      */
     public static final String NIGHTLY_BUILD_ID = "build.SVN";
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getMajorVersion()
-    {
-        return VERSION_MAJOR;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getMinorVersion()
-    {
-        return VERSION_MINOR;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getNightlyBuildID()
-    {
-        return NIGHTLY_BUILD_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getPreReleaseID()
-    {
-        return PRE_RELEASE_ID;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String getDefaultAppName()
-    {
-        return "JiCoFo";
-    }
+    static final Version VERSION
+        = new VersionImpl(
+                "JiCoFo",
+                VERSION_MAJOR,
+                VERSION_MINOR,
+                NIGHTLY_BUILD_ID,
+                PRE_RELEASE_ID);
 }

src/main/java/org/jitsi/jicofo/version/VersionActivator.java

@@ -15,6 +15,7 @@
  */
 package org.jitsi.jicofo.version;
 
+import org.jitsi.utils.version.*;
 import org.jitsi.version.*;
 
 /**
@@ -26,19 +27,12 @@
 public class VersionActivator
     extends AbstractVersionActivator
 {
-    /**
-     * The {@code CurrentVersionImpl} instance describing the current version
-     * of Jicofo.
-     */
-    private static final CurrentVersionImpl CURRENT_VERSION
-        = new CurrentVersionImpl();
-
     /**
      * {@inheritDoc}
      */
     @Override
-    protected CurrentVersion getCurrentVersion()
+    protected Version getCurrentVersion()
     {
-        return CURRENT_VERSION;
+        return CurrentVersionImpl.VERSION;
     }
 }

src/test/java/org/jitsi/jicofo/ShutdownTest.java

@@ -20,12 +20,11 @@
 import mock.*;
 import mock.util.*;
 
+import org.jitsi.meet.*;
 import org.jitsi.xmpp.extensions.colibri.*;
-import net.java.sip.communicator.service.shutdown.*;
 
 import org.jitsi.xmpp.extensions.jitsimeet.*;
 import org.jitsi.jicofo.xmpp.*;
-import org.jitsi.utils.*;
 import org.jitsi.xmpp.util.*;
 
 import org.junit.*;