diff --git a/JAVA/GUI/Plotter/pom.xml b/JAVA/GUI/Plotter/pom.xml index 1e140cdf0d672e2b7b74b20a472cd585068bd2c5..e17a08bf20cfa37bb83a03f70bc5fe85c7e7fb89 100644 --- a/JAVA/GUI/Plotter/pom.xml +++ b/JAVA/GUI/Plotter/pom.xml @@ -1,47 +1,48 @@ -<?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> - - <name>Lofar Utilities :: Plotter GUI</name> - - <parent> - <groupId>nl.astron.lofar.lib</groupId> - <artifactId>parent</artifactId> - <version>1.8.1-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>plotter</artifactId> - - - <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. --> - <scm> - <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/GUI/Plotter</connection> - <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/GUI/Plotter</developerConnection> - </scm> - - - <!-- Information required to build a project. --> - <build> - <sourceDirectory>src</sourceDirectory> - <resources> - <resource> - <directory>src</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - - <resource> - <directory>PlotterConfig/src</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - - </build> - -</project> +<?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> + + <name>Lofar Utilities :: Plotter GUI</name> + + <parent> + <groupId>nl.astron.lofar.lib</groupId> + <artifactId>lofar-lib-parent</artifactId> + <version>1.8.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + + <artifactId>plotter</artifactId> + + + <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. --> + <scm> + <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/GUI/Plotter</connection> + <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/GUI/Plotter</developerConnection> + </scm> + + + <!-- Information required to build a project. --> + <build> + <sourceDirectory>src</sourceDirectory> + <resources> + <resource> + <directory>src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + + <resource> + <directory>PlotterConfig/src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + + </build> + +</project> diff --git a/JAVA/LofarUtils/pom.xml b/JAVA/LofarUtils/pom.xml index 8746023f99f20373d34699d9ce990f3daa3b8b2d..f9872d24e2d48dc01dfcd26d4170f728545d4825 100644 --- a/JAVA/LofarUtils/pom.xml +++ b/JAVA/LofarUtils/pom.xml @@ -1,51 +1,53 @@ -<?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> - - <name>Lofar Utilities :: LofarUtils</name> - - <parent> - <groupId>nl.astron.lofar.lib</groupId> - <artifactId>parent</artifactId> - <version>1.8.1-SNAPSHOT</version> - </parent> - - <artifactId>lofarutils</artifactId> - - - <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. --> - <scm> - <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/LofarUtils</connection> - <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/LofarUtils</developerConnection> - </scm> - - - <!-- Information required to build a project. --> - <build> - <sourceDirectory>src</sourceDirectory> - <resources> - <resource> - <directory>src</directory> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - </build> - - - <!-- This element describes all of the dependencies associated with a project. - These dependencies are used to construct a classpath for your project during - the build process. They are automatically downloaded from the repositories - defined in this project. See for more information: - http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html --> - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> - -</project> +<?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> + + <name>Lofar Utilities :: LofarUtils</name> + + <parent> + <groupId>nl.astron.lofar.lib</groupId> + <artifactId>lofar-lib-parent</artifactId> + <version>1.8.0-SNAPSHOT</version> + </parent> + + <artifactId>lofarutils</artifactId> + + + <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. --> + <scm> + <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/LofarUtils</connection> + <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA/LofarUtils</developerConnection> + </scm> + + + <!-- Information required to build a project. --> + <build> + <sourceDirectory>src</sourceDirectory> + <resources> + <resource> + <directory>src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + </build> + + + <!-- This element describes all of the dependencies associated with a project. + These dependencies are used to construct a classpath for your project during + the build process. They are automatically downloaded from the repositories + defined in this project. See for more information: + http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html --> + <dependencies> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + </dependencies> + +</project> + diff --git a/JAVA/pom.xml b/JAVA/pom.xml index f7ecbd0e79f27e1798a5263a96e1fb071b1b0018..94e18617764dafea9d2367323b2f1a2d6d3f58ee 100644 --- a/JAVA/pom.xml +++ b/JAVA/pom.xml @@ -1,61 +1,62 @@ -<?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> - - <name>Lofar Utilities :: Parent</name> - - <parent> - <groupId>nl.astron</groupId> - <artifactId>parent</artifactId> - <version>2.0.0</version> - </parent> - - <groupId>nl.astron.lofar.lib</groupId> - <artifactId>parent</artifactId> - <version>1.8.1-SNAPSHOT</version> - <packaging>pom</packaging> - - - <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. --> - <scm> - <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA</connection> - <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA</developerConnection> - </scm> - - - <!-- The modules (sometimes called subprojects) to build as a part of this - project. Each module listed is a relative path to the directory containing - the module. --> - <modules> - <module>LofarUtils</module> - <module>GUI/Plotter</module> - </modules> - - - <!-- Default dependency information for projects that inherit from this - one. The dependencies in this section are not immediately resolved. Instead, - when a POM derived from this one declares a dependency described by a matching - groupId and artifactId, the version and other values from this section are - used for that dependency if they were not already specified. --> - <dependencyManagement> - <dependencies> - - <!-- Child dependencies, childs use the same group-ID and version by default. --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>lofarutils</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>plotter</artifactId> - <version>${project.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - -</project> +<?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> + + <name>Lofar Utilities :: Parent</name> + + <parent> + <groupId>nl.astron</groupId> + <artifactId>parent</artifactId> + <version>2.0.0</version> + </parent> + + <groupId>nl.astron.lofar.lib</groupId> + <artifactId>lofar-lib-parent</artifactId> + <version>1.8.0-SNAPSHOT</version> + <packaging>pom</packaging> + + + <!-- Specification for the SCM used by the project, such as CVS, Subversion, etc. --> + <scm> + <connection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA</connection> + <developerConnection>scm:svn:https://svn.astron.nl/LOFAR/trunk/JAVA</developerConnection> + </scm> + + + <!-- The modules (sometimes called subprojects) to build as a part of this + project. Each module listed is a relative path to the directory containing + the module. --> + <modules> + <module>LofarUtils</module> + <module>GUI/Plotter</module> + </modules> + + + <!-- Default dependency information for projects that inherit from this + one. The dependencies in this section are not immediately resolved. Instead, + when a POM derived from this one declares a dependency described by a matching + groupId and artifactId, the version and other values from this section are + used for that dependency if they were not already specified. --> + <dependencyManagement> + <dependencies> + + <!-- Child dependencies, childs use the same group-ID and version by default. --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>lofarutils</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>plotter</artifactId> + <version>${project.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + +</project> diff --git a/SAS/OTB/OTB-distribution/pom.xml b/SAS/OTB/OTB-distribution/pom.xml index e3ca5f491f9e8d97fdf69dea84a0fa5df4c3f618..1246b158082bc7072a2e9ec7236522d60f5f4060 100644 --- a/SAS/OTB/OTB-distribution/pom.xml +++ b/SAS/OTB/OTB-distribution/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> diff --git a/SAS/OTB/OTB/pom.xml b/SAS/OTB/OTB/pom.xml index 604dc55d90e9f64521f28faca08539aa9b40e19d..55662cf36568df025a23e125e44a4bdb02414b0c 100644 --- a/SAS/OTB/OTB/pom.xml +++ b/SAS/OTB/OTB/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> diff --git a/SAS/OTB/RSP/pom.xml b/SAS/OTB/RSP/pom.xml index 9b26b95fe609be5a48e32b16a6bada00e593cb8e..dd9f4375fcf34fc3ee12f912bf210e554c32e75d 100644 --- a/SAS/OTB/RSP/pom.xml +++ b/SAS/OTB/RSP/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> diff --git a/SAS/OTB/jOTDB3/pom.xml b/SAS/OTB/jOTDB3/pom.xml index 0069947c263a9fa27f22c45ef3047938ec0c60f4..4850576b837d79b0e2753ec5e80a50676999927f 100644 --- a/SAS/OTB/jOTDB3/pom.xml +++ b/SAS/OTB/jOTDB3/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> diff --git a/SAS/OTB/jParmFacade/pom.xml b/SAS/OTB/jParmFacade/pom.xml index 3683847a9c1b0f93ad965e10bbccfa7829efa7d9..7738d72c5da79d881cbf21e47211c21390bcb7ab 100644 --- a/SAS/OTB/jParmFacade/pom.xml +++ b/SAS/OTB/jParmFacade/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> diff --git a/SAS/OTB/jRSP/pom.xml b/SAS/OTB/jRSP/pom.xml index 0e2017af32402ad9c4f996e0117b5047cf4c0471..a8d6e65159e95c759e893188729f7c32ecc3de74 100644 --- a/SAS/OTB/jRSP/pom.xml +++ b/SAS/OTB/jRSP/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <version>1.8.0-SNAPSHOT</version> </parent> diff --git a/SAS/OTB/pom.xml b/SAS/OTB/pom.xml index c65c279fdca44aea8444125011c49e11e27839a5..de6b0695810a28afa9378c74a67767bd84c1f411 100644 --- a/SAS/OTB/pom.xml +++ b/SAS/OTB/pom.xml @@ -15,7 +15,7 @@ </parent> <groupId>nl.astron.lofar.sas.otb</groupId> - <artifactId>parent</artifactId> + <artifactId>otb-parent</artifactId> <packaging>pom</packaging> @@ -151,7 +151,7 @@ <!-- Import the group 'nl.astron.lofar.lib' --> <dependency> <groupId>nl.astron.lofar.lib</groupId> - <artifactId>parent</artifactId> + <artifactId>lofar-lib-parent</artifactId> <version>${lofar.lib.version}</version> <type>pom</type> <scope>import</scope>