diff --git a/assembly/pom.xml b/assembly/pom.xml index 3f8109bf..5a1fb566 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -3,7 +3,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT ../parent/pom.xml 4.0.0 diff --git a/assembly/pom.xml.versionsBackup b/assembly/pom.xml.versionsBackup deleted file mode 100644 index 5a1fb566..00000000 --- a/assembly/pom.xml.versionsBackup +++ /dev/null @@ -1,166 +0,0 @@ - - - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - ../parent/pom.xml - - 4.0.0 - - JTango - pom - - JTango full assembly - Assembles all JTango modules into a single dependency. - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.esrf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - ${project.build.directory}/JTango-${project.version}.jar - true - - - - - org.tango-controls - JavaTangoIDL - - - org.tango-controls - JTangoServer - - - org.tango-controls - TangORB - - - - - JTango-${project.version} - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - generate-version-class - - filter-sources - - - - - - maven-shade-plugin - 3.0.0 - - - shade - package - - shade - - - ${shaded.outputFile} - - - - - - - - - - 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 309546e1..8317776b 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT ../parent/pom.xml JTangoClientLang diff --git a/client/pom.xml.versionsBackup b/client/pom.xml.versionsBackup deleted file mode 100644 index 8317776b..00000000 --- a/client/pom.xml.versionsBackup +++ /dev/null @@ -1,110 +0,0 @@ - - - 4.0.0 - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - ../parent/pom.xml - - JTangoClientLang - JTango Client Lang - Tango client utilities - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.ersf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - - org.apache.commons - commons-lang3 - - - org.tango-controls - TangORB - - - org.mozilla - rhino - 1.7.7.1 - - - net.sf.transmorph - transmorph - 3.1.3 - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-ext - ${slf4j.version} - - - junit - junit - 4.12 - test - - - - 1.6.4 - - diff --git a/common/pom.xml b/common/pom.xml index b371d7d1..7d00b2df 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT ../parent/pom.xml diff --git a/common/pom.xml.versionsBackup b/common/pom.xml.versionsBackup deleted file mode 100644 index 7d00b2df..00000000 --- a/common/pom.xml.versionsBackup +++ /dev/null @@ -1,101 +0,0 @@ - - - 4.0.0 - - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - ../parent/pom.xml - - - JTangoCommons - - Java common - Common classes for tango java API - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.ersf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - - junit - junit - test - - - org.tango-controls - JavaTangoIDL - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-ext - - - com.google.guava - guava - - - org.apache.commons - commons-lang3 - - - diff --git a/dao/pom.xml b/dao/pom.xml index 9e34d30c..b888e3be 100644 --- a/dao/pom.xml +++ b/dao/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT ../parent/pom.xml diff --git a/dao/pom.xml.versionsBackup b/dao/pom.xml.versionsBackup deleted file mode 100644 index b888e3be..00000000 --- a/dao/pom.xml.versionsBackup +++ /dev/null @@ -1,124 +0,0 @@ - - - 4.0.0 - - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - ../parent/pom.xml - - - TangORB - - Java DAO - Java API for Tango - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.ersf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - - org.jacorb - jacorb - - - - org.jacorb - jacorb-services - - - - org.zeromq - jeromq - 0.3.4 - - - - org.slf4j - slf4j-log4j12 - 1.6.4 - provided - - - - org.tango-controls - JTangoCommons - - - - junit - junit - 4.12 - test - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - true - - - - - diff --git a/idl/pom.xml b/idl/pom.xml index 1a156a64..7713b132 100644 --- a/idl/pom.xml +++ b/idl/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT ../parent/pom.xml diff --git a/idl/pom.xml.versionsBackup b/idl/pom.xml.versionsBackup deleted file mode 100644 index 7713b132..00000000 --- a/idl/pom.xml.versionsBackup +++ /dev/null @@ -1,147 +0,0 @@ - - - 4.0.0 - - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - ../parent/pom.xml - - - - JavaTangoIDL - Java Tango IDL (compiled with jacorb IDL compiler, http://www.jacorb.org) - 2004 - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.ersf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - - org.jacorb - jacorb-omgapi - - - org.jacorb - jacorb-idl-compiler - compile - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - extract-tango-idl - generate-sources - - unpack - - - - - org.tango-controls - tango-idl - 5 - jar - tango.idl - ${project.build.directory} - - - - - - - - org.codehaus.mojo - idlj-maven-plugin - - - compile-tango-idl - generate-sources - - generate - - - true - jacorb - - - - -notimestamps - -nofinal - - fr.esrf - - tango.idl - - true - true - - - ${project.build.directory} - - - - - - - diff --git a/parent/pom.xml b/parent/pom.xml index 5f511cea..3d5457fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT pom diff --git a/parent/pom.xml.versionsBackup b/parent/pom.xml.versionsBackup deleted file mode 100644 index 3d5457fd..00000000 --- a/parent/pom.xml.versionsBackup +++ /dev/null @@ -1,340 +0,0 @@ - - - 4.0.0 - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - - pom - - JTangoParent - The JTango Parent POM provides common settings for all JTango components. - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - 3.8 - UTF-8 - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.ersf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - - - org.jacorb - jacorb-idl-compiler - ${jacorb.version} - - - org.jacorb - jacorb-omgapi - ${jacorb.version} - - - org.jacorb - jacorb - ${jacorb.version} - - - org.slf4j - slf4j-jdk14 - - - org.slf4j - slf4j-api - - - - - org.jacorb - jacorb-services - ${jacorb.version} - - - org.slf4j - slf4j-jdk14 - - - - xml-apis - xml-apis - - - - - org.tango-controls - JTangoCommons - ${project.version} - - - org.tango-controls - JavaTangoIDL - ${project.version} - - - org.tango-controls - JTangoClientLang - ${project.version} - - - org.tango-controls - TangORB - ${project.version} - - - org.tango-controls - TangORB-javacommon - ${project.version} - - - org.tango-controls - JTangoServer - ${project.version} - - - org.apache.commons - commons-lang3 - 3.5 - - - org.slf4j - slf4j-api - 1.7.6 - - - org.slf4j - slf4j-ext - 1.7.6 - - - com.google.guava - guava - 20.0 - - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 1.9.5 - test - - - - - - - bintray-tango-controls - https://api.bintray.com/maven/tango-controls/maven/${project.artifactId}/;publish=1 - - - - - - - maven-resources-plugin - - UTF-8 - - - - maven-compiler-plugin - - 1.7 - 1.7 - UTF-8 - true - true - - - - maven-source-plugin - - - attach-sources - verify - - jar - - - - - - - maven-javadoc-plugin - - - none - -Xdoclint:none - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.0-beta-2 - - - validate - - create - - - - - {0,date,yyyy-MM-dd HH:mm:ss} - - timestamp - - false - false - - - - - - - - true - src/main/resources - - **/*.properties - - - - src/main/resources - - **/*.properties - - - - - - - - - travis - - https://sonarcloud.io - tango-controls - - ${env.SONAR_TOKEN} - - - - - org.codehaus.mojo - sonar-maven-plugin - 3.6.0.1398 - - - org.jacoco - jacoco-maven-plugin - 0.7.7.201606060606 - - - - prepare-agent - - - - report - test - - report - - - - - - com.gavinmogan - codacy-maven-plugin - 1.0.3 - - - Java - ${project.build.directory}/site/jacoco/jacoco.xml - ${env.CODACY_PROJECT_TOKEN} - ${env.CODACY_API_TOKEN} - false - - - - - - - diff --git a/pom.xml b/pom.xml index 70828b9b..103d28d3 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT parent/pom.xml diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup deleted file mode 100644 index 103d28d3..00000000 --- a/pom.xml.versionsBackup +++ /dev/null @@ -1,94 +0,0 @@ - - - 4.0.0 - - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - parent/pom.xml - - - JTango-root - - - parent - idl - common - dao - client - server - assembly - - - JTango - JTango common build parameters - pom - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Java Developer - - 1 - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.esrf.eu - - Java Developer - - 1 - - - ingvord - Igor Khokhriakov - mail@ingvord.ru - http://www.ingvord.ru - - Contributor - - 3 - - - - - - - - - maven-deploy-plugin - - true - - - - maven-release-plugin - 2.5.3 - - false - release - true - true - JTango-@{project.version} - - - - - - diff --git a/server/pom.xml b/server/pom.xml index e1a5400d..65f4f553 100755 --- a/server/pom.xml +++ b/server/pom.xml @@ -4,7 +4,7 @@ org.tango-controls JTangoParent - 9.3.12-SNAPSHOT + 9.5.16-SNAPSHOT ../parent/pom.xml JTangoServer diff --git a/server/pom.xml.versionsBackup b/server/pom.xml.versionsBackup deleted file mode 100644 index 65f4f553..00000000 --- a/server/pom.xml.versionsBackup +++ /dev/null @@ -1,157 +0,0 @@ - - - 4.0.0 - - org.tango-controls - JTangoParent - 9.5.16-SNAPSHOT - ../parent/pom.xml - - JTangoServer - - JTango Server - Library for Tango Server (ie. Tango Device) in Java - 2012 - - https://github.com/tango-controls/JTango - - - scm:git:git@github.com:tango-controls/JTango.git - scm:git:git@github.com:tango-controls/JTango.git - https://github.com/tango-controls/JTango - HEAD - - - - GitHub - https://github.com/tango-controls/JTango/issues - - - - - LGPL-3.0 - - - - - Tango Controls - http://tango-controls.org - - - - - verdier - Pascal Verdier - verdier@esrf.fr - ESRF - http://www.ersf.eu - - Developer - - 1 - - - abeille - Gwenaëlle Abeillé - gwenaelle.abeille@synchrotron-soleil.fr - Synchrotron Soleil - http://www.synchrotron-soleil.fr - - Integrator, Developer - - 1 - - - - - - Igor Khokhriakov - mail@ingvord.ru - 3 - - - - - - - maven-surefire-plugin - - - **/Test*.java - **/*Test.java - **/*TestCase.java - **/*Test*.java - - - - TANGO_HOST - ${env.TANGO_HOST} - - - org.tango.server.checkalarms - false - - - - - - - - - - org.tango-controls - TangORB - - - org.tango-controls - JTangoClientLang - - - ch.qos.logback - logback-classic - 1.2.3 - - - org.slf4j - slf4j-ext - 1.7.6 - - - net.sf.transmorph - transmorph - 3.1.3 - - - net.sf.ehcache - ehcache-core - 2.3.0 - - - org.quartz-scheduler - quartz - 2.2.1 - - - org.apache.commons - commons-math3 - 3.5 - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.databene - contiperf - 2.2.0 - test - - - -