diff --git a/pom.xml b/pom.xml index 3c346a2012e1daf7a7d9bf5c4a8472f2855dc083..c1b2518cbd2f35022ae329b8e68c511503119687 100644 --- a/pom.xml +++ b/pom.xml @@ -1,58 +1,77 @@ <?xml version="1.0" encoding="UTF-8"?> <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>fr.soleil.maven.parent</groupId> - <artifactId>java-updated-versions</artifactId> - <version>0-SNAPSHOT</version> - </parent> - - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snaparchivingservers</artifactId> - <version>1.7.15</version> - <packaging>pom</packaging> - <name>snapArchivingServers</name> - <developers> - <developer> - <id>abeille</id> - <name>Gwenaelle Abeille</name> - <email>gwenaelle.abeille@synchrotron-soleil.fr</email> - <organization>Synchrotron Soleil</organization> - <organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl> - <roles> - <role>Java Developer</role> - </roles> - <timezone>1</timezone> - </developer> - <developer> - <id>girardot</id> - <name>Raphaël GIRARDOT</name> - <email>raphael.girardot@synchrotron-soleil.fr</email> - <organization>Synchrotron Soleil</organization> - <organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl> - <roles> - <role>Java Developer</role> - </roles> - <timezone>1</timezone> - </developer> - </developers> - - <scm> - <connection>${scm.connection.svn.tango-cs}:archiving/server/snapArchivingServers/trunk</connection> - <developerConnection>${scm.developerConnection.svn.tango-cs}:archiving/server/snapArchivingServers/trunk</developerConnection> - <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/trunk</url> - </scm> - - <modules> - <module>snaparchiver</module> - <module>snapmanager</module> - <module>snapextractor</module> - </modules> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.soleil.maven.parent</groupId> + <artifactId>java-updated-versions</artifactId> + <version>0-SNAPSHOT</version> + </parent> + + <groupId>fr.soleil.deviceservers</groupId> + <artifactId>snaparchivingservers</artifactId> + <version>1.8.0</version> + <packaging>pom</packaging> + <name>snapArchivingServers</name> + + <developers> + <developer> + <id>abeille</id> + <name>Gwenaelle Abeille</name> + <email>gwenaelle.abeille@synchrotron-soleil.fr</email> + <organization>Synchrotron Soleil</organization> + <organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl> + <roles> + <role>Java Developer</role> + </roles> + <timezone>1</timezone> + </developer> + <developer> + <id>girardot</id> + <name>Raphaël GIRARDOT</name> + <email>raphael.girardot@synchrotron-soleil.fr</email> + <organization>Synchrotron Soleil</organization> + <organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl> + <roles> + <role>Java Developer</role> + </roles> + <timezone>1</timezone> + </developer> + </developers> + + <scm> + <connection> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </connection> + <developerConnection> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </developerConnection> + <url> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </url> + </scm> + + <modules> + <module>snaparchiver</module> + <module>snapmanager</module> + <module>snapextractor</module> + </modules> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>org.tango-controls</groupId> + <artifactId>JTangoServer</artifactId> + </dependency> + <dependency> + <groupId>fr.soleil.lib</groupId> + <artifactId>snapArchivingApi</artifactId> + <version>1.8.6</version> + </dependency> + </dependencies> </project> diff --git a/snaparchiver/pom.xml b/snaparchiver/pom.xml index ee03a1565fb29034087d42c3afeb9e15d5e319db..e806e844c65493ec698c238764ebc7a8d9d3e931 100644 --- a/snaparchiver/pom.xml +++ b/snaparchiver/pom.xml @@ -1,47 +1,27 @@ <?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/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snaparchivingservers</artifactId> - <version>1.7.15</version> - </parent> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>fr.soleil.deviceservers</groupId> + <artifactId>snaparchivingservers</artifactId> + <version>1.8.0</version> + </parent> - <artifactId>snaparchiver</artifactId> + <artifactId>snaparchiver</artifactId> - <name>SnapArchiver</name> - <description>SnapArchiver device</description> - <scm> - <connection> - scm:svn:${scm.connection.svn.tango-cs}:archiving/server/snapArchivingServers/snaparchiver - </connection> - <developerConnection> - scm:svn:${scm.developerConnection.svn.tango-cs}:archiving/server/snapArchivingServers/snaparchiver - </developerConnection> - <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/snaparchiver</url> - </scm> + <name>SnapArchiver</name> + <description>SnapArchiver device</description> + <scm> + <connection> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </connection> + <developerConnection> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </developerConnection> + <url> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </url> + </scm> - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>TangORB</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>JTangoServer</artifactId> - </dependency> - <dependency> - <groupId>fr.soleil.lib</groupId> - <artifactId>snapArchivingApi</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>JTangoClientLang</artifactId> - </dependency> - </dependencies> </project> \ No newline at end of file diff --git a/snapextractor/pom.xml b/snapextractor/pom.xml index 67988f192b6cd88ea3414eaf568f3cc3f88072ae..49dd1b65a5b1d5749a238da7538f4088e50c8901 100644 --- a/snapextractor/pom.xml +++ b/snapextractor/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.soleil.deviceservers</groupId> <artifactId>snaparchivingservers</artifactId> - <version>1.7.15</version> + <version>1.8.0</version> </parent> <artifactId>snapextractor</artifactId> @@ -15,30 +15,14 @@ <description>SnapExtractor device</description> <scm> <connection> - scm:svn:${scm.connection.svn.tango-cs}:archiving/server/snapArchivingServers/snapextractor + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git </connection> <developerConnection> - scm:svn:${scm.developerConnection.svn.tango-cs}:archiving/server/snapArchivingServers/snapextractor + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git </developerConnection> - <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/snapextractor</url> + <url> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </url> </scm> - - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>JTangoServer</artifactId> - </dependency> - <dependency> - <groupId>fr.soleil.lib</groupId> - <artifactId>snapArchivingApi</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>JTangoClientLang</artifactId> - </dependency> - </dependencies> + </project> \ No newline at end of file diff --git a/snapmanager/pom.xml b/snapmanager/pom.xml index 0b3d280b01457be09d5d608cf5dde42dfe29fdcd..a886b7917180eb8fbdc292e8abfbc4c6454b91c6 100644 --- a/snapmanager/pom.xml +++ b/snapmanager/pom.xml @@ -1,48 +1,29 @@ <?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/maven-v4_0_0.xsd" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" > - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snaparchivingservers</artifactId> - <version>1.7.15</version> - </parent> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>fr.soleil.deviceservers</groupId> + <artifactId>snaparchivingservers</artifactId> + <version>1.8.0</version> + </parent> - <artifactId>snapmanager</artifactId> + <artifactId>snapmanager</artifactId> - <name>SnapManager</name> - <description>SnapManager device</description> - <scm> - <connection> - scm:svn:${scm.connection.svn.tango-cs}:archiving/server/snapArchivingServers/snapmanager - </connection> - <developerConnection> - scm:svn:${scm.developerConnection.svn.tango-cs}:archiving/server/snapArchivingServers/snapmanager - </developerConnection> - <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/snapmanager</url> - </scm> + <name>SnapManager</name> + <description>SnapManager device</description> + + <scm> + <connection> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </connection> + <developerConnection> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </developerConnection> + <url> + git@gitlab.synchrotron-soleil.fr:software-control-system/tango-controls-archiving/snaparchivingservers.git + </url> + </scm> - <dependencies> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>TangORB</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>JTangoServer</artifactId> - </dependency> - <dependency> - <groupId>fr.soleil.lib</groupId> - <artifactId>snapArchivingApi</artifactId> - </dependency> - <dependency> - <groupId>org.tango-controls</groupId> - <artifactId>JTangoClientLang</artifactId> - </dependency> - </dependencies> </project> \ No newline at end of file