Skip to content

Clean all poms. Same organization than H2GIS + remove process module #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ebocher merged 2 commits into from
Oct 12, 2026
Merged

Clean all poms. Same organization than H2GIS + remove process module #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
416ca88
Clean all poms. Same organization than H2GIS + remove process module
ebocher Oct 12, 2026
bc91a76
CHANGELOG.md
ebocher Oct 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/CI build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ jobs:
# Main build job used to
name: Build
runs-on: ubuntu-latest
services:
postgres:
image: postgis/postgis:16-3.4
env:
POSTGRES_USER: orbisgis
POSTGRES_PASSWORD: orbisgis
POSTGRES_DB: orbisgis_db
ports:
- 5432:5432
# needed because the postgres container does not provide a healthcheck
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
# Checkout the source code of the project
- name: Checkout
Expand All @@ -27,16 +38,6 @@ jobs:
distribution: 'temurin'
java-version: '11'

# Setup postgis test DB
- uses: SPalominos/PostGIS-Installer-Action@v1.0.1
with:
psql_version: '9.6'
pgis_version: '2.5'
docker_image: 'postgis/postgis'
db_password: 'orbisgis'
db_user: 'orbisgis'
db_name: 'orbisgis_db'

# Build the project using
# - clean : clean up the workspace
# - validate : perform different check like the dependency and plugin version update
Expand All @@ -62,4 +63,4 @@ jobs:
- if: steps.changes.outputs.changelog == 'false' && github.event_name != 'workflow_dispatch' && steps.changes.outputs.sources == 'true'
run: |
echo "Please update the Changelog.md file."
exit 1
exit 1
24 changes: 12 additions & 12 deletions .github/workflows/CI release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ jobs:
build:
name: Release and next iteration
runs-on: ubuntu-latest
services:
postgres:
image: postgis/postgis:16-3.4
env:
POSTGRES_USER: orbisgis
POSTGRES_PASSWORD: orbisgis
POSTGRES_DB: orbisgis_db
ports:
- 5432:5432
# needed because the postgres container does not provide a healthcheck
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
# Checkout the source code of the project
- name: Checkout
Expand All @@ -37,16 +48,6 @@ jobs:
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

# Setup postgis test DB
- uses: SPalominos/PostGIS-Installer-Action@v1.0.1
with:
psql_version: '9.6'
pgis_version: '2.5'
docker_image: 'postgis/postgis'
db_password: 'orbisgis'
db_user: 'orbisgis'
db_name: 'orbisgis_db'

# Configure git user in order to sign release with OrbisGIS user.
- name: Configure Git User
run: |
Expand Down Expand Up @@ -100,7 +101,6 @@ jobs:
git commit -a -m "Empty changelog."
git push origin master


# If the version change is a major or minor, create a branch from the previous tag for future revisions.
- name: Branch fork
run: |
Expand All @@ -117,4 +117,4 @@ jobs:
mvn versions:set -DnewVersion="${SPLIT0[0]}.${SPLIT0[1]}.$((${SPLIT0[2]}+1))-SNAPSHOT"
git commit -a -m "Set next version."
git push -u origin "$BRANCH"
fi
fi
27 changes: 14 additions & 13 deletions .github/workflows/CI snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI_snapshot

on:
push:
branches: [ '**' ]
branches: [ 'master' ]
workflow_run:
workflows: ["CI release"]
branches: [ '**' ]
Expand All @@ -14,6 +14,18 @@ jobs:
build:
name: Upload Snapshot
runs-on: ubuntu-latest
services:
postgres:
image: postgis/postgis:16-3.4
env:
# must specify password for PG Docker container image, see: https://registry.hub.docker.com/_/postgres?tab=description&page=1&name=10
POSTGRES_USER: orbisgis
POSTGRES_PASSWORD: orbisgis
POSTGRES_DB: orbisgis_db
ports:
- 5432:5432
# needed because the postgres container does not provide a healthcheck
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
steps:
# Checkout the source code of the project
- name: Checkout
Expand All @@ -40,21 +52,10 @@ jobs:
gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

# Setup postgis test DB
- uses: SPalominos/PostGIS-Installer-Action@v1.0.1
with:
psql_version: '9.6'
pgis_version: '2.5'
docker_image: 'postgis/postgis'
db_password: 'orbisgis'
db_user: 'orbisgis'
db_name: 'orbisgis_db'


# Deploy the snapshot
- name: Deploy
run: mvn deploy -ntp --batch-mode
env:
MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
8 changes: 0 additions & 8 deletions commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@
<name>commons</name>
<description>Library to manage OrbisData utilities</description>

<!-- Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>YYYY-MM-dd</maven.build.timestamp.format>
<buildNumber>${maven.build.timestamp}</buildNumber>
<site.basedir>${project.parent.basedir}</site.basedir>
</properties>

<!-- Dependencies -->
<dependencies>
<dependency>
Expand Down
48 changes: 0 additions & 48 deletions data/data-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,11 @@
<name>data-api</name>
<description>DATA API define extension point of OrbisData</description>

<!-- Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>YYYY-MM-dd</maven.build.timestamp.format>
<buildNumber>${maven.build.timestamp}</buildNumber>
<site.basedir>${project.parent.basedir}</site.basedir>
</properties>

<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
Expand Down Expand Up @@ -59,43 +50,4 @@
<artifactId>h2gis-utilities</artifactId>
</dependency>
</dependencies>

<!-- Build Settings -->
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
</project>
49 changes: 1 addition & 48 deletions data/dataframe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@
<name>dataframe</name>
<description>Library to manage dataframe</description>

<!-- Properties -->
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>YYYY-MM-dd</maven.build.timestamp.format>
<buildNumber>${maven.build.timestamp}</buildNumber>
<site.basedir>${project.parent.basedir}</site.basedir>
</properties>

<developers>
<developer>
<name>Erwan Bocher</name>
Expand All @@ -40,40 +32,31 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2-version}</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
<artifactId>commons</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.orbisgis.data</groupId>
<artifactId>data-api</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.orbisgis.data</groupId>
<artifactId>jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-sql</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-templates</artifactId>
<version>${groovy-version}</version>
</dependency>
<dependency>
<groupId>org.orbisgis</groupId>
Expand Down Expand Up @@ -106,47 +89,17 @@
<dependency>
<groupId>org.orbisgis.data</groupId>
<artifactId>h2gis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<!-- Build Settings -->
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>
</plugins>
</build>
</project>
</project>
Loading
Loading