release 2.0 preparation: version numbers updated
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 25 Dec 2015 13:11:43 +0000 (15:11 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 25 Dec 2015 13:11:43 +0000 (15:11 +0200)
28 files changed:
android/src/agent/res/values/build_number.xml
android/src/console/res/values/build_number.xml
build/build_number
include/build.h
include/netxms-version.h
src/agent/install/nxagent-x64.iss
src/agent/install/nxagent.iss
src/agent/install/setup.iss
src/agent/subagents/java/java/pom.xml
src/agent/subagents/ubntlw/pom.xml
src/install/windows/netxms-minimal.iss
src/install/windows/netxms-x64-minimal.iss
src/install/windows/netxms-x64.iss
src/install/windows/netxms.iss
src/install/windows/setup-webui.iss
src/install/windows/setup.iss
src/install/windows/webui-x64.iss
src/install/windows/webui.iss
src/java/build/set_build_number.cmd
src/java/build/set_build_number.sh
src/java/client/mobile-agent/pom.xml
src/java/client/netxms-base/pom.xml
src/java/client/netxms-base/src/main/java/org/netxms/base/BuildNumber.java
src/java/client/netxms-base/src/main/java/org/netxms/base/NXCommon.java
src/java/client/netxms-client/pom.xml
src/java/netxms-jira-connector/pom.xml
src/java/nxreporting/pom.xml
src/java/nxshell/pom.xml

index b764e10..bc55dfe 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-       <string name="build_number">8057</string>
+       <string name="build_number">8058</string>
 </resources>
index b764e10..bc55dfe 100644 (file)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-       <string name="build_number">8057</string>
+       <string name="build_number">8058</string>
 </resources>
index 5048ea8..258bfeb 100644 (file)
@@ -1 +1 @@
-8057
+8058
index c0e24f3..28d0b7e 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef __build_h
 #define __build_h
-#define NETXMS_VERSION_BUILD 8057
-#define NETXMS_VERSION_BUILD_STRING _T("8057")
+#define NETXMS_VERSION_BUILD 8058
+#define NETXMS_VERSION_BUILD_STRING _T("8058")
 #endif
index 9c9850b..e9ce04e 100644 (file)
@@ -31,8 +31,8 @@
  */
 #define NETXMS_VERSION_MAJOR        2
 #define NETXMS_VERSION_MINOR        0
-#define NETXMS_VERSION_STRING       _T("2.0-RC2")
-#define NETXMS_VERSION_STRING_A     "2.0-RC2"
+#define NETXMS_VERSION_STRING       _T("2.0")
+#define NETXMS_VERSION_STRING_A     "2.0"
 
 #ifdef UNICODE
 #define IS_UNICODE_BUILD_STRING     _T(" (UNICODE)")
index da2c92b..fca32ce 100644 (file)
@@ -3,7 +3,7 @@
 
 [Setup]
 #include "setup.iss"
-OutputBaseFilename=nxagent-2.0-RC2-8057-x64
+OutputBaseFilename=nxagent-2.0
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index f137572..81bf695 100644 (file)
@@ -3,7 +3,7 @@
 
 [Setup]
 #include "setup.iss"
-OutputBaseFilename=nxagent-2.0-RC2
+OutputBaseFilename=nxagent-2.0
 
 [Files]
 Source: "..\..\..\Release\libnetxms.dll"; DestDir: "{app}\bin"; BeforeInstall: StopService; Flags: ignoreversion
index a4a818c..9376eca 100644 (file)
@@ -1,6 +1,6 @@
 AppName=NetXMS Agent
-AppVerName=NetXMS Agent 2.0-RC2-8057
-AppVersion=2.0-RC2-8057
+AppVerName=NetXMS Agent 2.0
+AppVersion=2.0
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org
index cfe1311..8aad65b 100644 (file)
@@ -4,7 +4,7 @@
   <groupId>org.netxms</groupId>
   <artifactId>netxms-agent</artifactId>
   <packaging>jar</packaging>
-  <version>2.0-RC2</version>
+  <version>2.0</version>
   <name>NetXMS Java Agent</name>
   <url>http://www.netxms.org</url>
 
index 8541c0c..7a3ff70 100644 (file)
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.rfelements</groupId>
     <artifactId>ubntlw</artifactId>
-    <version>1.0</version>
+    <version>2.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.netxms</groupId>
             <artifactId>netxms-agent</artifactId>
-            <version>2.0-RC2</version>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
index e26692d..c6b6de1 100644 (file)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #include "setup.iss"
-OutputBaseFilename=netxms-2.0-RC2-minimal
+OutputBaseFilename=netxms-2.0-minimal
 
 [Components]
 Name: "base"; Description: "Base Files"; Types: full compact custom; Flags: fixed
index 33cee2b..eb82233 100644 (file)
@@ -1,7 +1,7 @@
 ; Installation script for NetXMS Server / Windows x64
 
 #include "setup.iss"
-OutputBaseFilename=netxms-2.0-RC2-x64-minimal
+OutputBaseFilename=netxms-2.0-x64-minimal
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index 6461c70..4491f63 100644 (file)
@@ -1,7 +1,7 @@
 ; Installation script for NetXMS Server / Windows x64
 
 #include "setup.iss"
-OutputBaseFilename=netxms-2.0-RC2-x64
+OutputBaseFilename=netxms-2.0-x64
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index 433875b..fa439fc 100644 (file)
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #include "setup.iss"
-OutputBaseFilename=netxms-2.0-RC2
+OutputBaseFilename=netxms-2.0
 
 [Components]
 Name: "base"; Description: "Base Files"; Types: full compact custom; Flags: fixed
index 6454b22..1d69795 100644 (file)
@@ -1,7 +1,7 @@
 [Setup]
 AppName=NetXMS WebUI
-AppVerName=NetXMS WebUI 2.0-RC2
-AppVersion=2.0-RC2
+AppVerName=NetXMS WebUI 2.0
+AppVersion=2.0
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org
index 71e037a..da4640c 100644 (file)
@@ -1,7 +1,7 @@
 [Setup]
 AppName=NetXMS
-AppVerName=NetXMS 2.0-RC2
-AppVersion=2.0-RC2
+AppVerName=NetXMS 2.0
+AppVersion=2.0
 AppPublisher=Raden Solutions
 AppPublisherURL=http://www.radensolutions.com
 AppSupportURL=http://www.netxms.org
index 97bae5a..dbf2362 100644 (file)
@@ -2,7 +2,7 @@
 
 #include "setup-webui.iss"
 
-OutputBaseFilename=netxms-webui-2.0-RC2-x64
+OutputBaseFilename=netxms-webui-2.0-x64
 ArchitecturesInstallIn64BitMode=x64
 ArchitecturesAllowed=x64
 
index 01c9b1a..fabf4f7 100644 (file)
@@ -1,7 +1,7 @@
 ; Installation script for NetXMS WebUI / Windows
 
 #include "setup-webui.iss"
-OutputBaseFilename=netxms-webui-2.0-RC2
+OutputBaseFilename=netxms-webui-2.0
 
 [Files]
 Source: ..\files\windows\x86\prunsrv.exe; DestDir: "{app}\WebUI"; BeforeInstall: StopAllServices; Flags: ignoreversion; Components: webui
index 5b5ee57..640a10b 100644 (file)
@@ -5,7 +5,7 @@
        <groupId>org.netxms</groupId>
        <artifactId>netxms-mobile-agent</artifactId>
        <packaging>jar</packaging>
-       <version>2.0-SNAPSHOT</version>
+       <version>2.0</version>
        <name>NetXMS Mobile Agent Connector</name>
        <url>http://www.netxms.org</url>
        
index d49b5e5..c647a42 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.netxms</groupId>
   <artifactId>netxms-base</artifactId>
   <packaging>bundle</packaging>
-  <version>2.0-SNAPSHOT</version>
+  <version>2.0</version>
   <name>netxms-base</name>
   <description>NetXMS base classes and commonly used utility code</description>
   <url>http://www.netxms.org</url>
index 8b2cec2..9e2e5fa 100644 (file)
@@ -1,5 +1,5 @@
 package org.netxms.base;
 public final class BuildNumber {
-   public static final String TEXT = "8057";
-   public static final int NUMBER = 8057;
+   public static final String TEXT = "8058";
+   public static final int NUMBER = 8058;
 }
index 07858c0..6e22b3e 100644 (file)
@@ -26,7 +26,7 @@ import java.util.UUID;
 public final class NXCommon
 {
        // Version information
-       public static final String VERSION = "2.0-RC2";
+       public static final String VERSION = "2.0";
        
        public static final UUID EMPTY_GUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
 }
index 41455f6..472abbe 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.netxms</groupId>
   <artifactId>netxms-client</artifactId>
   <packaging>bundle</packaging>
-  <version>2.0-SNAPSHOT</version>
+  <version>2.0</version>
   <name>netxms-client</name>
   <description>NetXMS client library - complete JAVA API</description>
   <url>http://www.netxms.org</url>
index d74ee28..6b62dac 100644 (file)
@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.radensolutions.jira</groupId>
     <artifactId>netxms-connector</artifactId>
-    <version>2.0-RC1</version>
+    <version>2.0</version>
 
     <organization>
         <name>Raden Solutions</name>
index 32c204b..ed1373a 100644 (file)
@@ -6,7 +6,7 @@
 
     <groupId>org.netxms</groupId>
     <artifactId>reporting-server</artifactId>
-    <version>2.0-RC2</version>
+    <version>2.0</version>
     <name>NetXMS reporting server</name>
     <description>JasperReports-based integration for NetXMS</description>
     <url>http://www.netxms.org</url>
index bea4f52..4f1b57d 100644 (file)
@@ -4,7 +4,7 @@
 
     <groupId>org.netxms</groupId>
     <artifactId>nxshell</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.0</version>
     <packaging>jar</packaging>
 
     <name>nxshell</name>