start of 2.21-SNAPSHOT development

martin-boettcher · martin-boettcher · commit ebf3e997c358 · 2021-03-29T14:11:42.000+02:00
diff --git a/HowToDeploy.txt b/HowToDeploy.txt
@@ -52,8 +52,8 @@ tar cvzf calvalus-src-$(date +%Y-%m-%d).tgz  --exclude .git --exclude target cal
 ===========================================================================
 Calvalus
 --------
-java -jar calvalus-distribution/target/cpt.jar -e --uninstall calvalus-2.20
-java -jar calvalus-distribution/target/cpt.jar -e --deploy  calvalus-distribution/target/calvalus-bundle/*.jar calvalus-2.20
+java -jar calvalus-distribution/target/cpt.jar -e --uninstall calvalus-2.21-SNAPSHOT
+java -jar calvalus-distribution/target/cpt.jar -e --deploy  calvalus-distribution/target/calvalus-bundle/*.jar calvalus-2.21-SNAPSHOT
 
 for lc-cci
 ----------
@@ -105,8 +105,8 @@ java -jar calvalus-distribution/target/cpt.jar -e --calvalus calvalus-2.4-fex /h
 ===========================================================================
 Portal Software
 -------------------
-java -jar calvalus-distribution/target/cpt.jar -e --uninstall calvalus-2.20
-java -jar calvalus-distribution/target/cpt.jar -e --deploy  calvalus-distribution/target/calvalus-bundle/*.jar calvalus-2.20
+java -jar calvalus-distribution/target/cpt.jar -e --uninstall calvalus-2.21-SNAPSHOT
+java -jar calvalus-distribution/target/cpt.jar -e --deploy  calvalus-distribution/target/calvalus-bundle/*.jar calvalus-2.21-SNAPSHOT
 java -jar calvalus-distribution/target/cpt.jar -e --uninstall beam-5.0.1
 java -jar calvalus-distribution/target/cpt.jar -e --deploy  calvalus-distribution/target/beam-bundle/*.jar beam-5.0.1
 
diff --git a/calvalus-commons/pom.xml b/calvalus-commons/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-commons</artifactId>
diff --git a/calvalus-distribution/pom.xml b/calvalus-distribution/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-distribution</artifactId>
diff --git a/calvalus-distribution/src/main/resources/INSTALL.txt b/calvalus-distribution/src/main/resources/INSTALL.txt
@@ -34,7 +34,7 @@ java -jar cpt.jar --help
 The remaining step is to install the SNAP and the Calvalus bundle into the HDFS:
 
 java -jar cpt.jar --deploy snap-bundle/*.jar snap-2.0.0
-java -jar cpt.jar --deploy calvalus-bundle/*.jar calvalus-2.20
+java -jar cpt.jar --deploy calvalus-bundle/*.jar calvalus-2.21-SNAPSHOT
 
 Whereas the name of the SNAP and Calvalus bundle are given in the "calvalus.hadoop.calvalus.calvalus.bundle" and
 the "calvalus.hadoop.calvalus.snap.bundle" configuration property.
diff --git a/calvalus-distribution/src/main/resources/calvalus.config b/calvalus-distribution/src/main/resources/calvalus.config
@@ -22,7 +22,7 @@ calvalus.hadoop.yarn.client.failover-proxy-provider = org.apache.hadoop.yarn.cli
 calvalus.hadoop.mapred.job.priority = VERY_HIGH
 
 # Calvalus software bundle "calvalus.calvalus.bundle"
-calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.20
+calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.21-SNAPSHOT
 
 # SNAP software bundle "calvalus.snap.bundle"
 calvalus.hadoop.calvalus.snap.bundle = snap-2.0.0
diff --git a/calvalus-examples/pom.xml b/calvalus-examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-examples</artifactId>
diff --git a/calvalus-exchange/pom.xml b/calvalus-exchange/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-exchange</artifactId>
diff --git a/calvalus-inventory/pom.xml b/calvalus-inventory/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-inventory</artifactId>
diff --git a/calvalus-portal/pom.xml b/calvalus-portal/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-portal</artifactId>
diff --git a/calvalus-portal/src/main/webapp-calfin-patch/config/calvalus.properties b/calvalus-portal/src/main/webapp-calfin-patch/config/calvalus.properties
@@ -71,7 +71,7 @@ calvalus.hadoop.mapreduce.jobhistory.webapp.address = master:19888
 calvalus.hadoop.mapreduce.map.failures.maxpercent = 5
 
 # Calvalus software bundle "calvalus.calvalus.bundle"
-calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.20
+calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.21-SNAPSHOT
 
 # SNAP software bundle "calvalus.snap.bundle"
 calvalus.hadoop.calvalus.snap.bundle = snap-5.0
diff --git a/calvalus-portal/src/main/webapp-calopus-patch/config/calvalus.properties b/calvalus-portal/src/main/webapp-calopus-patch/config/calvalus.properties
@@ -53,7 +53,7 @@ calvalus.hadoop.fs.defaultFS = hdfs://cvmaster:9000
 calvalus.hadoop.mapreduce.job.priority = HIGH
 
 # Calvalus software bundle "calvalus.calvalus.bundle"
-calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.20
+calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.21-SNAPSHOT
 
 # SNAP software bundle "calvalus.snap.bundle"
 calvalus.hadoop.calvalus.snap.bundle = snap-8.0.0-SNAPSHOT
diff --git a/calvalus-portal/src/main/webapp/config/calvalus.properties b/calvalus-portal/src/main/webapp/config/calvalus.properties
@@ -40,7 +40,7 @@ calvalus.hadoop.mapreduce.jobhistory.webapp.address = master00:19888
 #calvalus.hadoop.mapreduce.job.priority = HIGH
 
 # Calvalus software bundle "calvalus.calvalus.bundle"
-calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.20
+calvalus.hadoop.calvalus.calvalus.bundle = calvalus-2.21-SNAPSHOT
 
 # SNAP software bundle "calvalus.snap.bundle"
 calvalus.hadoop.calvalus.snap.bundle = snap-8.0.0-SNAPSHOT
diff --git a/calvalus-processing/pom.xml b/calvalus-processing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-processing</artifactId>
diff --git a/calvalus-processing/src/main/java/com/bc/calvalus/processing/hadoop/HadoopProcessingService.java b/calvalus-processing/src/main/java/com/bc/calvalus/processing/hadoop/HadoopProcessingService.java
@@ -73,7 +73,7 @@
 public class HadoopProcessingService implements ProcessingService<JobID> {
 
     public static final String CALVALUS_SOFTWARE_PATH = "/calvalus/software/1.0";
-    public static final String DEFAULT_CALVALUS_BUNDLE = "calvalus-2.20";
+    public static final String DEFAULT_CALVALUS_BUNDLE = "calvalus-2.21-SNAPSHOT";
     public static final String DEFAULT_SNAP_BUNDLE = "snap-8.0.0-SNAPSHOT";
     public static final String BUNDLE_DESCRIPTOR_XML_FILENAME = "bundle-descriptor.xml";
     private static final long CACHE_RETENTION = 30 * 1000;
diff --git a/calvalus-production/pom.xml b/calvalus-production/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-production</artifactId>
diff --git a/calvalus-production/src/main/java/com/bc/calvalus/production/cli/ProductionTool.java b/calvalus-production/src/main/java/com/bc/calvalus/production/cli/ProductionTool.java
@@ -110,7 +110,7 @@
  *  -c,--config &lt;FILE&gt;     The Calvalus configuration file (Java properties
  *                         format). Defaults to 'C:\Users\Norman\.calvalus\calvalus.config'.
  *  -C,--calvalus &lt;NAME&gt;   The name of the Calvalus software bundle used for
- *                         the production. Defaults to 'calvalus-2.20'
+ *                         the production. Defaults to 'calvalus-2.21-SNAPSHOT'
  *     --copy &lt;FILES&gt;      Copies FILES to '/calvalus/home/&lt;user&gt;' before the
  *                         request is executed.Use the colon ':' to separate paths in FILES.
  *     --deploy &lt;FILES&gt;    Deploys FILES to the Calvalus bundle before the
diff --git a/calvalus-reporting/pom.xml b/calvalus-reporting/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>calvalus</artifactId>
         <groupId>com.bc.calvalus</groupId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/calvalus-rest/pom.xml b/calvalus-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>calvalus</artifactId>
         <groupId>com.bc.calvalus</groupId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/calvalus-snap/pom.xml b/calvalus-snap/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.bc.calvalus</groupId>
         <artifactId>calvalus</artifactId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
 
     <artifactId>calvalus-snap</artifactId>
diff --git a/calvalus-wps-impl/pom.xml b/calvalus-wps-impl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>calvalus</artifactId>
         <groupId>com.bc.calvalus</groupId>
-        <version>2.20</version>
+        <version>2.21-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -4,15 +4,15 @@
 
     <groupId>com.bc.calvalus</groupId>
     <artifactId>calvalus</artifactId>
-    <version>2.20</version>
+    <version>2.21-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Calvalus</name>
     <description>Calvalus root module</description>
 
     <properties>
         <hadoop.version>3.2.1-BC</hadoop.version>
-        <calvalus.version>2.20</calvalus.version>
+        <calvalus.version>2.21-SNAPSHOT</calvalus.version>
         <bc-wps.version>1.2</bc-wps.version>
         <snap.version>8.0.3.1cv</snap.version>
         <s1tbx.version>8.0.1cv</s1tbx.version>
