diff --git a/.travis.yml b/.travis.yml index 065bd9a4..0becefe3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,9 @@ sudo: false services: - docker +git: + depth: false + env: - TANGO_HOST=localhost:10000 diff --git a/.travis/maven_deploy.sh b/.travis/maven_deploy.sh index 8313f230..37e2731f 100755 --- a/.travis/maven_deploy.sh +++ b/.travis/maven_deploy.sh @@ -4,7 +4,7 @@ set -e cp .travis/settings.xml $HOME/.m2/settings.xml -mvn deploy -Dmaven.test.skip=true +mvn deploy -Dmaven.test.skip=true -Prelease cd parent mvn versions:set versions:update-child-modules -DprocessAllModules -DnextSnapshot -DgenerateBackupPoms=false diff --git a/README.md b/README.md index cf71cdf4..95f03c7e 100644 --- a/README.md +++ b/README.md @@ -5,24 +5,25 @@ [![Build Status](https://travis-ci.org/tango-controls/JTango.svg?branch=jtango-9-lts)](https://travis-ci.org/tango-controls/JTango) [![Documentation Status](https://readthedocs.org/projects/jtango/badge/?version=jtango-9-lts)](http://jtango.readthedocs.io/en/jtango-9-lts/?badge=jtango-9-lts) -[![Download](https://api.bintray.com/packages/tango-controls/generic/JTango-9-LTS/images/download.svg) ](https://bintray.com/tango-controls/generic/JTango-9-LTS/_latestVersion) +[ ![Download](https://api.bintray.com/packages/tango-controls/jtango/JTango/images/download.svg) ](https://bintray.com/tango-controls/jtango/JTango/_latestVersion) [![License](https://img.shields.io/badge/license-LGPL--3.0-blue.svg)](https://github.com/tango-controls/JTango/blob/jtango-9-lts/LICENSE) ## SonarCloud -[![Quality gate](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=alert_status)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) -[![Maintainability](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Reliability](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Security](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=security_rating)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) -[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=bugs)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Code smells](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) -[![Tech debt](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=bugs)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=code_smells)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Technical Debt](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=sqale_index)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) -[![Lines of code](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root%3Ajtango-9-lts&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root%3Ajtango-9-lts) +[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=ncloc)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) +[![Duplicated Lines (%)](https://sonarcloud.io/api/project_badges/measure?project=org.tango-controls%3AJTango-root&metric=duplicated_lines_density)](https://sonarcloud.io/dashboard?id=org.tango-controls%3AJTango-root) # JavaDoc diff --git a/assembly/pom.xml b/assembly/pom.xml index 754b05bc..504fd9a3 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml 4.0.0 @@ -124,43 +124,5 @@ - - - - - release - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - deploy-jar - deploy - - exec - - - curl - - -T - - ${shaded.outputFile} - - -u${bintray.user.name}:${bintray.user.apikey} - - https://api.bintray.com/content/tango-controls/generic/${project.artifactId}-9-LTS/${project.version}/${project.artifactId}-${project.version}.jar;publish=1 - - --verbose - - - - - - - - - + diff --git a/client/pom.xml b/client/pom.xml index dfcc0882..fdf3c43d 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml JTangoClientLang diff --git a/common/pom.xml b/common/pom.xml index e7d6bd88..338a9f0b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml diff --git a/dao/pom.xml b/dao/pom.xml index 00393214..90a64315 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml diff --git a/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java b/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java index c7c1b195..99e53a38 100755 --- a/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java +++ b/dao/src/main/java/fr/esrf/TangoApi/events/ZmqMainThread.java @@ -70,13 +70,13 @@ public class ZmqMainThread extends Thread { private static final long SendHwmSocket = 10000; //=============================================================== - private class ZmqPollers extends ZMQ.Poller { + //=============================================================== + private static class ZmqPollers extends ZMQ.Poller { private ZmqPollers(ZMQ.Context context, int size) { super(context, size); } } //=============================================================== - //=============================================================== /** * Default constructor * @param context ZMQ context instance @@ -667,19 +667,20 @@ private void connectIfNotDone(ZMQ.Socket socket, ZMQutils.ControlStructure contr // Check if it ia a reconnection -> disconnect before connection if (controlStructure.forceReconnection && alreadyConnected(controlStructure.endPoint)) { try { - // needs an un subscribe before disconnection - //socket.unsubscribe(controlStructure.eventName.getBytes()); socket.disconnect(controlStructure.endPoint); } catch (org.zeromq.ZMQException e) { System.err.println(e.getMessage()); } } - - // Do the connection //System.out.println("Connect on " + controlStructure.endPoint); //System.out.println(" for " + controlStructure.eventName); - socket.setHWM(controlStructure.hwm); + + // Do the connection (HWM for send is set without limit + // to avoid problem due to the buffer size when connect + // to server for large number of attributes) + socket.setSndHWM(0); + socket.setRcvHWM(controlStructure.hwm); socket.connect(controlStructure.endPoint); if (!alreadyConnected(controlStructure.endPoint)) { EventList eventList = new EventList(); @@ -763,11 +764,9 @@ private static String formatTime(long ms) return time + "." + ms; } - - //=============================================================== //=============================================================== - private class EventList extends ArrayList { + private static class EventList extends ArrayList { private String getEvent(String eventName) { for (String event : this) { if (event.equals(eventName)) { diff --git a/parent/pom.xml b/parent/pom.xml index bf086e86..5b9aa083 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT pom diff --git a/pom.xml b/pom.xml index 5ff41dea..03359e61 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT parent/pom.xml diff --git a/server/pom.xml b/server/pom.xml index 4ccd2add..c80ef68d 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - JTango-9.5.17-SNAPSHOT + 9.5.18-SNAPSHOT ../parent/pom.xml JTangoServer