Merge pull request #28 from CDS-INSPIRE/cds-parent-2.8

GBOCI-375: Commit 2.8 release into GitHub
CDS-INSPIRE · Apr 7, 2017 · 6b66970 · 6b66970
2 parents f2e456a + 27b4890
commit 6b66970
Show file tree

Hide file tree

Showing 40 changed files with 87 additions and 87 deletions.
diff --git a/admin/pom.xml b/admin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cds-parent</artifactId>
         <groupId>nl.ipo.cds</groupId>
-        <version>2.6</version>
+        <version>2.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -385,7 +385,7 @@
         <dependency>
         	<groupId>nl.ipo.cds</groupId>
         	<artifactId>themes</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
         	<type>pom</type>
         </dependency>
     </dependencies>

diff --git a/attributemapping/pom.xml b/attributemapping/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>nl.ipo.cds</groupId>
 		<artifactId>cds-parent</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
 	</parent>
 	<artifactId>attributemapping</artifactId>
 	<name>CDS Inspire - Attributemapping</name>

diff --git a/catalog-metadata/pom.xml b/catalog-metadata/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>nl.ipo.cds</groupId>
     <artifactId>cds-parent</artifactId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
   <artifactId>catalog-metadata</artifactId>
   <dependencies>

diff --git a/cds-deegree-extension/pom.xml b/cds-deegree-extension/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
 
   <artifactId>cds-deegree-extension</artifactId>

diff --git a/cds-test/pom.xml b/cds-test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
   <artifactId>cds-test</artifactId>
 

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>commons</artifactId>

diff --git a/deegree-webservices-cds/pom.xml b/deegree-webservices-cds/pom.xml
@@ -5,7 +5,7 @@
   <packaging>war</packaging>
   <name>deegree-webservices-cds</name>
   <description>WAR that includes deegree WFS, WMS, WMTS and common datastore modules</description>
-    <version>2.6</version>
+    <version>2.8</version>
 
   <properties>
     <deegree.version>3.4-pre10-SNAPSHOT-cds1</deegree.version>

diff --git a/domain-metadata/pom.xml b/domain-metadata/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
   <artifactId>domain-metadata</artifactId>
   <dependencies>

diff --git a/domain/pom.xml b/domain/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>domain</artifactId>
@@ -59,7 +59,7 @@
   	<dependency>
   		<groupId>nl.ipo.cds</groupId>
   		<artifactId>job-executor-api</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
   	</dependency>
   	<dependency>
   		<groupId>nl.idgis.commons</groupId>

diff --git a/etl-attributemapping/pom.xml b/etl-attributemapping/pom.xml
@@ -3,15 +3,15 @@
 	<parent>
 		<groupId>nl.ipo.cds</groupId>
 		<artifactId>cds-parent</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
 	</parent>
 	<artifactId>etl-attributemapping</artifactId>
 	<name>CDS - ETL - Attributemapping</name>
 	<dependencies>
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>attributemapping</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>

diff --git a/etl-operations/pom.xml b/etl-operations/pom.xml
@@ -3,15 +3,15 @@
   <parent>
     <groupId>nl.ipo.cds</groupId>
     <artifactId>cds-parent</artifactId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
   <artifactId>etl-operations</artifactId>
   <name>CDS Inspire - ETL - Transform operations</name>
   <dependencies>
   	<dependency>
   		<groupId>nl.ipo.cds</groupId>
   		<artifactId>attributemapping</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
   	</dependency>
   	<dependency>
   		<groupId>junit</groupId>

diff --git a/etl-proces/pom.xml b/etl-proces/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>cds-parent</artifactId>
 		<groupId>nl.ipo.cds</groupId>
-        <version>2.6</version>
+        <version>2.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>etl-proces</artifactId>
@@ -287,12 +287,12 @@
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>attributemapping</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>etl-operations</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>nl.idgis.commons</groupId>

diff --git a/etl-proces/src/main/java/nl/ipo/cds/etl/RefreshPolicyGuard.java b/etl-proces/src/main/java/nl/ipo/cds/etl/RefreshPolicyGuard.java
@@ -72,7 +72,7 @@ boolean isRefreshAllowed (final EtlJob current, final EtlJob lastSuccess)  {
 			if (isRefreshAllowed) {
 				technicalLog.debug("refresh ok: last modification info changed");
 			} else {
-				technicalLog.debug("refresh veto: last modification info unchanged");				
+				technicalLog.debug("refresh veto: last modification info unchanged");
 			}
 			break;
 		case ONCE_A_DAY:

diff --git a/etl-proces/src/main/java/nl/ipo/cds/etl/process/TransformProcess.java b/etl-proces/src/main/java/nl/ipo/cds/etl/process/TransformProcess.java
@@ -36,7 +36,7 @@ public TransformProcess(ManagerDao managerDao) {
 	public boolean process (TransformJob job, final JobLogger logger) throws Exception {
 		Map<String, Transformer> transformers = applicationContext.getBeansOfType(Transformer.class);
 		log.debug("# of transformers found: " + transformers.size());
-		List<String> themeNames = getThemeNamesThatNeedTransformation();
+		List<String> themeNames = getThemeNamesThatNeedTransformation ();
 		for(String transformerName : transformers.keySet()) {
 			Transformer transformer = transformers.get(transformerName);
 			log.debug("starting transformer: " + transformerName);

diff --git a/etl-reporting/pom.xml b/etl-reporting/pom.xml
@@ -40,7 +40,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>etl-reporting</artifactId>

diff --git a/etl-test/pom.xml b/etl-test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>nl.ipo.cds</groupId>
     <artifactId>cds-parent</artifactId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
   <artifactId>etl-test</artifactId>
   <name>CDS - ETL test</name>

diff --git a/jndi-client/pom.xml b/jndi-client/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   <groupId>nl.ipo.cds</groupId>
   <artifactId>jndi-client</artifactId>
-    <version>2.6</version>
+    <version>2.8</version>
   <dependencies>
   	<dependency>
   		<groupId>jboss</groupId>

diff --git a/jndi-server/pom.xml b/jndi-server/pom.xml
@@ -3,11 +3,11 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>2.8</version>
   </parent>
   <groupId>nl.ipo.cds</groupId>
   <artifactId>jndi-server</artifactId>
-  <version>0.0.3-SNAPSHOT</version>
+  <version>2.8</version>
 
     <build>
       <plugins>
@@ -64,7 +64,7 @@
   	<dependency>
   		<groupId>nl.ipo.cds</groupId>
   		<artifactId>commons</artifactId>
-  		<version>0.0.3-SNAPSHOT</version>
+  		<version>2.8</version>
   		<type>jar</type>
   		<scope>compile</scope>
   	</dependency>

diff --git a/job-executor/job-executor-api/pom.xml b/job-executor/job-executor-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>nl.ipo.cds</groupId>
         <artifactId>job-executor</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
     </parent>
     <packaging>jar</packaging>
 

diff --git a/job-executor/job-executor-exec/pom.xml b/job-executor/job-executor-exec/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>nl.ipo.cds</groupId>
 		<artifactId>job-executor</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
 	</parent>
 	<packaging>jar</packaging>
 
@@ -42,13 +42,13 @@
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>themes</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>catalog-metadata</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 		</dependency>
 	</dependencies>
 

diff --git a/job-executor/pom.xml b/job-executor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>nl.ipo.cds</groupId>
         <artifactId>cds-parent</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/managerDB/pom.xml b/managerDB/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<artifactId>cds-parent</artifactId>
 		<groupId>nl.ipo.cds</groupId>
-        <version>2.6</version>
+        <version>2.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>managerDB</artifactId>
@@ -388,12 +388,12 @@
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>attributemapping</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>nl.ipo.cds</groupId>
 			<artifactId>etl-attributemapping</artifactId>
-            <version>2.6</version>
+            <version>2.8</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/mappings/pom.xml b/mappings/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>nl.ipo.cds</groupId>
 		<artifactId>cds-parent</artifactId>
-        <version>2.6</version>
+        <version>2.8</version>
 	</parent>
 	<artifactId>mappings</artifactId>
 	<name>mappings</name>

diff --git a/metadataDB/pom.xml b/metadataDB/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cds-parent</artifactId>
     <groupId>nl.ipo.cds</groupId>
-      <version>2.6</version>
+      <version>2.8</version>
   </parent>
   <artifactId>metadataDB</artifactId>
 	<build>

diff --git a/nagios-status/pom.xml b/nagios-status/pom.xml
@@ -2,7 +2,7 @@
 	<parent>
 		<artifactId>cds-parent</artifactId>
 		<groupId>nl.ipo.cds</groupId>
-        <version>2.6</version>
+        <version>2.8</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>