From 411f9d65a92a60cb0dd29b8e6b16b5f246130d3e Mon Sep 17 00:00:00 2001 From: Arthur Coolen <coolen@astron.nl> Date: Tue, 26 Jun 2012 08:20:23 +0000 Subject: [PATCH] Task #2993: merged trunk into branch for JAVA and OTB/OTB and OTB/jOTDB3 --- .gitignore | 3 +++ JAVA/CEP/jParmFacade/pom.xml | 4 ++-- JAVA/GUI/Plotter/pom.xml | 2 +- JAVA/LofarUtils/pom.xml | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6356bac7009..f8b6ae8611d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ JAVA/CEP/jParmFacade/build JAVA/CEP/jParmFacade/dist JAVA/CEP/jParmFacade/lofarconf JAVA/CEP/jParmFacade/nbproject +JAVA/CEP/jParmFacade/target JAVA/GUI/MAC/jRSP/build JAVA/GUI/MAC/jRSP/dist JAVA/GUI/MAC/jRSP/nbproject @@ -49,11 +50,13 @@ JAVA/GUI/Plotter/PlotterConfig/nbproject/private JAVA/GUI/Plotter/build JAVA/GUI/Plotter/dist JAVA/GUI/Plotter/nbproject +JAVA/GUI/Plotter/target JAVA/GUI/build JAVA/GUI/dist JAVA/LofarUtils/build JAVA/LofarUtils/dist JAVA/LofarUtils/nbproject +JAVA/LofarUtils/target JAVA/MAC/jRSP/Makefile.am JAVA/MAC/jRSP/autoconf_share JAVA/MAC/jRSP/bootstrap diff --git a/JAVA/CEP/jParmFacade/pom.xml b/JAVA/CEP/jParmFacade/pom.xml index e3a0ea693af..e702b5eb858 100644 --- a/JAVA/CEP/jParmFacade/pom.xml +++ b/JAVA/CEP/jParmFacade/pom.xml @@ -9,7 +9,7 @@ <groupId>nl.astron.lofar.cep</groupId> <artifactId>jParmFacade</artifactId> <name>jParmFacade</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2</version> <organization> <name>Astron</name> @@ -67,7 +67,7 @@ <dependency> <groupId>nl.astron.lofar.sas</groupId> <artifactId>jOTDB3</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2</version> </dependency> <dependency> diff --git a/JAVA/GUI/Plotter/pom.xml b/JAVA/GUI/Plotter/pom.xml index fc3401f48d8..8def45692af 100644 --- a/JAVA/GUI/Plotter/pom.xml +++ b/JAVA/GUI/Plotter/pom.xml @@ -7,7 +7,7 @@ <groupId>nl.astron.lofar.gui</groupId> <artifactId>plotter</artifactId> <name>Java Plotter GUI Lib</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2</version> <organization> <name>Astron</name> diff --git a/JAVA/LofarUtils/pom.xml b/JAVA/LofarUtils/pom.xml index 7bd8aba45bf..dc86fd46678 100644 --- a/JAVA/LofarUtils/pom.xml +++ b/JAVA/LofarUtils/pom.xml @@ -9,7 +9,7 @@ <groupId>nl.astron.lofar</groupId> <artifactId>lofarutils</artifactId> <name>Lofar Utils</name> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2</version> <organization> <name>Astron</name> @@ -60,5 +60,6 @@ <url>https://support.astron.nl/nexus/content/repositories/snapshots/</url> </snapshotRepository> </distributionManagement> + </project> \ No newline at end of file -- GitLab