release 2.1-M2 preparation
authorVictor Kirhenshtein <victor@netxms.org>
Fri, 6 Jan 2017 07:34:32 +0000 (09:34 +0200)
committerVictor Kirhenshtein <victor@netxms.org>
Fri, 6 Jan 2017 07:34:32 +0000 (09:34 +0200)
22 files changed:
build/build_number
configure.ac
include/build.h
include/netxms-version.h
src/java/build/pack.cmd
src/java/build/pack.sh
src/java/build/set_build_number.cmd
src/java/build/set_build_number.sh
src/java/client/META-INF/MANIFEST.MF
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-eclipse/Core/META-INF/MANIFEST.MF
src/java/netxms-eclipse/Core/plugin.xml
src/java/netxms-eclipse/Product/nxmc.product
src/java/netxms-jira-connector/pom.xml
src/java/nxreporting/pom.xml
src/java/nxshell/pom.xml
webui/webapp/Core/META-INF/MANIFEST.MF
webui/webapp/Core/nxmc.warproduct

index 9fd63aa..9862a60 100644 (file)
@@ -1 +1 @@
-9004
+9005
index 5353630..b912a86 100644 (file)
@@ -4,7 +4,7 @@
 # Configure script
 #
 
-AC_INIT([NetXMS], [2.1-M1], [bugs@netxms.org])
+AC_INIT([NetXMS], [2.1-M2], [bugs@netxms.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE
index 7832ef2..c15e99b 100644 (file)
@@ -1,5 +1,5 @@
 #ifndef __build_h
 #define __build_h
-#define NETXMS_VERSION_BUILD 9004
-#define NETXMS_VERSION_BUILD_STRING _T("9004")
+#define NETXMS_VERSION_BUILD 9005
+#define NETXMS_VERSION_BUILD_STRING _T("9005")
 #endif
index f48b314..892222d 100644 (file)
@@ -31,8 +31,8 @@
  */
 #define NETXMS_VERSION_MAJOR        2
 #define NETXMS_VERSION_MINOR        1
-#define NETXMS_VERSION_STRING       _T("2.1-M1")
-#define NETXMS_VERSION_STRING_A     "2.1-M1"
+#define NETXMS_VERSION_STRING       _T("2.1-M2")
+#define NETXMS_VERSION_STRING_A     "2.1-M2"
 
 #ifdef UNICODE
 #define IS_UNICODE_BUILD_STRING     _T(" (UNICODE)")
index 5dd7b72..505fa29 100644 (file)
@@ -1,7 +1,7 @@
 @echo off
 call set_build_number.cmd
 rem set version=2.0-RC1-%build_number%
-set version=2.1-M1
+set version=2.1-M2
 
 cd win32.win32.x86
 zip -r nxmc-%version%-win32-x86.zip nxmc
index fe785c7..2f34315 100755 (executable)
@@ -2,7 +2,7 @@
 
 . ./set_build_number.sh
 #version=2.0-RC2-$build_number
-version=2.1-M1
+version=2.1-M2
 
 cd win32.win32.x86
 zip -r nxmc-$version-win32-x86.zip nxmc
index c6a29e6..a5b03d5 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Client Library API plug-in
 Bundle-SymbolicName: org.netxms.ui.eclipse.clientlibrary;singleton:=true
-Bundle-Version: 2.1.0
+Bundle-Version: 2.1.1
 Bundle-Vendor: netxms.org
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: lib/simple-xml-2.6.4.jar,
index c82a481..6e22db2 100644 (file)
@@ -5,7 +5,7 @@
        <groupId>org.netxms</groupId>
        <artifactId>netxms-mobile-agent</artifactId>
        <packaging>jar</packaging>
-       <version>2.1-M1</version>
+       <version>2.1-M2</version>
        <name>NetXMS Mobile Agent Connector</name>
        <url>http://www.netxms.org</url>
        
index 94c0ff7..9c5897c 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.netxms</groupId>
   <artifactId>netxms-base</artifactId>
   <packaging>bundle</packaging>
-  <version>2.1-M1</version>
+  <version>2.1-M2</version>
   <name>netxms-base</name>
   <description>NetXMS base classes and commonly used utility code</description>
   <url>http://www.netxms.org</url>
index 1fd9417..8436981 100644 (file)
@@ -1,5 +1,5 @@
 package org.netxms.base;
 public final class BuildNumber {
-   public static final String TEXT = "9004";
-   public static final int NUMBER = 9004;
+   public static final String TEXT = "9005";
+   public static final int NUMBER = 9005;
 }
index fc76a32..f2af1ad 100644 (file)
@@ -26,7 +26,7 @@ import java.util.UUID;
 public final class NXCommon
 {
        // Version information
-       public static final String VERSION = "2.1-M1";
+       public static final String VERSION = "2.1-M2";
        
        public static final UUID EMPTY_GUID = UUID.fromString("00000000-0000-0000-0000-000000000000");
 }
index f94352a..674ac63 100644 (file)
@@ -5,7 +5,7 @@
   <groupId>org.netxms</groupId>
   <artifactId>netxms-client</artifactId>
   <packaging>bundle</packaging>
-  <version>2.1-M1</version>
+  <version>2.1-M2</version>
   <name>netxms-client</name>
   <description>NetXMS client library - complete JAVA API</description>
   <url>http://www.netxms.org</url>
index a1dcfe0..33de295 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: 2.1.0
+Bundle-Version: 2.1.1
 Bundle-Activator: org.netxms.ui.eclipse.console.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.ui;bundle-version="[3.8.2,4.0.0)",
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.8.2,4.0.0)",
  org.eclipse.ui.forms;bundle-version="3.5.200",
  org.eclipse.ui.console;bundle-version="3.5.100",
  org.eclipse.jface.text;bundle-version="3.8.2",
- org.netxms.ui.eclipse.clientlibrary;bundle-version="2.1.0",
+ org.netxms.ui.eclipse.clientlibrary;bundle-version="2.1.1",
  org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0",
  org.eclipse.core.expressions;bundle-version="3.4.400"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
index 1bfcd85..727ad67 100644 (file)
@@ -62,7 +62,7 @@
          </property>
          <property
                name="aboutText"
-               value="NetXMS Management Console&#x0A;&#x0A;Version 2.1-M1&#x0A;Copyright (c) 2003-2016 Raden Solutions">
+               value="NetXMS Management Console&#x0A;&#x0A;Version 2.1-M2&#x0A;Copyright (c) 2003-2017 Raden Solutions">
          </property>
          <property
                name="startupForegroundColor"
index 15fed88..8152156 100644 (file)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="%product.name" uid="org.netxms.ui.eclipse.console.product" id="org.netxms.ui.eclipse.console.product" application="org.netxms.ui.eclipse.console.application" version="2.1.0" useFeatures="false" includeLaunchers="true">
+<product name="%product.name" uid="org.netxms.ui.eclipse.console.product" id="org.netxms.ui.eclipse.console.product" application="org.netxms.ui.eclipse.console.application" version="2.1.1" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/Core/icons/about.png"/>
       <text>
          NetXMS Management Console
 
-Version 2.1-M1
-Copyright (c) 2003-2016 Raden Solutions
+Version 2.1-M2
+Copyright (c) 2003-2017 Raden Solutions
       </text>
    </aboutInfo>
 
@@ -38,6 +38,7 @@ Copyright (c) 2003-2016 Raden Solutions
       </win>
    </launcher>
 
+
    <vm>
    </vm>
 
index 2f5040d..a133996 100644 (file)
@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.radensolutions.jira</groupId>
     <artifactId>netxms-connector</artifactId>
-    <version>2.1-M1</version>
+    <version>2.1-M2</version>
 
     <organization>
         <name>Raden Solutions</name>
index fa781dc..5895121 100644 (file)
@@ -6,7 +6,7 @@
 
     <groupId>org.netxms</groupId>
     <artifactId>reporting-server</artifactId>
-    <version>2.1-M1</version>
+    <version>2.1-M2</version>
     <name>NetXMS reporting server</name>
     <description>JasperReports-based integration for NetXMS</description>
     <url>http://www.netxms.org</url>
index a6c44a8..ab221de 100644 (file)
@@ -4,7 +4,7 @@
 
     <groupId>org.netxms</groupId>
     <artifactId>nxshell</artifactId>
-    <version>2.1-M1</version>
+    <version>2.1-M2</version>
     <packaging>jar</packaging>
 
     <name>nxshell</name>
index 2ac4d26..1eb4191 100644 (file)
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NetXMS WebUI Core
 Bundle-SymbolicName: org.netxms.webui.core; singleton:=true
-Bundle-Version: 2.1.0
+Bundle-Version: 2.1.1
 Bundle-Activator: org.netxms.ui.eclipse.console.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.rap.ui;bundle-version="2.3.0",
  org.eclipse.rap.ui.forms;bundle-version="2.3.0",
- org.netxms.ui.eclipse.clientlibrary;bundle-version="2.1.0",
+ org.netxms.ui.eclipse.clientlibrary;bundle-version="2.1.1",
  org.eclipse.core.expressions;bundle-version="3.5.100"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
index b267a3e..3f2d456 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="NXMC" uid="org.netxms.nxmc" version="2.1-M1" useFeatures="false" includeLaunchers="false">
+<product name="NXMC" uid="org.netxms.nxmc" version="2.1-M2" useFeatures="false" includeLaunchers="false">
    <plugins>
       <plugin id="com.ibm.icu"/>
       <plugin id="com.ibm.icu.base"/>