GeoServer/web_core @ OSGeo Weblate

Language	Translated	Unfinished	Unfinished words	Unfinished characters	Untranslated	Checks	Suggestions	Comments
English GPL-2.0		0	0	0	0	650	0	0

Catalan GPL-2.0	48%	525	2,629	16,908	525	23	0	0

Chinese (Simplified) GPL-2.0	69%	312	1,545	10,046	312	67	0	0

Czech GPL-2.0	73%	266	1,218	7,943	266	31	0	0

Danish GPL-2.0	34%	672	3,385	21,733	672	12	0	0

Dutch GPL-2.0	76%	237	1,118	7,275	237	49	0	0

French GPL-2.0	98%	19	87	676	19	48	0	0

German GPL-2.0	67%	330	1,852	12,000	330	61	0	0

Greek GPL-2.0	57%	431	2,274	14,600	431	224	0	0

Hungarian GPL-2.0	54%	464	2,493	16,007	464	375	0	0

Italian GPL-2.0	14%	872	3,945	25,157	872	5	0	0

Japanese GPL-2.0	68%	325	1,742	11,254	325	56	0	0

Korean GPL-2.0	97%	25	106	771	25	82	0	0

Lithuanian GPL-2.0	62%	381	1,971	12,715	381	49	0	0

Norwegian Bokmål GPL-2.0	59%	411	2,242	14,429	411	350	0	0

Polish GPL-2.0	65%	354	1,888	12,164	354	205	0	0

Portuguese GPL-2.0	29%	724	3,641	23,198	724	7	0	0

Portuguese (Brazil) GPL-2.0	64%	359	1,964	12,605	359	64	0	0

Romanian GPL-2.0	95%	44	225	1,521	44	36	0	0

Russian GPL-2.0	93%	65	342	2,268	65	59	0	0

Spanish GPL-2.0	80%	202	1,062	6,959	202	45	0	0

Swedish GPL-2.0	70%	296	2,149	13,775	296	26	0	0

Turkish GPL-2.0	76%	239	1,364	8,904	239	52	0	0

Please sign in to see the alerts.

Overview

Project website	geoserver.org
Project maintainers	bot-geoserver-geoserver-wls alexgacon
Translation license	GNU General Public License v2.0 or later
Translation process	Translations can be made directly. Translation suggestions can be made. Only chosen users can contribute. The translation uses monolingual files. The translation base language can not be edited.
File mask	`src/web/core/src/main/resources/GeoServerApplication_*.properties`
Monolingual base language file	`src/web/core/src/main/resources/GeoServerApplication.properties`

String statistics

	Strings percent	Hosted strings	Words percent	Hosted words	Characters percent	Hosted characters
Total		23,460		95,979		610,236
Source		1,020		4,173		26,532
Translated	67%	15,907	59%	56,737	58%	357,328
Needs editing	0%	0	0%	0	0%	0
Read-only	4%	1,020	4%	4,173	4%	26,532
Failing checks	10%	2,576	13%	13,427	13%	85,197
Strings with suggestions	0%	0	0%	0	0%	0
Untranslated strings	32%	7,553	40%	39,242	41%	252,908

Last 12 months Previous

Activity in last 12 months


Jun	Jul	Aug	Sep	Oct	Nov	Dec	Jan	Feb	Mar	Apr	May

Quick numbers

95,979

Hosted words

23,460

Hosted strings

67%

Translated

Contributors

and previous 30 days

Trends of last 30 days

—

Hosted words

—

Hosted strings

—

Translated

—

Contributors

—

Search

Advanced query builder

Query examples

Review strings changed by other users	`changed:>=2023-05-08 AND NOT changed_by:anonymous`	Add
Translated strings	`state:>=translated`	Add
Strings with comments	`has:comment`	Add
Strings with any failing checks	`has:check`	Add
Strings with suggestions from others	`has:suggestion AND NOT suggestion_author:anonymous`	Add
Approved strings with suggestions	`state:approved AND has:suggestion`	Add
All untranslated strings added the past month	`added:>=2023-05-08 AND state:<=needs-editing`	Add
Translated strings in a certain language	`is:translated AND language:en`	Add

None New alert GeoServer / web_core	Broken project website URL 3 months ago
alexgacon Component unlocked GeoServer / web_core	Component unlocked 6 months ago
alexgacon Failed rebase on repository GeoServer / web_core	Rebasing (1/1) warning: Cannot merge binary files: doc/en/user/source/extensions/geofence-server/images/tutorial_rulespage1.png (HEAD vs. 8d1b92798f (Remove duplicate chinese translation for weblate compatibility)) warning: Cannot merge binary files: doc/en/user/source/extensions/geofence-server/images/rulespage.png (HEAD vs. 8d1b92798f (Remove duplicate chinese translation for weblate compatibility)) warning: Cannot merge binary files: doc/en/user/source/extensions/geofence-server/images/rulepage.png (HEAD vs. 8d1b92798f (Remove duplicate chinese translation for weblate compatibility)) CONFLICT (add/add): Merge conflict in src/wms/pom.xml Auto-merging src/wms/pom.xml CONFLICT (add/add): Merge conflict in src/wfs/src/test/java/org/geoserver/wfs/xml/FeatureTypeInfoSchemaBuilderTest.java Auto-merging src/wfs/src/test/java/org/geoserver/wfs/xml/FeatureTypeInfoSchemaBuilderTest.java CONFLICT (add/add): Merge conflict in src/wfs/src/test/java/org/geoserver/wfs/GetCapabilitiesTest.java Auto-merging src/wfs/src/test/java/org/geoserver/wfs/GetCapabilitiesTest.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/org/geoserver/wfs/xml/FeatureTypeSchemaBuilder.java Auto-merging src/wfs/src/main/java/org/geoserver/wfs/xml/FeatureTypeSchemaBuilder.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/org/geoserver/wfs/json/GeoJSONGetFeatureResponse.java Auto-merging src/wfs/src/main/java/org/geoserver/wfs/json/GeoJSONGetFeatureResponse.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/org/geoserver/wfs/WFSXStreamLoader.java Auto-merging src/wfs/src/main/java/org/geoserver/wfs/WFSXStreamLoader.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/org/geoserver/wfs/WFSInfoImpl.java Auto-merging src/wfs/src/main/java/org/geoserver/wfs/WFSInfoImpl.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/org/geoserver/wfs/WFSInfo.java Auto-merging src/wfs/src/main/java/org/geoserver/wfs/WFSInfo.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/org/geoserver/wfs/CapabilitiesTransformer.java Auto-merging src/wfs/src/main/java/org/geoserver/wfs/CapabilitiesTransformer.java CONFLICT (add/add): Merge conflict in src/wfs/src/main/java/applicationContext.xml Auto-merging src/wfs/src/main/java/applicationContext.xml CONFLICT (add/add): Merge conflict in src/wfs/pom.xml Auto-merging src/wfs/pom.xml CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_zh.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_zh.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_vi.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_vi.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_sv.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_sv.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_ru.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_ru.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_pt.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_pt.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_ja.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_ja.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_it.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_it.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_hu.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_hu.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_fi.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_fi.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_es.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_el.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_el.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_de.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_da.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_da.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_cs.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_cs.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/resources/GeoServerApplication_ca.properties Auto-merging src/web/wms/src/main/resources/GeoServerApplication_ca.properties CONFLICT (add/add): Merge conflict in src/web/wms/src/main/java/org/geoserver/wms/web/WMSServiceDescriptionProvider.java Auto-merging src/web/wms/src/main/java/org/geoserver/wms/web/WMSServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/web/wms/pom.xml Auto-merging src/web/wms/pom.xml CONFLICT (add/add): Merge conflict in src/web/wfs/src/test/java/org/geoserver/wfs/web/WFSAdminPageTest.java Auto-merging src/web/wfs/src/test/java/org/geoserver/wfs/web/WFSAdminPageTest.java CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_zh_TW.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_zh_TW.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_zh.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_zh.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_sv.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_sv.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_sl.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_sl.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_ru.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_ru.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_pt.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_pt.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_ko.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_ko.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_ja.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_ja.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_it.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_it.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_id.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_id.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_hu.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_hu.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_fr.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_fr.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_es.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_el.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_el.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_de.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_da.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_da.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_cs.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_cs.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication_ca.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication_ca.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/resources/GeoServerApplication.properties Auto-merging src/web/wfs/src/main/resources/GeoServerApplication.properties CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/java/org/geoserver/wfs/web/WFSServiceDescriptionProvider.java Auto-merging src/web/wfs/src/main/java/org/geoserver/wfs/web/WFSServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/java/org/geoserver/wfs/web/WFSAdminPage.java Auto-merging src/web/wfs/src/main/java/org/geoserver/wfs/web/WFSAdminPage.java CONFLICT (add/add): Merge conflict in src/web/wfs/src/main/java/org/geoserver/wfs/web/WFSAdminPage.html Auto-merging src/web/wfs/src/main/java/org/geoserver/wfs/web/WFSAdminPage.html CONFLICT (add/add): Merge conflict in src/web/wfs/pom.xml Auto-merging src/web/wfs/pom.xml CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_zh.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_zh.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_sv.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_sv.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_sl.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_sl.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_ru.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_ru.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_pt.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_pt.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_ja.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_ja.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_it.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_it.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_hu.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_hu.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_es.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_el.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_el.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_de.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_cs.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_cs.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/resources/GeoServerApplication_ca.properties Auto-merging src/web/wcs/src/main/resources/GeoServerApplication_ca.properties CONFLICT (add/add): Merge conflict in src/web/wcs/src/main/java/org/geoserver/wcs/web/WCSServiceDescriptionProvider.java Auto-merging src/web/wcs/src/main/java/org/geoserver/wcs/web/WCSServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/web/wcs/pom.xml Auto-merging src/web/wcs/pom.xml CONFLICT (add/add): Merge conflict in src/web/security/pom.xml Auto-merging src/web/security/pom.xml CONFLICT (add/add): Merge conflict in src/web/security/ldap/pom.xml Auto-merging src/web/security/ldap/pom.xml CONFLICT (add/add): Merge conflict in src/web/security/jdbc/pom.xml Auto-merging src/web/security/jdbc/pom.xml CONFLICT (add/add): Merge conflict in src/web/security/core/pom.xml Auto-merging src/web/security/core/pom.xml CONFLICT (add/add): Merge conflict in src/web/rest/src/main/java/org/geoserver/web/RESTServiceDescriptionProvider.java Auto-merging src/web/rest/src/main/java/org/geoserver/web/RESTServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/web/rest/pom.xml Auto-merging src/web/rest/pom.xml CONFLICT (add/add): Merge conflict in src/web/pom.xml Auto-merging src/web/pom.xml CONFLICT (add/add): Merge conflict in src/web/gwc/src/test/java/org/geoserver/gwc/web/GWCServiceLinksTest.java Auto-merging src/web/gwc/src/test/java/org/geoserver/gwc/web/GWCServiceLinksTest.java CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_es.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_el.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_el.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/resources/GeoServerApplication_de.properties Auto-merging src/web/gwc/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/web/gwc/src/main/java/org/geoserver/gwc/web/GWCServiceDescriptionProvider.java Auto-merging src/web/gwc/src/main/java/org/geoserver/gwc/web/GWCServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/web/gwc/pom.xml Auto-merging src/web/gwc/pom.xml CONFLICT (add/add): Merge conflict in src/web/demo/pom.xml Auto-merging src/web/demo/pom.xml CONFLICT (add/add): Merge conflict in src/web/core/src/test/java/org/geoserver/web/data/layer/SqlViewEditPageTest.java Auto-merging src/web/core/src/test/java/org/geoserver/web/data/layer/SqlViewEditPageTest.java CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_zh.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_zh.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_sv.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_sv.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_ru.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_ru.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_pt.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_pt.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_no.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_no.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_ko.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_ko.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_ja.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_ja.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_hu.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_hu.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_fr.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_fr.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_es.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_el.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_el.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_de.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_da.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_da.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_cs.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_cs.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/resources/GeoServerApplication_ca.properties Auto-merging src/web/core/src/main/resources/GeoServerApplication_ca.properties CONFLICT (add/add): Merge conflict in src/web/core/src/main/java/org/geoserver/web/data/layer/SQLViewAbstractPage.java Auto-merging src/web/core/src/main/java/org/geoserver/web/data/layer/SQLViewAbstractPage.java CONFLICT (add/add): Merge conflict in src/web/core/src/main/java/org/geoserver/web/ServiceDescriptionProvider.java Auto-merging src/web/core/src/main/java/org/geoserver/web/ServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/web/core/pom.xml Auto-merging src/web/core/pom.xml CONFLICT (add/add): Merge conflict in src/web/app/pom.xml Auto-merging src/web/app/pom.xml CONFLICT (add/add): Merge conflict in src/wcs2_0/src/test/java/org/geoserver/wcs2_0/kvp/GetCoverageKvpTest.java Auto-merging src/wcs2_0/src/test/java/org/geoserver/wcs2_0/kvp/GetCoverageKvpTest.java CONFLICT (add/add): Merge conflict in src/wcs2_0/src/test/java/org/geoserver/wcs2_0/WCSTestSupport.java Auto-merging src/wcs2_0/src/test/java/org/geoserver/wcs2_0/WCSTestSupport.java CONFLICT (add/add): Merge conflict in src/wcs2_0/src/main/java/org/geoserver/wcs2_0/WCSEnvelope.java Auto-merging src/wcs2_0/src/main/java/org/geoserver/wcs2_0/WCSEnvelope.java CONFLICT (add/add): Merge conflict in src/wcs2_0/src/main/java/org/geoserver/wcs2_0/GetCoverage.java Auto-merging src/wcs2_0/src/main/java/org/geoserver/wcs2_0/GetCoverage.java CONFLICT (add/add): Merge conflict in src/wcs2_0/pom.xml Auto-merging src/wcs2_0/pom.xml CONFLICT (add/add): Merge conflict in src/wcs1_1/pom.xml Auto-merging src/wcs1_1/pom.xml CONFLICT (add/add): Merge conflict in src/wcs1_0/pom.xml Auto-merging src/wcs1_0/pom.xml CONFLICT (add/add): Merge conflict in src/wcs/pom.xml Auto-merging src/wcs/pom.xml CONFLICT (add/add): Merge conflict in src/security/security-tests/src/test/java/org/geoserver/security/impl/SecureCatalogImplTest.java Auto-merging src/security/security-tests/src/test/java/org/geoserver/security/impl/SecureCatalogImplTest.java CONFLICT (add/add): Merge conflict in src/security/security-tests/pom.xml Auto-merging src/security/security-tests/pom.xml CONFLICT (add/add): Merge conflict in src/security/pom.xml Auto-merging src/security/pom.xml CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_zh.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_zh.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_sv.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_sv.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_ru.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_ru.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_pt.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_pt.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_ja.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_ja.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_it.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_it.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_es.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_de.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_da.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_da.properties CONFLICT (add/add): Merge conflict in src/security/ldap/src/main/resources/GeoServerApplication_cs.properties Auto-merging src/security/ldap/src/main/resources/GeoServerApplication_cs.properties CONFLICT (add/add): Merge conflict in src/security/ldap/pom.xml Auto-merging src/security/ldap/pom.xml CONFLICT (add/add): Merge conflict in src/security/jdbc/pom.xml Auto-merging src/security/jdbc/pom.xml CONFLICT (add/add): Merge conflict in src/restconfig/pom.xml Auto-merging src/restconfig/pom.xml CONFLICT (add/add): Merge conflict in src/restconfig-wmts/pom.xml Auto-merging src/restconfig-wmts/pom.xml CONFLICT (add/add): Merge conflict in src/restconfig-wms/pom.xml Auto-merging src/restconfig-wms/pom.xml CONFLICT (add/add): Merge conflict in src/restconfig-wfs/pom.xml Auto-merging src/restconfig-wfs/pom.xml CONFLICT (add/add): Merge conflict in src/restconfig-wcs/pom.xml Auto-merging src/restconfig-wcs/pom.xml CONFLICT (add/add): Merge conflict in src/rest/pom.xml Auto-merging src/rest/pom.xml CONFLICT (add/add): Merge conflict in src/release/src/markdown/developer_README.txt Auto-merging src/release/src/markdown/developer_README.txt CONFLICT (add/add): Merge conflict in src/release/src/markdown/RUNNING.txt Auto-merging src/release/src/markdown/RUNNING.txt CONFLICT (add/add): Merge conflict in src/release/src/markdown/README.txt Auto-merging src/release/src/markdown/README.txt CONFLICT (add/add): Merge conflict in src/release/pom.xml Auto-merging src/release/pom.xml CONFLICT (add/add): Merge conflict in src/release/installer/win/build/geoserver_winsetup.nsi Auto-merging src/release/installer/win/build/geoserver_winsetup.nsi CONFLICT (add/add): Merge conflict in src/release/installer/mac/console/pom.xml Auto-merging src/release/installer/mac/console/pom.xml CONFLICT (add/add): Merge conflict in src/release/ext-geofence.xml Auto-merging src/release/ext-geofence.xml CONFLICT (add/add): Merge conflict in src/release/ext-geofence-server.xml Auto-merging src/release/ext-geofence-server.xml CONFLICT (add/add): Merge conflict in src/release/bin.xml Auto-merging src/release/bin.xml CONFLICT (add/add): Merge conflict in src/pom.xml Auto-merging src/pom.xml CONFLICT (add/add): Merge conflict in src/platform/pom.xml Auto-merging src/platform/pom.xml CONFLICT (add/add): Merge conflict in src/ows/src/test/java/org/geoserver/ows/applicationContext.xml Auto-merging src/ows/src/test/java/org/geoserver/ows/applicationContext.xml CONFLICT (add/add): Merge conflict in src/ows/src/main/java/org/geoserver/ows/Dispatcher.java Auto-merging src/ows/src/main/java/org/geoserver/ows/Dispatcher.java CONFLICT (add/add): Merge conflict in src/ows/pom.xml Auto-merging src/ows/pom.xml CONFLICT (add/add): Merge conflict in src/maven/pom.xml Auto-merging src/maven/pom.xml CONFLICT (add/add): Merge conflict in src/maven/config/pom.xml Auto-merging src/maven/config/pom.xml CONFLICT (add/add): Merge conflict in src/maven/archetype/wfsOutputFormat/src/main/resources/archetype-resources/pom.xml Auto-merging src/maven/archetype/wfsOutputFormat/src/main/resources/archetype-resources/pom.xml CONFLICT (add/add): Merge conflict in src/maven/archetype/wfsOutputFormat/pom.xml Auto-merging src/maven/archetype/wfsOutputFormat/pom.xml CONFLICT (add/add): Merge conflict in src/maven/archetype/webPlugin/src/main/resources/archetype-resources/pom.xml Auto-merging src/maven/archetype/webPlugin/src/main/resources/archetype-resources/pom.xml CONFLICT (add/add): Merge conflict in src/maven/archetype/webPlugin/pom.xml Auto-merging src/maven/archetype/webPlugin/pom.xml CONFLICT (add/add): Merge conflict in src/maven/archetype/pom.xml Auto-merging src/maven/archetype/pom.xml CONFLICT (add/add): Merge conflict in src/main/src/test/java/org/geoserver/security/impl/MemoryDataAccessRuleDAO.java Auto-merging src/main/src/test/java/org/geoserver/security/impl/MemoryDataAccessRuleDAO.java CONFLICT (add/add): Merge conflict in src/main/src/test/java/org/geoserver/logging/LoggingStartupContextListenerTest.java Auto-merging src/main/src/test/java/org/geoserver/logging/LoggingStartupContextListenerTest.java CONFLICT (add/add): Merge conflict in src/main/src/test/java/org/geoserver/config/util/XStreamPersisterTest.java Auto-merging src/main/src/test/java/org/geoserver/config/util/XStreamPersisterTest.java CONFLICT (add/add): Merge conflict in src/main/src/test/java/org/geoserver/config/GeoServerImplTest.java Auto-merging src/main/src/test/java/org/geoserver/config/GeoServerImplTest.java CONFLICT (add/add): Merge conflict in src/main/src/main/resources/VERBOSE_LOGGING.xml Auto-merging src/main/src/main/resources/VERBOSE_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/resources/TEST_LOGGING.xml Auto-merging src/main/src/main/resources/TEST_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/resources/QUIET_LOGGING.xml Auto-merging src/main/src/main/resources/QUIET_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/resources/PRODUCTION_LOGGING.xml Auto-merging src/main/src/main/resources/PRODUCTION_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/resources/GEOTOOLS_DEVELOPER_LOGGING.xml Auto-merging src/main/src/main/resources/GEOTOOLS_DEVELOPER_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/resources/GEOSERVER_DEVELOPER_LOGGING.xml Auto-merging src/main/src/main/resources/GEOSERVER_DEVELOPER_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/resources/DEFAULT_LOGGING.xml Auto-merging src/main/src/main/resources/DEFAULT_LOGGING.xml CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/impl/ServiceAccessRuleDAO.java Auto-merging src/main/src/main/java/org/geoserver/security/impl/ServiceAccessRuleDAO.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/impl/RESTAccessRuleDAO.java Auto-merging src/main/src/main/java/org/geoserver/security/impl/RESTAccessRuleDAO.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/impl/DefaultResourceAccessManager.java Auto-merging src/main/src/main/java/org/geoserver/security/impl/DefaultResourceAccessManager.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/impl/DataAccessRuleDAO.java Auto-merging src/main/src/main/java/org/geoserver/security/impl/DataAccessRuleDAO.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/impl/DataAccessRule.java Auto-merging src/main/src/main/java/org/geoserver/security/impl/DataAccessRule.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/impl/AbstractAccessRuleDAO.java Auto-merging src/main/src/main/java/org/geoserver/security/impl/AbstractAccessRuleDAO.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/security/SecuredResourceNameChangeListener.java Auto-merging src/main/src/main/java/org/geoserver/security/SecuredResourceNameChangeListener.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/logging/LoggingUtilsDelegate.java Auto-merging src/main/src/main/java/org/geoserver/logging/LoggingUtilsDelegate.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/logging/LoggingUtils.java Auto-merging src/main/src/main/java/org/geoserver/logging/LoggingUtils.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/logging/LoggingStartupContextListener.java Auto-merging src/main/src/main/java/org/geoserver/logging/LoggingStartupContextListener.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/feature/retype/RetypingDataStore.java Auto-merging src/main/src/main/java/org/geoserver/feature/retype/RetypingDataStore.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/feature/retype/FidTransformerVisitor.java Auto-merging src/main/src/main/java/org/geoserver/feature/retype/FidTransformerVisitor.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/config/util/XStreamServiceLoader.java Auto-merging src/main/src/main/java/org/geoserver/config/util/XStreamServiceLoader.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/config/util/XStreamPersister.java Auto-merging src/main/src/main/java/org/geoserver/config/util/XStreamPersister.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/config/impl/DefaultGeoServerFacade.java Auto-merging src/main/src/main/java/org/geoserver/config/impl/DefaultGeoServerFacade.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/org/geoserver/config/GeoServerLoader.java Auto-merging src/main/src/main/java/org/geoserver/config/GeoServerLoader.java CONFLICT (add/add): Merge conflict in src/main/src/main/java/applicationContext.xml Auto-merging src/main/src/main/java/applicationContext.xml CONFLICT (add/add): Merge conflict in src/main/pom.xml Auto-merging src/main/pom.xml CONFLICT (add/add): Merge conflict in src/kml/pom.xml Auto-merging src/kml/pom.xml CONFLICT (add/add): Merge conflict in src/gwc/pom.xml Auto-merging src/gwc/pom.xml CONFLICT (add/add): Merge conflict in src/gwc-rest/pom.xml Auto-merging src/gwc-rest/pom.xml CONFLICT (add/add): Merge conflict in src/extension/ysld/pom.xml Auto-merging src/extension/ysld/pom.xml CONFLICT (add/add): Merge conflict in src/extension/xslt/pom.xml Auto-merging src/extension/xslt/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps/wps-kml-ppio/pom.xml Auto-merging src/extension/wps/wps-kml-ppio/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps/wps-core/src/main/java/org/geoserver/wps/resource/WPSResourceManager.java Auto-merging src/extension/wps/wps-core/src/main/java/org/geoserver/wps/resource/WPSResourceManager.java CONFLICT (add/add): Merge conflict in src/extension/wps/wps-core/src/main/java/org/geoserver/wps/executor/WPSExecutionManager.java Auto-merging src/extension/wps/wps-core/src/main/java/org/geoserver/wps/executor/WPSExecutionManager.java CONFLICT (add/add): Merge conflict in src/extension/wps/wps-core/pom.xml Auto-merging src/extension/wps/wps-core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps/wps-cluster-hazelcast/pom.xml Auto-merging src/extension/wps/wps-cluster-hazelcast/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_zh.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_zh.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_tr.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_tr.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_sv.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_sv.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_ru.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_ru.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_pt_BR.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_pt_BR.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_pt.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_pt.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_pl.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_pl.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_lt.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_lt.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_ja.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_ja.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_it.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_it.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_id.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_id.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_hu.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_hu.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_es.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_es.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_el.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_el.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_de.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_de.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_da.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_da.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/resources/GeoServerApplication_cs.properties Auto-merging src/extension/wps/web-wps/src/main/resources/GeoServerApplication_cs.properties CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSServiceDescriptionProvider.java Auto-merging src/extension/wps/web-wps/src/main/java/org/geoserver/wps/web/WPSServiceDescriptionProvider.java CONFLICT (add/add): Merge conflict in src/extension/wps/web-wps/pom.xml Auto-merging src/extension/wps/web-wps/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps/pom.xml Auto-merging src/extension/wps/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps-jdbc/pom.xml Auto-merging src/extension/wps-jdbc/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wps-download/pom.xml Auto-merging src/extension/wps-download/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wmts-multi-dimensional/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/extension/wmts-multi-dimensional/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/extension/wmts-multi-dimensional/pom.xml Auto-merging src/extension/wmts-multi-dimensional/pom.xml CONFLICT (add/add): Merge conflict in src/extension/web-resource/pom.xml Auto-merging src/extension/web-resource/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wcs2_0-eo/web/pom.xml Auto-merging src/extension/wcs2_0-eo/web/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wcs2_0-eo/pom.xml Auto-merging src/extension/wcs2_0-eo/pom.xml CONFLICT (add/add): Merge conflict in src/extension/wcs2_0-eo/core/pom.xml Auto-merging src/extension/wcs2_0-eo/core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/vectortiles/src/main/resources/GeoServerApplication_ko.properties Auto-merging src/extension/vectortiles/src/main/resources/GeoServerApplication_ko.properties CONFLICT (add/add): Merge conflict in src/extension/vectortiles/pom.xml Auto-merging src/extension/vectortiles/pom.xml CONFLICT (add/add): Merge conflict in src/extension/sqlserver/pom.xml Auto-merging src/extension/sqlserver/pom.xml CONFLICT (add/add): Merge conflict in src/extension/sldService/pom.xml Auto-merging src/extension/sldService/pom.xml CONFLICT (add/add): Merge conflict in src/extension/security/web/web-cas/pom.xml Auto-merging src/extension/security/web/web-cas/pom.xml CONFLICT (add/add): Merge conflict in src/extension/security/web/pom.xml Auto-merging src/extension/security/web/pom.xml CONFLICT (add/add): Merge conflict in src/extension/security/pom.xml Auto-merging src/extension/security/pom.xml CONFLICT (add/add): Merge conflict in src/extension/security/cas/pom.xml Auto-merging src/extension/security/cas/pom.xml CONFLICT (add/add): Merge conflict in src/extension/querylayer/pom.xml Auto-merging src/extension/querylayer/pom.xml CONFLICT (add/add): Merge conflict in src/extension/printing/pom.xml Auto-merging src/extension/printing/pom.xml CONFLICT (add/add): Merge conflict in src/extension/pom.xml Auto-merging src/extension/pom.xml CONFLICT (add/add): Merge conflict in src/extension/params-extractor/pom.xml Auto-merging src/extension/params-extractor/pom.xml CONFLICT (add/add): Merge conflict in src/extension/oracle/pom.xml Auto-merging src/extension/oracle/pom.xml CONFLICT (add/add): Merge conflict in src/extension/ogr/pom.xml Auto-merging src/extension/ogr/pom.xml CONFLICT (add/add): Merge conflict in src/extension/ogr/ogr-wps/pom.xml Auto-merging src/extension/ogr/ogr-wps/pom.xml CONFLICT (add/add): Merge conflict in src/extension/ogr/ogr-wfs/pom.xml Auto-merging src/extension/ogr/ogr-wfs/pom.xml CONFLICT (add/add): Merge conflict in src/extension/ogr/ogr-core/pom.xml Auto-merging src/extension/ogr/ogr-core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/netcdf/pom.xml Auto-merging src/extension/netcdf/pom.xml CONFLICT (add/add): Merge conflict in src/extension/netcdf-out/pom.xml Auto-merging src/extension/netcdf-out/pom.xml CONFLICT (add/add): Merge conflict in src/extension/mysql/pom.xml Auto-merging src/extension/mysql/pom.xml CONFLICT (add/add): Merge conflict in src/extension/monitor/pom.xml Auto-merging src/extension/monitor/pom.xml CONFLICT (add/add): Merge conflict in src/extension/monitor/core/pom.xml Auto-merging src/extension/monitor/core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/mongodb/pom.xml Auto-merging src/extension/mongodb/pom.xml CONFLICT (add/add): Merge conflict in src/extension/metadata/pom.xml Auto-merging src/extension/metadata/pom.xml CONFLICT (add/add): Merge conflict in src/extension/mbstyle/pom.xml Auto-merging src/extension/mbstyle/pom.xml CONFLICT (add/add): Merge conflict in src/extension/mapml/src/main/resources/GeoServerApplication_ro.properties Auto-merging src/extension/mapml/src/main/resources/GeoServerApplication_ro.properties CONFLICT (add/add): Merge conflict in src/extension/mapml/pom.xml Auto-merging src/extension/mapml/pom.xml CONFLICT (add/add): Merge conflict in src/extension/libjpeg-turbo/pom.xml Auto-merging src/extension/libjpeg-turbo/pom.xml CONFLICT (add/add): Merge conflict in src/extension/jp2k/pom.xml Auto-merging src/extension/jp2k/pom.xml CONFLICT (add/add): Merge conflict in src/extension/inspire/src/main/resources/GeoServerApplication_nl.properties Auto-merging src/extension/inspire/src/main/resources/GeoServerApplication_nl.properties CONFLICT (add/add): Merge conflict in src/extension/inspire/pom.xml Auto-merging src/extension/inspire/pom.xml CONFLICT (add/add): Merge conflict in src/extension/importer/web/pom.xml Auto-merging src/extension/importer/web/pom.xml CONFLICT (add/add): Merge conflict in src/extension/importer/rest/pom.xml Auto-merging src/extension/importer/rest/pom.xml CONFLICT (add/add): Merge conflict in src/extension/importer/pom.xml Auto-merging src/extension/importer/pom.xml CONFLICT (add/add): Merge conflict in src/extension/importer/core/pom.xml Auto-merging src/extension/importer/core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/imagemap/pom.xml Auto-merging src/extension/imagemap/pom.xml CONFLICT (add/add): Merge conflict in src/extension/h2/pom.xml Auto-merging src/extension/h2/pom.xml CONFLICT (add/add): Merge conflict in src/extension/gwc-s3/pom.xml Auto-merging src/extension/gwc-s3/pom.xml CONFLICT (add/add): Merge conflict in src/extension/grib/pom.xml Auto-merging src/extension/grib/pom.xml CONFLICT (add/add): Merge conflict in src/extension/geopkg-output/pom.xml Auto-merging src/extension/geopkg-output/pom.xml CONFLICT (add/add): Merge conflict in src/extension/geofence/pom.xml Auto-merging src/extension/geofence/pom.xml CONFLICT (add/add): Merge conflict in src/extension/gdal/pom.xml Auto-merging src/extension/gdal/pom.xml CONFLICT (add/add): Merge conflict in src/extension/feature-pregeneralized/pom.xml Auto-merging src/extension/feature-pregeneralized/pom.xml CONFLICT (add/add): Merge conflict in src/extension/excel/pom.xml Auto-merging src/extension/excel/pom.xml CONFLICT (add/add): Merge conflict in src/extension/dxf/wps/pom.xml Auto-merging src/extension/dxf/wps/pom.xml CONFLICT (add/add): Merge conflict in src/extension/dxf/pom.xml Auto-merging src/extension/dxf/pom.xml CONFLICT (add/add): Merge conflict in src/extension/dxf/core/pom.xml Auto-merging src/extension/dxf/core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/db2/pom.xml Auto-merging src/extension/db2/pom.xml CONFLICT (add/add): Merge conflict in src/extension/csw/web-csw/pom.xml Auto-merging src/extension/csw/web-csw/pom.xml CONFLICT (add/add): Merge conflict in src/extension/csw/simple-store/pom.xml Auto-merging src/extension/csw/simple-store/pom.xml CONFLICT (add/add): Merge conflict in src/extension/csw/pom.xml Auto-merging src/extension/csw/pom.xml CONFLICT (add/add): Merge conflict in src/extension/csw/csw-iso/pom.xml Auto-merging src/extension/csw/csw-iso/pom.xml CONFLICT (add/add): Merge conflict in src/extension/csw/core/pom.xml Auto-merging src/extension/csw/core/pom.xml CONFLICT (add/add): Merge conflict in src/extension/csw/api/pom.xml Auto-merging src/extension/csw/api/pom.xml CONFLICT (add/add): Merge conflict in src/extension/css/pom.xml Auto-merging src/extension/css/pom.xml CONFLICT (add/add): Merge conflict in src/extension/control-flow/src/test/java/org/geoserver/flow/controller/AbstractFlowControllerTest.java Auto-merging src/extension/control-flow/src/test/java/org/geoserver/flow/controller/AbstractFlowControllerTest.java CONFLICT (add/add): Merge conflict in src/extension/control-flow/pom.xml Auto-merging src/extension/control-flow/pom.xml CONFLICT (add/add): Merge conflict in src/extension/charts/pom.xml Auto-merging src/extension/charts/pom.xml CONFLICT (add/add): Merge conflict in src/extension/authkey/pom.xml Auto-merging src/extension/authkey/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/sample-data-access-test/pom.xml Auto-merging src/extension/app-schema/sample-data-access-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/pom.xml Auto-merging src/extension/app-schema/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/onlineTest/setup/AppSchemaTestPostgisSetup.java Auto-merging src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/onlineTest/setup/AppSchemaTestPostgisSetup.java CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32MockData.java Auto-merging src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/FeatureGML32MockData.java CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/AbstractAppSchemaMockData.java Auto-merging src/extension/app-schema/app-schema-test/src/test/java/org/geoserver/test/AbstractAppSchemaMockData.java CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-test/pom.xml Auto-merging src/extension/app-schema/app-schema-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-solr-test/pom.xml Auto-merging src/extension/app-schema/app-schema-solr-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-postgis-test/pom.xml Auto-merging src/extension/app-schema/app-schema-postgis-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-oracle-test/pom.xml Auto-merging src/extension/app-schema/app-schema-oracle-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-mongo-test/pom.xml Auto-merging src/extension/app-schema/app-schema-mongo-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-indexes-test/pom.xml Auto-merging src/extension/app-schema/app-schema-indexes-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-geopkg-test/pom.xml Auto-merging src/extension/app-schema/app-schema-geopkg-test/pom.xml CONFLICT (add/add): Merge conflict in src/extension/app-schema/app-schema-core/pom.xml Auto-merging src/extension/app-schema/app-schema-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/wps-sextante/pom.xml Auto-merging src/community/wps-sextante/pom.xml CONFLICT (add/add): Merge conflict in src/community/wps-remote/pom.xml Auto-merging src/community/wps-remote/pom.xml CONFLICT (add/add): Merge conflict in src/community/wmts-styles/pom.xml Auto-merging src/community/wmts-styles/pom.xml CONFLICT (add/add): Merge conflict in src/community/wms-eo/pom.xml Auto-merging src/community/wms-eo/pom.xml CONFLICT (add/add): Merge conflict in src/community/web-service-auth/pom.xml Auto-merging src/community/web-service-auth/pom.xml CONFLICT (add/add): Merge conflict in src/community/web-ogr/pom.xml Auto-merging src/community/web-ogr/pom.xml CONFLICT (add/add): Merge conflict in src/community/vsi/pom.xml Auto-merging src/community/vsi/pom.xml CONFLICT (add/add): Merge conflict in src/community/vector-mosaic/pom.xml Auto-merging src/community/vector-mosaic/pom.xml CONFLICT (add/add): Merge conflict in src/community/teradata/pom.xml Auto-merging src/community/teradata/pom.xml CONFLICT (add/add): Merge conflict in src/community/taskmanager/s3/pom.xml Auto-merging src/community/taskmanager/s3/pom.xml CONFLICT (add/add): Merge conflict in src/community/taskmanager/pom.xml Auto-merging src/community/taskmanager/pom.xml CONFLICT (add/add): Merge conflict in src/community/taskmanager/metadata/pom.xml Auto-merging src/community/taskmanager/metadata/pom.xml CONFLICT (add/add): Merge conflict in src/community/taskmanager/core/pom.xml Auto-merging src/community/taskmanager/core/pom.xml CONFLICT (add/add): Merge conflict in src/community/taskmanager/core/bin/pom.xml Auto-merging src/community/taskmanager/core/bin/pom.xml CONFLICT (add/add): Merge conflict in src/community/solr/pom.xml Auto-merging src/community/solr/pom.xml CONFLICT (add/add): Merge conflict in src/community/smart-data-loader/pom.xml Auto-merging src/community/smart-data-loader/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/pom.xml Auto-merging src/community/security/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2/pom.xml Auto-merging src/community/security/oauth2/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2/oauth2-web/pom.xml Auto-merging src/community/security/oauth2/oauth2-web/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2/oauth2-core/pom.xml Auto-merging src/community/security/oauth2/oauth2-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2-openid-connect/pom.xml Auto-merging src/community/security/oauth2-openid-connect/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2-openid-connect/oauth2-openid-connect-web/pom.xml Auto-merging src/community/security/oauth2-openid-connect/oauth2-openid-connect-web/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/src/test/java/org/geoserver/security/oauth2/OpenIdConnectIntegrationTest.java Auto-merging src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/src/test/java/org/geoserver/security/oauth2/OpenIdConnectIntegrationTest.java CONFLICT (add/add): Merge conflict in src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/src/main/java/org/geoserver/security/oauth2/OpenIdConnectFilterConfig.java Auto-merging src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/src/main/java/org/geoserver/security/oauth2/OpenIdConnectFilterConfig.java CONFLICT (add/add): Merge conflict in src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/src/main/java/org/geoserver/security/oauth2/OpenIdConnectAuthenticationFilter.java Auto-merging src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/src/main/java/org/geoserver/security/oauth2/OpenIdConnectAuthenticationFilter.java CONFLICT (add/add): Merge conflict in src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/pom.xml Auto-merging src/community/security/oauth2-openid-connect/oauth2-openid-connect-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2-google/pom.xml Auto-merging src/community/security/oauth2-google/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2-github/pom.xml Auto-merging src/community/security/oauth2-github/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/oauth2-geonode/pom.xml Auto-merging src/community/security/oauth2-geonode/pom.xml CONFLICT (add/add): Merge conflict in src/community/security/keycloak/pom.xml Auto-merging src/community/security/keycloak/pom.xml CONFLICT (add/add): Merge conflict in src/community/schemaless-features/schemaless-core/src/main/java/org/geoserver/schemalessfeatures/filter/SchemalessPropertyAccessorFactory.java Auto-merging src/community/schemaless-features/schemaless-core/src/main/java/org/geoserver/schemalessfeatures/filter/SchemalessPropertyAccessorFactory.java CONFLICT (add/add): Merge conflict in src/community/schemaless-features/schemaless-core/pom.xml Auto-merging src/community/schemaless-features/schemaless-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/schemaless-features/pom.xml Auto-merging src/community/schemaless-features/pom.xml CONFLICT (add/add): Merge conflict in src/community/schemaless-features/mongodb-schemaless/src/test/java/org/geoserver/schemalessfeatures/mongodb/SchemalessCollectionTest.java Auto-merging src/community/schemaless-features/mongodb-schemaless/src/test/java/org/geoserver/schemalessfeatures/mongodb/SchemalessCollectionTest.java CONFLICT (add/add): Merge conflict in src/community/schemaless-features/mongodb-schemaless/pom.xml Auto-merging src/community/schemaless-features/mongodb-schemaless/pom.xml CONFLICT (add/add): Merge conflict in src/community/saml/pom.xml Auto-merging src/community/saml/pom.xml CONFLICT (add/add): Merge conflict in src/community/s3-geotiff/pom.xml Auto-merging src/community/s3-geotiff/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-upload/pom.xml Auto-merging src/community/rest-upload/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/pom.xml Auto-merging src/community/rest-openapi/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/openapi/src/main/resources/org/geoserver/rest/openapi/1.0.0/owsservices.yaml Auto-merging src/community/rest-openapi/openapi/src/main/resources/org/geoserver/rest/openapi/1.0.0/owsservices.yaml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/openapi/src/main/resources/org/geoserver/rest/openapi/1.0.0/config.yaml Auto-merging src/community/rest-openapi/openapi/src/main/resources/org/geoserver/rest/openapi/1.0.0/config.yaml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/openapi/pom.xml Auto-merging src/community/rest-openapi/openapi/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/model-mapping/pom.xml Auto-merging src/community/rest-openapi/model-mapping/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/java-client/pom.xml Auto-merging src/community/rest-openapi/java-client/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/generated/pom.xml Auto-merging src/community/rest-openapi/generated/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/generated/model/pom.xml Auto-merging src/community/rest-openapi/generated/model/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-openapi/generated/feign-client/pom.xml Auto-merging src/community/rest-openapi/generated/feign-client/pom.xml CONFLICT (add/add): Merge conflict in src/community/rest-ext/pom.xml Auto-merging src/community/rest-ext/pom.xml CONFLICT (add/add): Merge conflict in src/community/release/pom.xml Auto-merging src/community/release/pom.xml CONFLICT (add/add): Merge conflict in src/community/programming-guide/pom.xml Auto-merging src/community/programming-guide/pom.xml CONFLICT (add/add): Merge conflict in src/community/pom.xml Auto-merging src/community/pom.xml CONFLICT (add/add): Merge conflict in src/community/pgraster/pom.xml Auto-merging src/community/pgraster/pom.xml CONFLICT (add/add): Merge conflict in src/community/ows-simulate/pom.xml Auto-merging src/community/ows-simulate/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/web-oseo/pom.xml Auto-merging src/community/oseo/web-oseo/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/pom.xml Auto-merging src/community/oseo/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/oseo-stac/pom.xml Auto-merging src/community/oseo/oseo-stac/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/oseo-service/pom.xml Auto-merging src/community/oseo/oseo-service/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/oseo-rest/src/test/java/org/geoserver/opensearch/rest/ProductsControllerTest.java Auto-merging src/community/oseo/oseo-rest/src/test/java/org/geoserver/opensearch/rest/ProductsControllerTest.java CONFLICT (add/add): Merge conflict in src/community/oseo/oseo-rest/pom.xml Auto-merging src/community/oseo/oseo-rest/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/oseo-integration-tests/pom.xml Auto-merging src/community/oseo/oseo-integration-tests/pom.xml CONFLICT (add/add): Merge conflict in src/community/oseo/oseo-core/pom.xml Auto-merging src/community/oseo/oseo-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/pom.xml Auto-merging src/community/ogcapi/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-tiles/pom.xml Auto-merging src/community/ogcapi/ogcapi-tiles/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-tiled-features/pom.xml Auto-merging src/community/ogcapi/ogcapi-tiled-features/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-styles/pom.xml Auto-merging src/community/ogcapi/ogcapi-styles/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-maps/pom.xml Auto-merging src/community/ogcapi/ogcapi-maps/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-images/pom.xml Auto-merging src/community/ogcapi/ogcapi-images/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-features/pom.xml Auto-merging src/community/ogcapi/ogcapi-features/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-coverages/pom.xml Auto-merging src/community/ogcapi/ogcapi-coverages/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-core/src/main/java/org/geoserver/ogcapi/APIConfigurationSupport.java Auto-merging src/community/ogcapi/ogcapi-core/src/main/java/org/geoserver/ogcapi/APIConfigurationSupport.java CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-core/pom.xml Auto-merging src/community/ogcapi/ogcapi-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/ogcapi-changeset/pom.xml Auto-merging src/community/ogcapi/ogcapi-changeset/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/dggs/web-dggs/pom.xml Auto-merging src/community/ogcapi/dggs/web-dggs/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/dggs/pom.xml Auto-merging src/community/ogcapi/dggs/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/dggs/ogcapi-dggs/pom.xml Auto-merging src/community/ogcapi/dggs/ogcapi-dggs/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/dggs/dggs-core/pom.xml Auto-merging src/community/ogcapi/dggs/dggs-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/ogcapi/dggs/dggs-clickhouse/pom.xml Auto-merging src/community/ogcapi/dggs/dggs-clickhouse/pom.xml CONFLICT (add/add): Merge conflict in src/community/nsg-profiles/pom.xml Auto-merging src/community/nsg-profiles/pom.xml CONFLICT (add/add): Merge conflict in src/community/nsg-profiles/nsg-wmts-profile/pom.xml Auto-merging src/community/nsg-profiles/nsg-wmts-profile/pom.xml CONFLICT (add/add): Merge conflict in src/community/notification/pom.xml Auto-merging src/community/notification/pom.xml CONFLICT (add/add): Merge conflict in src/community/notification-geonode/pom.xml Auto-merging src/community/notification-geonode/pom.xml CONFLICT (add/add): Merge conflict in src/community/notification-common/pom.xml Auto-merging src/community/notification-common/pom.xml CONFLICT (add/add): Merge conflict in src/community/netcdf-ghrsst/pom.xml Auto-merging src/community/netcdf-ghrsst/pom.xml CONFLICT (add/add): Merge conflict in src/community/ncwms/pom.xml Auto-merging src/community/ncwms/pom.xml CONFLICT (add/add): Merge conflict in src/community/monitor-hibernate/pom.xml Auto-merging src/community/monitor-hibernate/pom.xml CONFLICT (add/add): Merge conflict in src/community/mbtiles/pom.xml Auto-merging src/community/mbtiles/pom.xml CONFLICT (add/add): Merge conflict in src/community/libdeflate/pom.xml Auto-merging src/community/libdeflate/pom.xml CONFLICT (add/add): Merge conflict in src/community/jms-cluster/pom.xml Auto-merging src/community/jms-cluster/pom.xml CONFLICT (add/add): Merge conflict in src/community/jms-cluster/jms-geoserver/pom.xml Auto-merging src/community/jms-cluster/jms-geoserver/pom.xml CONFLICT (add/add): Merge conflict in src/community/jms-cluster/jms-commons/pom.xml Auto-merging src/community/jms-cluster/jms-commons/pom.xml CONFLICT (add/add): Merge conflict in src/community/jms-cluster/activemqBroker/pom.xml Auto-merging src/community/jms-cluster/activemqBroker/pom.xml CONFLICT (add/add): Merge conflict in src/community/jdbcstore/pom.xml Auto-merging src/community/jdbcstore/pom.xml CONFLICT (add/add): Merge conflict in src/community/jdbcconfig/pom.xml Auto-merging src/community/jdbcconfig/pom.xml CONFLICT (add/add): Merge conflict in src/community/jdbc-metrics/pom.xml Auto-merging src/community/jdbc-metrics/pom.xml CONFLICT (add/add): Merge conflict in src/community/importer-jdbc/pom.xml Auto-merging src/community/importer-jdbc/pom.xml CONFLICT (add/add): Merge conflict in src/community/importer-fgdb/pom.xml Auto-merging src/community/importer-fgdb/pom.xml CONFLICT (add/add): Merge conflict in src/community/hz-cluster/pom.xml Auto-merging src/community/hz-cluster/pom.xml CONFLICT (add/add): Merge conflict in src/community/hello_web/pom.xml Auto-merging src/community/hello_web/pom.xml CONFLICT (add/add): Merge conflict in src/community/hello/pom.xml Auto-merging src/community/hello/pom.xml CONFLICT (add/add): Merge conflict in src/community/gwc-sqlite/pom.xml Auto-merging src/community/gwc-sqlite/pom.xml CONFLICT (add/add): Merge conflict in src/community/gwc-mbtiles/pom.xml Auto-merging src/community/gwc-mbtiles/pom.xml CONFLICT (add/add): Merge conflict in src/community/gwc-distributed/pom.xml Auto-merging src/community/gwc-distributed/pom.xml CONFLICT (add/add): Merge conflict in src/community/gwc-azure-blob/pom.xml Auto-merging src/community/gwc-azure-blob/pom.xml CONFLICT (add/add): Merge conflict in src/community/gsr/pom.xml Auto-merging src/community/gsr/pom.xml CONFLICT (add/add): Merge conflict in src/community/gpxppio/pom.xml Auto-merging src/community/gpxppio/pom.xml CONFLICT (add/add): Merge conflict in src/community/geostyler/pom.xml Auto-merging src/community/geostyler/pom.xml CONFLICT (add/add): Merge conflict in src/community/geopkg/pom.xml Auto-merging src/community/geopkg/pom.xml CONFLICT (add/add): Merge conflict in src/community/geomesa/pom.xml Auto-merging src/community/geomesa/pom.xml CONFLICT (add/add): Merge conflict in src/community/gdal/pom.xml Auto-merging src/community/gdal/pom.xml CONFLICT (add/add): Merge conflict in src/community/gdal/gdal-wps/pom.xml Auto-merging src/community/gdal/gdal-wps/pom.xml CONFLICT (add/add): Merge conflict in src/community/gdal/gdal-wcs/pom.xml Auto-merging src/community/gdal/gdal-wcs/pom.xml CONFLICT (add/add): Merge conflict in src/community/flatgeobuf/pom.xml Auto-merging src/community/flatgeobuf/pom.xml CONFLICT (add/add): Merge conflict in src/community/features-templating/pom.xml Auto-merging src/community/features-templating/pom.xml CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-web/pom.xml Auto-merging src/community/features-templating/features-templating-web/pom.xml CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-rest/pom.xml Auto-merging src/community/features-templating/features-templating-rest/pom.xml CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-ows/src/test/java/org/geoserver/featurestemplating/response/GeoJSONGetComplexFeaturesResponseWFSTest.java Auto-merging src/community/features-templating/features-templating-ows/src/test/java/org/geoserver/featurestemplating/response/GeoJSONGetComplexFeaturesResponseWFSTest.java CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-ows/pom.xml Auto-merging src/community/features-templating/features-templating-ows/pom.xml CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-ogcapi/pom.xml Auto-merging src/community/features-templating/features-templating-ogcapi/pom.xml CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-core/src/test/resources/org/geoserver/featurestemplating/response/MappedFeatureStreamFun.json Auto-merging src/community/features-templating/features-templating-core/src/test/resources/org/geoserver/featurestemplating/response/MappedFeatureStreamFun.json CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-core/src/main/java/org/geoserver/featurestemplating/request/TemplatePathVisitor.java Auto-merging src/community/features-templating/features-templating-core/src/main/java/org/geoserver/featurestemplating/request/TemplatePathVisitor.java CONFLICT (add/add): Merge conflict in src/community/features-templating/features-templating-core/pom.xml Auto-merging src/community/features-templating/features-templating-core/pom.xml CONFLICT (add/add): Merge conflict in src/community/elasticsearch/pom.xml Auto-merging src/community/elasticsearch/pom.xml CONFLICT (add/add): Merge conflict in src/community/dyndimension/pom.xml Auto-merging src/community/dyndimension/pom.xml CONFLICT (add/add): Merge conflict in src/community/dds/pom.xml Auto-merging src/community/dds/pom.xml CONFLICT (add/add): Merge conflict in src/community/cov-json/pom.xml Auto-merging src/community/cov-json/pom.xml CONFLICT (add/add): Merge conflict in src/community/colormap/pom.xml Auto-merging src/community/colormap/pom.xml CONFLICT (add/add): Merge conflict in src/community/cog/pom.xml Auto-merging src/community/cog/pom.xml CONFLICT (add/add): Merge conflict in src/community/backup-restore/web/pom.xml Auto-merging src/community/backup-restore/web/pom.xml CONFLICT (add/add): Merge conflict in src/community/backup-restore/rest/pom.xml Auto-merging src/community/backup-restore/rest/pom.xml CONFLICT (add/add): Merge conflict in src/community/backup-restore/pom.xml Auto-merging src/community/backup-restore/pom.xml CONFLICT (add/add): Merge conflict in src/community/backup-restore/extension/pom.xml Auto-merging src/community/backup-restore/extension/pom.xml CONFLICT (add/add): Merge conflict in src/community/backup-restore/core/pom.xml Auto-merging src/community/backup-restore/core/pom.xml CONFLICT (add/add): Merge conflict in src/community/app-schema/webservice-test/pom.xml Auto-merging src/community/app-schema/webservice-test/pom.xml CONFLICT (add/add): Merge conflict in src/community/app-schema/pom.xml Auto-merging src/community/app-schema/pom.xml CONFLICT (add/add): Merge conflict in doc/zhCN/pom.xml Auto-merging doc/zhCN/pom.xml CONFLICT (add/add): Merge conflict in doc/en/user/source/tutorials/imagemosaic_timeseries/imagemosaic_timeseries.rst Auto-merging doc/en/user/source/tutorials/imagemosaic_timeseries/imagemosaic_timeseries.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/styling/css/properties.rst Auto-merging doc/en/user/source/styling/css/properties.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/services/wfs/webadmin.rst Auto-merging doc/en/user/source/services/wfs/webadmin.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/security/passwd.rst Auto-merging doc/en/user/source/security/passwd.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/production/java.rst Auto-merging doc/en/user/source/production/java.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/production/container.rst Auto-merging doc/en/user/source/production/container.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/installation/win_installer.rst Auto-merging doc/en/user/source/installation/win_installer.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/installation/win_binary.rst Auto-merging doc/en/user/source/installation/win_binary.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/installation/war.rst Auto-merging doc/en/user/source/installation/war.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/installation/linux.rst Auto-merging doc/en/user/source/installation/linux.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/installation/index.rst Auto-merging doc/en/user/source/installation/index.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/vectortiles/tutorial.rst Auto-merging doc/en/user/source/extensions/vectortiles/tutorial.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/printing/configuration.rst Auto-merging doc/en/user/source/extensions/printing/configuration.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/index.rst Auto-merging doc/en/user/source/extensions/index.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/geofence-server/tutorial.rst Auto-merging doc/en/user/source/extensions/geofence-server/tutorial.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/geofence-server/rest.rst Auto-merging doc/en/user/source/extensions/geofence-server/rest.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/geofence-server/images/tutorial_rulespage1.png Auto-merging doc/en/user/source/extensions/geofence-server/images/tutorial_rulespage1.png CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/geofence-server/images/rulespage.png Auto-merging doc/en/user/source/extensions/geofence-server/images/rulespage.png CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/geofence-server/images/rulepage.png Auto-merging doc/en/user/source/extensions/geofence-server/images/rulepage.png CONFLICT (add/add): Merge conflict in doc/en/user/source/extensions/geofence-server/gui.rst Auto-merging doc/en/user/source/extensions/geofence-server/gui.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/data/database/oracle.rst Auto-merging doc/en/user/source/data/database/oracle.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/data/app-schema/mapping-file.rst Auto-merging doc/en/user/source/data/app-schema/mapping-file.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/configuration/status.rst Auto-merging doc/en/user/source/configuration/status.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/configuration/logging.rst Auto-merging doc/en/user/source/configuration/logging.rst CONFLICT (add/add): Merge conflict in doc/en/user/source/conf.py Auto-merging doc/en/user/source/conf.py CONFLICT (add/add): Merge conflict in doc/en/user/source/community/index.rst Auto-merging doc/en/user/source/community/index.rst CONFLICT (add/add): Merge conflict in doc/en/pom.xml Auto-merging doc/en/pom.xml CONFLICT (add/add): Merge conflict in doc/en/docguide/source/workflow.rst Auto-merging doc/en/docguide/source/workflow.rst CONFLICT (add/add): Merge conflict in doc/en/docguide/source/conf.py Auto-merging doc/en/docguide/source/conf.py CONFLICT (add/add): Merge conflict in doc/en/developer/source/tools.rst Auto-merging doc/en/developer/source/tools.rst CONFLICT (add/add): Merge conflict in doc/en/developer/source/qa-guide/index.rst Auto-merging doc/en/developer/source/qa-guide/index.rst CONFLICT (add/add): Merge conflict in doc/en/developer/source/programming-guide/testing/index.rst Auto-merging doc/en/developer/source/programming-guide/testing/index.rst CONFLICT (add/add): Merge conflict in doc/en/developer/source/programming-guide/ows-services/hello/pom.xml Auto-merging doc/en/developer/source/programming-guide/ows-services/hello/pom.xml CONFLICT (add/add): Merge conflict in doc/en/developer/source/conf.py Auto-merging doc/en/developer/source/conf.py CONFLICT (add/add): Merge conflict in doc/en/build.xml Auto-merging doc/en/build.xml CONFLICT (add/add): Merge conflict in build/transifex/.tx/config Auto-merging build/transifex/.tx/config CONFLICT (add/add): Merge conflict in build/rename.xml Auto-merging build/rename.xml CONFLICT (add/add): Merge conflict in .github/workflows/linux_jdk8.yml Auto-merging .github/workflows/linux_jdk8.yml CONFLICT (add/add): Merge conflict in .github/workflows/backport.yml Auto-merging .github/workflows/backport.yml error: could not apply 8d1b92798f... Remove duplicate chinese translation for weblate compatibility Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 8d1b92798f... Remove duplicate chinese translation for weblate compatibility (1) 6 months ago
None New alert GeoServer / web_core	Could not push the repository. 6 months ago
None Component locked GeoServer / web_core	The component was automatically locked because of an alert. 6 months ago
None New alert GeoServer / web_core	Could not update the repository. 6 months ago
None New alert GeoServer / web_core	Repository outdated. 7 months ago
alexgacon Failed merge on repository GeoServer / web_core	fatal: refusing to merge unrelated histories (128) 7 months ago
alexgacon Component unlocked GeoServer / web_core	Component unlocked 7 months ago
None Component locked GeoServer / web_core	The component was automatically locked because of an alert. 7 months ago

Browse all component changes