mirror of
https://github.com/geoserver/geoserver-cloud.git
synced 2024-10-23 09:24:15 +08:00
Remove geoserver submodule
This commit is contained in:
Gabriel Roldan
parent
4d5ba69eba
commit
49d573873f
4
.github/workflows/build-and-push.yaml
vendored
4
.github/workflows/build-and-push.yaml
vendored
@ -41,10 +41,6 @@ jobs:
|
||||
- name: Validate source code formatting
|
||||
run: make lint
|
||||
|
||||
- name: Build customized GeoServer version
|
||||
run: |
|
||||
make deps
|
||||
|
||||
- name: Build without tests
|
||||
run: |
|
||||
make install
|
||||
|
||||
4
.github/workflows/build.yaml
vendored
4
.github/workflows/build.yaml
vendored
@ -33,10 +33,6 @@ jobs:
|
||||
- name: Validate source code formatting
|
||||
run: make lint
|
||||
|
||||
- name: Build customized GeoServer version
|
||||
run: |
|
||||
make deps
|
||||
|
||||
- name: Build and test
|
||||
run: |
|
||||
make install test
|
||||
|
||||
4
.github/workflows/pull-request.yaml
vendored
4
.github/workflows/pull-request.yaml
vendored
@ -31,10 +31,6 @@ jobs:
|
||||
- name: Validate source code formatting
|
||||
run: make lint
|
||||
|
||||
- name: Build customized GeoServer version
|
||||
run: |
|
||||
make deps
|
||||
|
||||
- name: Build without tests
|
||||
run: |
|
||||
make install
|
||||
|
||||
4
.github/workflows/sonarcloud.yaml
vendored
4
.github/workflows/sonarcloud.yaml
vendored
@ -40,10 +40,6 @@ jobs:
|
||||
key: ${{ runner.os }}-sonar
|
||||
restore-keys: ${{ runner.os }}-sonar
|
||||
|
||||
- name: Build customized GeoServer version
|
||||
run: |
|
||||
make deps
|
||||
|
||||
- name: Analyze with Sonar
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
|
||||
|
||||
5
.gitmodules
vendored
5
.gitmodules
vendored
@ -2,8 +2,3 @@
|
||||
path = config
|
||||
url = https://github.com/geoserver/geoserver-cloud-config
|
||||
branch = master
|
||||
[submodule "geoserver"]
|
||||
path = geoserver_submodule/geoserver
|
||||
url = https://github.com/camptocamp/geoserver.git
|
||||
branch = gscloud/2.24.1/integration
|
||||
shallow = true
|
||||
|
||||
7
Makefile
7
Makefile
@ -1,17 +1,14 @@
|
||||
all: deps install test build-image
|
||||
all: install test build-image
|
||||
|
||||
# run `make build-image[-*] SKIP_PUSH=false` to push the images to dockerhub
|
||||
SKIP_PUSH?="true"
|
||||
|
||||
lint:
|
||||
./mvnw sortpom:verify fmt:check -ntp
|
||||
./mvnw fmt:check sortpom:verify -Dsort.verifyFailOn=strict -Dsort.verifyFail=stop -ntp
|
||||
|
||||
format:
|
||||
./mvnw sortpom:sort fmt:format -ntp
|
||||
|
||||
deps:
|
||||
./mvnw -U -f geoserver_submodule/ clean install -DskipTests -ntp -T4
|
||||
|
||||
install:
|
||||
./mvnw clean install -DskipTests -ntp -T4 -U
|
||||
|
||||
|
||||
13
README.md
13
README.md
@ -108,18 +108,11 @@ make test
|
||||
|
||||
*GeoServer Cloud* depends on a custom GeoServer branch, `gscloud/gs_version/integration`, which contains patches to upstream GeoServer that have not yet been integrated into the mainstream `main` branch.
|
||||
|
||||
Additionally, this branch changes the artifact versions from `2.23-SNAPSHOT` to `2.23.0-CLOUD`, to avoid confusing maven if you also work with vanilla GeoServer, and to avoid your IDE downloading the latest `2.23-SNAPSHOT` artifacts from the OsGeo maven repository, overriding your local maven repository ones, and having confusing compilation errors that would require re-building the branch we need.
|
||||
Additionally, this branch changes the artifact versions (e.g. from `2.23-SNAPSHOT` to `2.23.0-CLOUD`), to avoid confusing maven if you also work with vanilla GeoServer, and to avoid your IDE downloading the latest `2.23-SNAPSHOT` artifacts from the OsGeo maven repository, overriding your local maven repository ones, and having confusing compilation errors that would require re-building the branch we need.
|
||||
|
||||
The `gscloud/gs_version/integration` branch is checked out as a submodule under the `geoserver_submodule/geoserver` directory.
|
||||
The `gscloud/gs_version/integration` branch is checked out as a submodule on the (camptocamp/geoserver-cloud-geoserver)[https://github.com/camptocamp/geoserver-cloud-geoserver] repository, which publishes the custom geoserver maven artifacts to the Github maven package registry.
|
||||
|
||||
The root `pom.xml` defines a `geoserver` maven profile, active by default, that includes the module `geoserver_submodule`, which in turn includes all the required `geoserver` modules for this project.
|
||||
|
||||
So in general, you may choose to only eventually build the `geoserver_submodule` subproject, since it won't change
|
||||
frequently, with
|
||||
|
||||
```bash
|
||||
make deps
|
||||
```
|
||||
The root pom adds this additional maven repository, so no further action is required for the geoserver-cloud build to use those dependencies.
|
||||
|
||||
### Build the docker images
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 20a2b930b10df39f9255ac227ccac866c31d3b1f
|
||||
@ -1,30 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.geoserver.cloud</groupId>
|
||||
<artifactId>gs-upstream</artifactId>
|
||||
<version>2.24.1-CLOUD</version>
|
||||
<packaging>pom</packaging>
|
||||
<name>GeoServer upstream dependencies</name>
|
||||
<modules>
|
||||
<!-- modules modified in the geoserver-cloud_integration branch -->
|
||||
<module>geoserver/src</module>
|
||||
<module>geoserver/src/community/jdbcconfig</module>
|
||||
<module>geoserver/src/community/jdbcstore</module>
|
||||
<module>geoserver/src/community/pgraster</module>
|
||||
<module>geoserver/src/community/datadir-catalog-loader</module>
|
||||
<!-- all other required deps -->
|
||||
<module>geoserver/src/extension/authkey</module>
|
||||
<module>geoserver/src/extension/web-resource</module>
|
||||
<module>geoserver/src/extension/css</module>
|
||||
<module>geoserver/src/extension/feature-pregeneralized</module>
|
||||
<module>geoserver/src/extension/gwc-s3</module>
|
||||
<module>geoserver/src/extension/mbstyle</module>
|
||||
<module>geoserver/src/extension/vectortiles</module>
|
||||
<module>geoserver/src/extension/wps</module>
|
||||
<module>geoserver/src/extension/importer</module>
|
||||
<module>geoserver/src/community/flatgeobuf</module>
|
||||
<module>geoserver/src/community/gwc-azure-blob</module>
|
||||
<module>geoserver/src/community/cog</module>
|
||||
</modules>
|
||||
</project>
|
||||
12
pom.xml
12
pom.xml
@ -209,7 +209,18 @@
|
||||
<name>Maven Central</name>
|
||||
<url>https://repo.maven.apache.org/maven2</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
<id>geoserver-github-packages</id>
|
||||
<name>Customized Geoserver Packages</name>
|
||||
<?SORTPOM IGNORE?>
|
||||
<url>https://public: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@maven.pkg.github.com/camptocamp/geoserver-cloud-geoserver</url>
|
||||
<?SORTPOM RESUME?>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
@ -241,6 +252,7 @@
|
||||
<nrOfIndentSpace>2</nrOfIndentSpace>
|
||||
<verifyFail>stop</verifyFail>
|
||||
<verifyFailOn>strict</verifyFailOn>
|
||||
<skip>${fmt.skip}</skip>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user