version numberin changed
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 7 Nov 2014 18:23:36 +0000 (20:23 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 7 Nov 2014 18:23:36 +0000 (20:23 +0200)
23 files changed:
ChangeLog
configure.ac
doc/versions.txt [new file with mode: 0644]
include/netxms-version.h
src/agent/core/config.cpp
src/java/certificate-manager/pom.xml
src/java/mobile-agent/pom.xml
src/java/netxms-base/pom.xml
src/java/netxms-base/src/main/java/org/netxms/base/NXCommon.java
src/java/netxms-client-api/pom.xml
src/java/netxms-client/pom.xml
src/java/netxms-eclipse/Core/.classpath
src/java/netxms-eclipse/Core/META-INF/MANIFEST.MF
src/java/netxms-eclipse/Core/build.properties
src/java/netxms-eclipse/Dashboard/META-INF/MANIFEST.MF
src/java/netxms-eclipse/DataCollection/META-INF/MANIFEST.MF
src/java/nxreporting/pom.xml
src/java/pom.xml
webui/webapp/Core/.classpath
webui/webapp/Core/META-INF/MANIFEST.MF
webui/webapp/Core/build.properties
webui/webapp/Dashboard/META-INF/MANIFEST.MF
webui/webapp/DataCollection/META-INF/MANIFEST.MF

index 5795e11..60f95a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 *
-* 2.0-M1
+* 2.0.0.0
 *
 
 - New hook script "AcceptNewNode" (can be used as additional filter for network discovery to avoid unnecessary communications)
index 09c7984..51f8746 100644 (file)
@@ -4,7 +4,7 @@
 # Configure script
 #
 
-AC_INIT([NetXMS], [2.0-M1], [bugs@netxms.org])
+AC_INIT([NetXMS], [2.0.0.0], [bugs@netxms.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE
diff --git a/doc/versions.txt b/doc/versions.txt
new file mode 100644 (file)
index 0000000..63ea3a7
--- /dev/null
@@ -0,0 +1,17 @@
+NetXMS Versioning Scheme
+
+1.x
+
+major.minor.release
+
+
+2.x
+
+major.minor.type.release
+
+type denotes release type:
+       0       development
+       1       release candidate
+       2       stable release
+
+so first release version is 2.0.2.0
index e4f88bb..8a2663c 100644 (file)
@@ -30,8 +30,8 @@
  */
 #define NETXMS_VERSION_MAJOR        2
 #define NETXMS_VERSION_MINOR        0
-#define NETXMS_VERSION_STRING       _T("2.0-M1")
-#define NETXMS_VERSION_STRING_A     "2.0-M1"
+#define NETXMS_VERSION_STRING       _T("2.0.0.0")
+#define NETXMS_VERSION_STRING_A     "2.0.0.0"
 
 #ifdef UNICODE
 #define IS_UNICODE_BUILD_STRING     _T(" (UNICODE)")
index 6d212ac..d377c26 100644 (file)
@@ -101,6 +101,7 @@ BOOL DownloadConfig(TCHAR *pszServer)
          msg.SetVariable(VID_VERSION_MAJOR, (WORD)NETXMS_VERSION_MAJOR);
          msg.SetVariable(VID_VERSION_MINOR, (WORD)NETXMS_VERSION_MINOR);
          msg.SetVariable(VID_VERSION_RELEASE, (WORD)NETXMS_VERSION_BUILD);
+         msg.SetVariable(VID_VERSION, NETXMS_VERSION_STRING);
 
          // Send request
          pRawMsg = msg.createMessage();
index d5d779b..0f43c45 100644 (file)
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.netxms</groupId>
         <artifactId>netxms</artifactId>
-        <version>1.2.17</version>
+        <version>2.0.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
index f2e40f3..cc2502e 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.netxms</groupId>
                <artifactId>netxms</artifactId>
-               <version>1.2.17</version>
+               <version>2.0.0.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9f5a548..ed9202d 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.netxms</groupId>
                <artifactId>netxms</artifactId>
-               <version>1.2.17</version>
+               <version>2.0.0.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ff53e13..487272b 100644 (file)
@@ -26,7 +26,7 @@ import java.util.UUID;
 public final class NXCommon
 {
        // Version information
-       public static final String VERSION = "2.0.0";
+       public static final String VERSION = "2.0.0.0";
        
        public static final UUID EMPTY_GUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
 }
index 000c5a0..0d0fb58 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.netxms</groupId>
                <artifactId>netxms</artifactId>
-               <version>1.2.17</version>
+               <version>2.0.0.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9b1f958..1ac3c28 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.netxms</groupId>
                <artifactId>netxms</artifactId>
-               <version>1.2.17</version>
+               <version>2.0.0.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 7c26e33..8ca3053 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="jar/certificate-manager-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-base-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-client-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-client-api-1.2.17.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/certificate-manager-2.0.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-base-2.0.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-2.0.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-api-2.0.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="jar/simple-xml-2.6.4.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
index 5109bcc..beeabaa 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.netxms.ui.eclipse.console;singleton:=true
-Bundle-Version: 1.2.17
+Bundle-Version: 2.0.0.0
 Bundle-Activator: org.netxms.ui.eclipse.console.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
@@ -16,10 +16,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
  jar/simple-xml-2.6.4.jar,
- jar/certificate-manager-1.2.17.jar,
- jar/netxms-base-1.2.17.jar,
- jar/netxms-client-1.2.17.jar,
- jar/netxms-client-api-1.2.17.jar
+ jar/certificate-manager-2.0.0.0.jar,
+ jar/netxms-base-2.0.0.0.jar,
+ jar/netxms-client-2.0.0.0.jar,
+ jar/netxms-client-api-2.0.0.0.jar
 Export-Package: org.netxms.api.client,
  org.netxms.api.client.constants,
  org.netxms.api.client.images,
index 89f2ace..ecd9e21 100644 (file)
@@ -6,10 +6,6 @@ bin.includes = plugin.xml,\
                .,\
                plugin_customization.ini,\
                splash.bmp,\
-               jar/,\
                OSGI-INF/,\
-               jar/certificate-manager-1.2.17.jar,\
-               jar/netxms-base-1.2.17.jar,\
-               jar/netxms-client-1.2.17.jar,\
-               jar/netxms-client-api-1.2.17.jar
+               jar/
 jars.compile.order = .
index 61b9efd..e6811a8 100644 (file)
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Dashboard
 Bundle-SymbolicName: org.netxms.ui.eclipse.dashboard;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.0.0
 Bundle-Activator: org.netxms.ui.eclipse.dashboard.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.netxms.ui.eclipse.console;bundle-version="1.2.17",
+ org.netxms.ui.eclipse.console;bundle-version="2.0.0",
  org.netxms.ui.eclipse.charts;bundle-version="1.2.11",
  org.swtchart;bundle-version="0.7.9",
  org.netxms.ui.eclipse.networkmaps;bundle-version="1.2.17",
index a695cc1..7adf5b1 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Data Collection Management Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.datacollection;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.0.0
 Bundle-Activator: org.netxms.ui.eclipse.datacollection.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.netxms.ui.eclipse.objectview;bundle-version="1.2.15",
  org.netxms.ui.eclipse.snmp;bundle-version="1.2.12",
  org.netxms.ui.eclipse.nxsl;bundle-version="1.2.15",
- org.netxms.ui.eclipse.console;bundle-version="1.2.17",
+ org.netxms.ui.eclipse.console;bundle-version="2.0.0",
  org.eclipse.core.expressions;bundle-version="3.4.300",
  org.netxms.ui.eclipse.charts;bundle-version="1.2.11",
  org.eclipse.ui.forms;bundle-version="3.5.101"
index 326e1b1..f7aab70 100644 (file)
@@ -6,7 +6,7 @@
 
     <groupId>com.radensolutions</groupId>
     <artifactId>nxreporting</artifactId>
-    <version>1.2.17</version>
+    <version>2.0.0.0</version>
 
     <properties>
         <spring.version>4.1.1.RELEASE</spring.version>
index e6125d0..31a3c0d 100644 (file)
@@ -3,7 +3,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.netxms</groupId>
-  <version>1.2.17</version>
+  <version>2.0.0.0</version>
   <artifactId>netxms</artifactId>
   <packaging>pom</packaging>
   <name>NetXMS Meta-package</name>
index 7c26e33..8ca3053 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry exported="true" kind="lib" path="jar/certificate-manager-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-base-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-client-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="jar/netxms-client-api-1.2.17.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/certificate-manager-2.0.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-base-2.0.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-2.0.0.0.jar"/>
+       <classpathentry exported="true" kind="lib" path="jar/netxms-client-api-2.0.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="jar/simple-xml-2.6.4.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
index fff3b47..b247c81 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NetXMS WebUI Core
 Bundle-SymbolicName: org.netxms.webui.core; singleton:=true
-Bundle-Version: 1.2.17
+Bundle-Version: 2.0.0.0
 Bundle-Activator: org.netxms.ui.eclipse.console.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
@@ -14,10 +14,10 @@ Import-Package: javax.servlet;version="2.5.0",
  javax.servlet.http;version="2.5.0"
 Bundle-ClassPath: .,
  jar/simple-xml-2.6.4.jar,
- jar/certificate-manager-1.2.17.jar,
- jar/netxms-base-1.2.17.jar,
- jar/netxms-client-1.2.17.jar,
- jar/netxms-client-api-1.2.17.jar
+ jar/certificate-manager-2.0.0.0.jar,
+ jar/netxms-base-2.0.0.0.jar,
+ jar/netxms-client-2.0.0.0.jar,
+ jar/netxms-client-api-2.0.0.0.jar
 Export-Package: org.netxms.api.client,
  org.netxms.api.client.constants,
  org.netxms.api.client.images,
index ff259d8..d0bb7cb 100644 (file)
@@ -8,7 +8,7 @@ bin.includes = plugin.xml,\
                theme/,\
                js/,\
                jar/,\
-               jar/certificate-manager-1.2.17.jar,\
-               jar/netxms-base-1.2.17.jar,\
-               jar/netxms-client-1.2.17.jar,\
-               jar/netxms-client-api-1.2.17.jar
+               jar/certificate-manager-2.0.0.0.jar,\
+               jar/netxms-base-2.0.0.0.jar,\
+               jar/netxms-client-2.0.0.0.jar,\
+               jar/netxms-client-api-2.0.0.0.jar
index 5752fa5..c2efa5c 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NXMC Dashboard
 Bundle-SymbolicName: org.netxms.ui.eclipse.dashboard;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.0.0
 Bundle-Activator: org.netxms.ui.eclipse.dashboard.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.netxms.ui.eclipse.osm;bundle-version="1.2.10",
  org.netxms.ui.eclipse.datacollection;bundle-version="2.0.0",
  org.netxms.ui.eclipse.alarmviewer;bundle-version="1.2.17",
- org.netxms.webui.core;bundle-version="1.2.17",
+ org.netxms.webui.core;bundle-version="2.0.0",
  org.eclipse.rap.ui;bundle-version="2.3.0",
  org.netxms.ui.eclipse.networkmaps;bundle-version="1.2.16",
  org.netxms.ui.eclipse.filemanager;bundle-version="1.2.15",
index 545b4c4..ab538d7 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Data Collection Management Plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.datacollection;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.0.0
 Bundle-Activator: org.netxms.ui.eclipse.datacollection.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.15",
@@ -10,7 +10,7 @@ Require-Bundle: org.netxms.ui.eclipse.objectbrowser;bundle-version="1.2.15",
  org.netxms.ui.eclipse.snmp;bundle-version="1.2.12",
  org.netxms.ui.eclipse.nxsl;bundle-version="1.2.15",
  org.eclipse.core.expressions;bundle-version="3.4.500",
- org.netxms.webui.core;bundle-version="1.2.16",
+ org.netxms.webui.core;bundle-version="2.0.0",
  org.eclipse.rap.ui;bundle-version="2.2.0",
  org.netxms.ui.eclipse.charts;bundle-version="1.2.11",
  org.eclipse.rap.ui.forms;bundle-version="2.2.0",