Merge pull request #203 from girtel/develop

Merge new version 0.5.3

.travis.yml

@@ -5,7 +5,7 @@ sudo: required
 addons:
   apt:
     packages:
-    - glpk
+    - libglpk36
 
 env:
   - DISPLAY=:99.0

CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to Net2Plan will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [0.5.3] - 2018-02-14
+### Added
+    - Added Optical Fiber Utils.
+	- Report for Optical Fiber networks following calculations of Gaussian  Noise Model.
+
+### Fixed
+    - Site mode does not break the tool when loading a new topology.
+	- Corrected layer table tags.
+	- Sorting table columns works as it should.
+	- Other bug fixes.
+
+####
+
+
 ## [0.5.2] - 2017-05-24
 ### Added
     - Added a new tab under the "Demands" table for traffic matrix visualization and control.

Net2Plan-Assembly/pom.xml

@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.net2plan</groupId>
         <artifactId>net2plan</artifactId>
-        <version>0.5.3-SNAPSHOT</version>
+        <version>0.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -29,63 +29,63 @@
         <dependency>
             <groupId>com.net2plan</groupId>
             <artifactId>net2plan-core</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <type>jar</type>
         </dependency>
         <!--Core resources bundle(data, help...)-->
         <dependency>
             <groupId>com.net2plan</groupId>
             <artifactId>net2plan-core</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <type>zip</type>
             <classifier>bundle</classifier>
         </dependency>
         <dependency>
             <groupId>com.net2plan.net2plan-cli</groupId>
             <artifactId>net2plan-cli-exec</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.net2plan.net2plan-cli</groupId>
             <artifactId>net2plan-cli-plugins</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.net2plan.net2plan-gui</groupId>
             <artifactId>net2plan-gui-exec</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.net2plan.net2plan-gui.net2plan-gui-plugins</groupId>
             <artifactId>net2plan-gui-plugins-networkDesign</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.net2plan.net2plan-gui.net2plan-gui-plugins</groupId>
             <artifactId>net2plan-gui-plugins-trafficDesign</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.net2plan</groupId>
             <artifactId>net2plan-examples</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>
         <dependency>
             <groupId>com.net2plan</groupId>
             <artifactId>net2plan-javadoc</artifactId>
-            <version>0.5.3-SNAPSHOT</version>
+            <version>0.5.3</version>
             <scope>runtime</scope>
             <type>jar</type>
         </dependency>

Net2Plan-Assembly/pom.xml.versionsBackup

@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2017 Pablo Pavon Marino and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the 2-clause BSD License 
+    which accompanies this distribution, and is available at
+    https://opensource.org/licenses/BSD-2-Clause
+   
+    Contributors:
+        Pablo Pavon Marino and others - initial API and implementation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.net2plan</groupId>
+        <artifactId>net2plan</artifactId>
+        <version>0.5.3-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <packaging>pom</packaging>
+
+    <artifactId>net2plan-assembly</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.net2plan</groupId>
+            <artifactId>net2plan-core</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
+        <!--Core resources bundle(data, help...)-->
+        <dependency>
+            <groupId>com.net2plan</groupId>
+            <artifactId>net2plan-core</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <type>zip</type>
+            <classifier>bundle</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan.net2plan-cli</groupId>
+            <artifactId>net2plan-cli-exec</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan.net2plan-cli</groupId>
+            <artifactId>net2plan-cli-plugins</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan.net2plan-gui</groupId>
+            <artifactId>net2plan-gui-exec</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan.net2plan-gui.net2plan-gui-plugins</groupId>
+            <artifactId>net2plan-gui-plugins-networkDesign</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan.net2plan-gui.net2plan-gui-plugins</groupId>
+            <artifactId>net2plan-gui-plugins-trafficDesign</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan</groupId>
+            <artifactId>net2plan-examples</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>com.net2plan</groupId>
+            <artifactId>net2plan-javadoc</artifactId>
+            <version>0.5.3-SNAPSHOT</version>
+            <scope>runtime</scope>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>Net2Plan-${project.version}</finalName>
+        <plugins>
+            <!-- Download licenses -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>1.12</version>
+                <executions>
+                    <execution>
+                        <id>download-licenses</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>download-licenses</goal>
+                        </goals>
+                        <configuration>
+                            <excludedGroups>com.net2plan</excludedGroups>
+                            <excludedScopes>test</excludedScopes>
+                            <includeTransitiveDependencies>true</includeTransitiveDependencies>
+                            <quiet>true</quiet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Plugin required to assemble the project for distribution  -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <id>assemble</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/assembly/assembler.xsl</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Net2Plan-CI/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>net2plan</artifactId>
         <groupId>com.net2plan</groupId>
-        <version>0.5.3-SNAPSHOT</version>
+        <version>0.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Net2Plan-CI/pom.xml.versionsBackup

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>net2plan</artifactId>
+        <groupId>com.net2plan</groupId>
+        <version>0.5.3-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>net2plan-ci</artifactId>
+
+    <packaging>pom</packaging>
+</project>

Net2Plan-CLI/Net2Plan-CLI-Exec/pom.xml

@@ -16,14 +16,16 @@
     <parent>
         <groupId>com.net2plan</groupId>
         <artifactId>net2plan-cli</artifactId>
-        <version>0.5.3-SNAPSHOT</version>
+        <version>0.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.net2plan.net2plan-cli</groupId>
     <artifactId>net2plan-cli-exec</artifactId>
 
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>com.net2plan</groupId>

Net2Plan-CLI/Net2Plan-CLI-Exec/pom.xml.versionsBackup

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2017 Pablo Pavon Marino and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the 2-clause BSD License 
+    which accompanies this distribution, and is available at
+    https://opensource.org/licenses/BSD-2-Clause
+   
+    Contributors:
+        Pablo Pavon Marino and others - initial API and implementation
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.net2plan</groupId>
+        <artifactId>net2plan-cli</artifactId>
+        <version>0.5.3-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.net2plan.net2plan-cli</groupId>
+    <artifactId>net2plan-cli-exec</artifactId>
+
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.net2plan</groupId>
+            <artifactId>net2plan-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.net2plan.cli.CLINet2Plan</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>lib/net2plan-core.jar</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Net2Plan-CLI/Net2Plan-CLI-Plugins/pom.xml

@@ -16,14 +16,16 @@
     <parent>
         <groupId>com.net2plan</groupId>
         <artifactId>net2plan-cli</artifactId>
-        <version>0.5.3-SNAPSHOT</version>
+        <version>0.5.3</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.net2plan.net2plan-cli</groupId>
     <artifactId>net2plan-cli-plugins</artifactId>
 
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
             <groupId>com.net2plan</groupId>