Skip to content

Commit

Permalink
Updated version to 2.26-SNAPSHOT and dependencies
Browse files Browse the repository at this point in the history 
Updated GeoTools dependency to 32-SNAPSHOT,
Updated GeoWebCache dependency to 1.26-SNAPSHOT
  • Loading branch information
@jodygarnett
jodygarnett committed Mar 2, 2024
1 parent c86b854 commit ea3c1d1
Show file tree
Hide file tree
Showing 258 changed files with 281 additions and 281 deletions.
8 changes: 4 additions & 4 deletions build/rename.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
ant -f release.xml -Dcurrent=2.17 -Drelease=2.18
-->
<tstamp/>
<property name="current" value="2.24"/>
<property name="release" value="2.25"/>
<property name="current" value="2.25"/>
<property name="release" value="2.26"/>

<target name="test">
<echo>current: ${current}</echo>
Expand All @@ -32,8 +32,8 @@
</replace>
<replace dir="..">
<include name="src/pom.xml"/>
<replacefilter token="30-SNAPSHOT" value="31-SNAPSHOT"/>
<replacefilter token="1.24-SNAPSHOT" value="1.25-SNAPSHOT"/>
<replacefilter token="31-SNAPSHOT" value="32-SNAPSHOT"/>
<replacefilter token="1.25-SNAPSHOT" value="1.26-SNAPSHOT"/>
</replace>
</target>

Expand Down
2 changes: 1 addition & 1 deletion doc/en/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<isset property="build.directory" />
</condition>

<condition property="project.version" value="${project.version}" else="2.25-SNAPSHOT">
<condition property="project.version" value="${project.version}" else="2.26-SNAPSHOT">
<isset property="project.version" />
</condition>

Expand Down
8 changes: 4 additions & 4 deletions doc/en/developer/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@
# other places throughout the built documents.
#
# The short X.Y version.
version = '2.25'
version = '2.26'

# The full version, including alpha/beta/rc tags.
release = '2.25-SNAPSHOT'
release = '2.26-SNAPSHOT'

# Used in build and documentation links
branch = '2.25.x'
branch = '2.26.x'

# Users don't need to see the "SNAPSHOT" notation when it's there
if release.find('SNAPSHOT') != -1:
release = '2.25.x'
release = '2.26.x'

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
4 changes: 2 additions & 2 deletions doc/en/developer/source/programming-guide/ows-services/hello/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version> <!-- change this to the proper GeoServer version -->
<version>2.26-SNAPSHOT</version> <!-- change this to the proper GeoServer version -->
</parent>

<groupId>org.geoserver</groupId>
Expand All @@ -22,7 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<dependency>
<groupId>org.geoserver</groupId>
<artifactId>gs-main</artifactId>
<version>2.25-SNAPSHOT</version> <!-- change this to the proper GeoServer version -->
<version>2.26-SNAPSHOT</version> <!-- change this to the proper GeoServer version -->
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions doc/en/docguide/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
# other places throughout the built documents.
#
# The short X.Y version.
version = '2.25'
version = '2.26'
# The full version, including alpha/beta/rc tags.
release = '2.25-SNAPSHOT'
release = '2.26-SNAPSHOT'
# Users don't need to see the "SNAPSHOT" notation when it's there
if release.find('SNAPSHOT') != -1:
release = '2.25.x'
release = '2.26.x'

# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
Expand Down
2 changes: 1 addition & 1 deletion doc/en/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>gs-docs</artifactId>
<groupId>org.geoserver.en</groupId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GeoServer English Documentation</name>
<description>GeoServer English documentation</description>
Expand Down
6 changes: 3 additions & 3 deletions doc/en/user/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# other places throughout the built documents.
#
# The replacement |version| provides short X.Y version.
version = '2.25'
version = '2.26'

# The relacement |release| provides the full version, including alpha/beta/rc tags.

Expand All @@ -58,7 +58,7 @@
# check environmental variable to see if ant build.xml passed in project.version
project_version = os.getenv("project.version")
if project_version == None:
release = '2.25-SNAPSHOT'
release = '2.26-SNAPSHOT'
else:
release = project_version

Expand All @@ -70,7 +70,7 @@
if release.find('SNAPSHOT') != -1:
tags.add('snapshot')
download = version+'.x'
release = '2.25.x'
release = '2.26.x'
latest = '-latest'
download_release = 'https://build.geoserver.org/geoserver/'+branch+'/geoserver-'+version+'.x-latest-%s.zip'
download_extension = 'https://build.geoserver.org/geoserver/'+branch+'/ext-latest/geoserver-'+version+'-SNAPSHOT-%s-plugin.zip'
Expand Down
2 changes: 1 addition & 1 deletion doc/zhCN/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>gs-docs</artifactId>
<groupId>org.geoserver.en</groupId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GeoServer Chinese Simplified Documentation</name>
<description>GeoServer Chinese Simplified documentation</description>
Expand Down
2 changes: 1 addition & 1 deletion src/community/app-schema/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/app-schema/webservice-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-app-schema-community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/backup-restore/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-backup-restore</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community.backuprestore</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/backup-restore/extension/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-backup-restore</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community.backuprestore</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/backup-restore/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/backup-restore/rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-backup-restore</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community.backuprestore</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/backup-restore/web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-backup-restore</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community.backuprestore</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/cog/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/colormap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/cov-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/datadir-catalog-loader/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/dds/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/dyndimension/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/elasticsearch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/features-templating/features-templating-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-features-templating</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/features-templating/features-templating-ogcapi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-features-templating</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/features-templating/features-templating-ows/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-features-templating</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/features-templating/features-templating-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-features-templating</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/features-templating/features-templating-web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-features-templating</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/features-templating/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/flatgeobuf/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/gdal/gdal-wcs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-gdal</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/gdal/gdal-wps/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-gdal</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/gdal/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/geomesa/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ application directory.
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/geopkg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-geopkg</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/gpxppio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>
<groupId>org.geoserver.community</groupId>
<artifactId>gs-gpxppio</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/community/graticule/pom.xml
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>
<!-- =========================================================== -->
<!-- Module Description -->
Expand Down
2 changes: 1 addition & 1 deletion src/community/gsr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.geoserver</groupId>
<artifactId>community</artifactId>
<version>2.25-SNAPSHOT</version>
<version>2.26-SNAPSHOT</version>
</parent>

<groupId>org.geoserver.community</groupId>
Expand Down
Loading

0 comments on commit ea3c1d1

Please sign in to comment.