diff --git a/pom.xml b/pom.xml index fc4c5b98251f5cc331c957c96094c22ecc183202..9d6af0967fb56173326802c3ce0e0b0e5e443c23 100644 --- a/pom.xml +++ b/pom.xml @@ -1,19 +1,22 @@ <?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> - <artifactId>super-pom-java</artifactId> - <groupId>fr.soleil</groupId> - <version>RELEASE</version> - </parent> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snaparchivingservers</artifactId> - <version>1.7.14-SNAPSHOT</version> - <packaging>pom</packaging> - <name>snapArchivingServers</name> - <developers> - <developer> +<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.14</version> + <packaging>pom</packaging> + <name>snapArchivingServers</name> + <developers> + <developer> <id>abeille</id> <name>Gwenaelle Abeille</name> <email>gwenaelle.abeille@synchrotron-soleil.fr</email> @@ -24,59 +27,33 @@ </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> + <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> - <modules> - <module>snaparchiver</module> - <module>snapmanager</module> - <module>snapextractor</module> - <module>formersnapextractor</module> - </modules> + <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> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snaparchiver</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snapmanager</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>snapextractor</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>fr.soleil.deviceservers</groupId> - <artifactId>formersnapextractor</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + <modules> + <module>snaparchiver</module> + <module>snapmanager</module> + <module>snapextractor</module> + </modules> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> </project> diff --git a/snaparchiver/pom.xml b/snaparchiver/pom.xml index 3fb5400fbcbccb7d82d884083a9ce17cb76bb0a5..cfdb731393a8e968a1cef67e75da7b82d4fac493 100644 --- a/snaparchiver/pom.xml +++ b/snaparchiver/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.soleil.deviceservers</groupId> <artifactId>snaparchivingservers</artifactId> - <version>1.7.14-SNAPSHOT</version> + <version>1.7.14</version> </parent> <artifactId>snaparchiver</artifactId> @@ -22,22 +22,7 @@ </developerConnection> <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/snaparchiver</url> </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.tango</groupId> @@ -55,13 +40,5 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> </project> \ No newline at end of file diff --git a/snapextractor/pom.xml b/snapextractor/pom.xml index 79f4be9ef13868e98738c8e01988295a0c9977c3..c415cb663e0cf3bc0c764bdd04fb4ee8cdd50f75 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.14-SNAPSHOT</version> + <version>1.7.14</version> </parent> <artifactId>snapextractor</artifactId> @@ -22,22 +22,7 @@ </developerConnection> <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/snapextractor</url> </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.tango</groupId> @@ -61,13 +46,5 @@ <groupId>org.tango</groupId> <artifactId>JTangoClientLang</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> </project> \ No newline at end of file diff --git a/snapmanager/pom.xml b/snapmanager/pom.xml index b7e663835cce34b905fc43d6436d1563a41b757e..01a2db857d2901926dad23aca287315326938ace 100644 --- a/snapmanager/pom.xml +++ b/snapmanager/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.soleil.deviceservers</groupId> <artifactId>snaparchivingservers</artifactId> - <version>1.7.14-SNAPSHOT</version> + <version>1.7.14</version> </parent> <artifactId>snapmanager</artifactId> @@ -22,22 +22,7 @@ </developerConnection> <url>${scm.url.svn.tango-cs}/archiving/server/snapArchivingServers/snapmanager</url> </scm> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> <dependency> <groupId>org.tango</groupId> @@ -55,13 +40,5 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> </dependencies> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> </project> \ No newline at end of file