Merge branch 'master' into upgrade_deps

orbisgis · Nov 8, 2024 · 1eee8b4 · 1eee8b4
2 parents 2d50b2d + 7fc3f0f
commit 1eee8b4
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 36 deletions.
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>orbisdata</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>commons</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->

diff --git a/data/data-api/pom.xml b/data/data-api/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>data</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <groupId>org.orbisgis.data</groupId>
     <artifactId>data-api</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->

diff --git a/data/dataframe/pom.xml b/data/dataframe/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>data</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <groupId>org.orbisgis.data</groupId>
     <artifactId>dataframe</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->

diff --git a/data/h2gis/pom.xml b/data/h2gis/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>data</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <groupId>org.orbisgis.data</groupId>
     <artifactId>h2gis</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->

diff --git a/data/jdbc/pom.xml b/data/jdbc/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>data</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <groupId>org.orbisgis.data</groupId>
     <artifactId>jdbc</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->

diff --git a/data/pom.xml b/data/pom.xml
@@ -5,10 +5,10 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>orbisdata</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>data</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>data-api</module>

diff --git a/data/postgis/pom.xml b/data/postgis/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>data</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <groupId>org.orbisgis.data</groupId>
     <artifactId>postgis</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,10 +1,3 @@
-## Changelog for v2.1.1
+## Changelog for v2.1.2
 
-- Refactoring to manage data exceptions
-- Fix exception on script template
-- Standardizing method names
-- Update to H2GIS 2.2.2-SNAPSHOT
-- Use new sonatype auth
-- Upgrade many deps : H2, Groovy, Apache Common, JTS
-- Clean data API
-- Fix GitHub actions
+- Fix GitHub actions
diff --git a/docs/README.md b/docs/README.md
@@ -73,12 +73,7 @@ and add the desired module :
             <plugin>
                 <groupId>org.orbisgis</groupId>
                 <artifactId>data</artifactId>
-                <version>2.1.0</version>
-            </plugin>
-            <plugin>
-                <groupId>org.orbisgis</groupId>
-                <artifactId>process</artifactId>
-                <version>2.1.0</version>
+                <version>2.1.1</version>
             </plugin>
             ...
         </plugins>
@@ -91,10 +86,8 @@ and add the desired module :
 
 Using Grab annotation :
 ``` groovy
-@GrabResolver(name='orbisgis', root='https://oss.sonatype.org/content/repositories/snapshots/')
-@Grab(group='org.orbisgis.data', module='h2gis', version='2.1.0')
-@Grab(group='org.orbisgis.data', module='postgis', version='2.1.0')
-@Grab(group='org.orbisgis', module='process', version='2.1.0')
+@Grab(group='org.orbisgis.data', module='h2gis', version='2.1.1')
+@Grab(group='org.orbisgis.data', module='postgis', version='2.1.1')
 ```
 
 OrbisData encapsulates rows,columns from a database to a table or spatial table.

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.orbisgis</groupId>
     <artifactId>orbisdata</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>commons</module>

diff --git a/process/pom.xml b/process/pom.xml
@@ -6,10 +6,10 @@
     <parent>
         <groupId>org.orbisgis</groupId>
         <artifactId>orbisdata</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
+        <version>2.1.2-SNAPSHOT</version>
     </parent>
     <artifactId>process</artifactId>
-    <version>2.1.1-SNAPSHOT</version>
+    <version>2.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <!-- Properties -->