Merge remote-tracking branch 'origin/master'

# Conflicts:
#	meteoinfo-lab/milconfig.xml
This commit is contained in:
wyq 2025-09-03 11:22:08 +08:00
commit 79f3d6c259
20 changed files with 30 additions and 5 deletions

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-chart</artifactId>
<name>meteoinfo-chart</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-common</artifactId>
<name>meteoinfo-common</name>
<dependencies>
<dependency>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-console</artifactId>
<name>meteoinfo-console</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-data</artifactId>
<name>meteoinfo-data</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-dataframe</artifactId>
<name>meteoinfo-dataframe</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-geo</artifactId>
<name>meteoinfo-geo</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-geometry</artifactId>
<name>meteoinfo-geometry</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-image</artifactId>
<name>meteoinfo-image</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
</parent>
<artifactId>meteoinfo-jython</artifactId>
<name>meteoinfo-jython</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -13,18 +13,18 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\interpolate"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\array\slice"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo\calc"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\lifted_index.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\precipitable_water.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\mixed_layer_cape_cin.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\meteo\calc\isentropic_analysis.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\lifted_index.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\precipitable_water.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\mixed_layer_cape_cin.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\meteo\calc\isentropic_analysis.py"/>
</RecentFiles>
</File>
<Font>

View File

@ -6,12 +6,16 @@
<artifactId>MeteoInfo</artifactId>
<version>${revision}</version>
</parent>
<artifactId>meteoinfo-lab</artifactId>
<name>meteoinfo-lab</name>
<packaging>jar</packaging>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>

View File

@ -6,8 +6,11 @@
<artifactId>MeteoInfo</artifactId>
<version>${revision}</version>
</parent>
<artifactId>meteoinfo-map</artifactId>
<name>meteoinfo-map</name>
<packaging>jar</packaging>
<dependencies>
<!--<dependency>
<groupId>com.sun.woodstock.dependlibs</groupId>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-math</artifactId>
<name>meteoinfo-math</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
</parent>
<artifactId>meteoinfo-mkl</artifactId>
<name>meteoinfo-mkl</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-ndarray</artifactId>
<name>meteoinfo-ndarray</name>
<packaging>jar</packaging>
<properties>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-projection</artifactId>
<name>meteoinfo-projection</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-render2d</artifactId>
<name>meteoinfo-render2d</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-table</artifactId>
<name>meteoinfo-table</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -10,6 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>meteoinfo-ui</artifactId>
<name>meteoinfo-ui</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>

View File

@ -5,6 +5,8 @@
<artifactId>MeteoInfo</artifactId>
<name>MeteoInfo</name>
<version>${revision}</version>
<description>GIS, Scientific computation and visualization platform</description>
<url>https://github.com/meteoinfo/MeteoInfo</url>
<packaging>pom</packaging>
<parent>