to version 3.7.0

meteoinfo · Sep 2, 2023 · 80f1097 · 80f1097
1 parent 278c1b6
commit 80f1097
Show file tree

Hide file tree

Showing 20 changed files with 57 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ target/
 **/.settings/*
 .classpath
 .project
+.flattened-pom.xml
diff --git a/meteoinfo-chart/pom.xml b/meteoinfo-chart/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-common/pom.xml b/meteoinfo-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java b/meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
@@ -67,7 +67,7 @@ public class GlobalUtil {
      public static String getVersion(){
          String version = GlobalUtil.class.getPackage().getImplementationVersion();
          if (version == null || version.equals("")) {
-             version = "3.6.6";
+             version = "3.7.0";
          }
          return version;
      }

diff --git a/meteoinfo-console/pom.xml b/meteoinfo-console/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-data/pom.xml b/meteoinfo-data/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-dataframe/pom.xml b/meteoinfo-dataframe/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-geo/pom.xml b/meteoinfo-geo/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-geometry/pom.xml b/meteoinfo-geometry/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-image/pom.xml b/meteoinfo-image/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-lab/milconfig.xml b/meteoinfo-lab/milconfig.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <MeteoInfo File="milconfig.xml" Type="configurefile">
-  <Path OpenPath="D:\Working\MIScript\Jython\mis\toolbox\miml">
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\no_opengl"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
+  <Path OpenPath="D:\Working\MIScript\Jython\mis\io\radar">
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\surf"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\array\complex"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\volume"/>
@@ -11,24 +9,22 @@
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\geoshow"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
-    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox"/>
+    <RecentFolder Folder="D:\MyProgram\java\MeteoInfoDev\toolbox\meteoview3d"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml\classification"/>
     <RecentFolder Folder="D:\Working\MIScript\Jython\mis\toolbox\miml"/>
+    <RecentFolder Folder="D:\Working\MIScript\Jython\mis\io\radar"/>
   </Path>
   <File>
     <OpenedFiles>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_cma_base_grid_3d_geo_to_nc.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\io\radar\grid3d_to_nc.py"/>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\io\radar\test_plot_grid_3d_nc.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\dbscan_1.py"/>
     </OpenedFiles>
     <RecentFiles>
       <RecentFile File="D:\Working\MIScript\Jython\mis\io\radar\radar_cma_base_grid_3d_geo_to_nc.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\io\radar\grid3d_to_nc.py"/>
       <RecentFile File="D:\Working\MIScript\Jython\mis\io\radar\test_plot_grid_3d_nc.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\dbscan_1.py"/>
     </RecentFiles>
   </File>
   <Font>

diff --git a/meteoinfo-lab/pom.xml b/meteoinfo-lab/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.meteothink</groupId>
         <artifactId>MeteoInfo</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>meteoinfo-lab</artifactId>
     <packaging>jar</packaging>

diff --git a/meteoinfo-map/pom.xml b/meteoinfo-map/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.meteothink</groupId>
         <artifactId>MeteoInfo</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <artifactId>meteoinfo-map</artifactId>
     <packaging>jar</packaging>

diff --git a/meteoinfo-math/pom.xml b/meteoinfo-math/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-mkl/pom.xml b/meteoinfo-mkl/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.meteothink</groupId>
         <artifactId>MeteoInfo</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>meteoinfo-mkl</artifactId>

diff --git a/meteoinfo-ndarray/pom.xml b/meteoinfo-ndarray/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.meteothink</groupId>
         <artifactId>MeteoInfo</artifactId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-projection/pom.xml b/meteoinfo-projection/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-table/pom.xml b/meteoinfo-table/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/meteoinfo-ui/pom.xml b/meteoinfo-ui/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>MeteoInfo</artifactId>
         <groupId>org.meteothink</groupId>
-        <version>3.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.meteothink</groupId>
     <artifactId>MeteoInfo</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <packaging>pom</packaging>
 
     <parent>
@@ -34,7 +34,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
-        <revision>3.5-SNAPSHOT</revision>
+        <revision>3.7.0</revision>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.compiler.release>8</maven.compiler.release>
@@ -59,5 +59,37 @@
             <organization>Chinese Academy of Meteorological Sciences</organization>
         </developer>
     </developers>
+    <build>
+        <plugins>
+            <!-- add flatten-maven-plugin -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <inherited>true</inherited>
+                <configuration>
+                    <!-- avoid IDE recognizes .flattened-pom.xml as function module -->
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>