Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

AER-1839 Update geoserver to latest version #8

Merged
merged 3 commits into from
Jul 13, 2023
Merged

AER-1839 Update geoserver to latest version #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a59b12
update versions and include java version in the pom
Gijsvanhorn Jul 12, 2023
fda3036
since version 2.21 the logging filter is configured from the UI, and …
Gijsvanhorn Jul 12, 2023
985cfb6
use the right extension for the logging profile.
Gijsvanhorn Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/on-pull_request-opened-synchronize-reopened.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ jobs:
- uses: aerius/github-actions/events/pull_request-event-action@v1.0.2
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JDK_VERSION: 1.8
JDK_VERSION: 11

2 changes: 1 addition & 1 deletion .github/workflows/on-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
JDK_VERSION: 1.8
JDK_VERSION: 11

2 changes: 1 addition & 1 deletion .github/workflows/on-release-published.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
JDK_VERSION: 1.8
JDK_VERSION: 11

7 changes: 4 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<artifactId>geoserver-core</artifactId>
<name>GeoServer :: Core</name>
<description>AERIUS Geoserver core package to be used by all GeoServer projects.</description>
<version>2.17.5-2-SNAPSHOT</version>
<version>2.22.4-1-SNAPSHOT</version>
<packaging>war</packaging>

<organization>
Expand All @@ -49,7 +49,8 @@
</distributionManagement>

<properties>
<geoserver.version>2.17.5</geoserver.version>
<geoserver.version>2.22.4</geoserver.version>
<java.version>11</java.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -84,7 +85,7 @@
<plugins>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>2.2</version>
<version>3.4.0</version>
<configuration>
<nonFilteredFileExtensions>
<!-- don't filter .jceks, else security will break -->
Expand Down
40 changes: 1 addition & 39 deletions src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,39 +121,6 @@
</init-param>
</filter>

<filter>
<filter-name>Request Logging Filter</filter-name>
<filter-class>org.geoserver.filters.LoggingFilter</filter-class>
<init-param>
<!-- The 'enabled' parameter is a boolean value, "true" (case-insensitive) for true or
any other value for false. If enabled, then the logging will be performed;
otherwise the logging filter will have no effect. If not specified, this
parameter defaults to false.
-->
<param-name>enabled</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<!-- The 'log-request-headers' parameter is a boolean value, "true" (case-insensitive) for
true or any other value for false. If enabled, then the logging will include the HTTP
headers of requests. If not specified, this parameter defaults to false.
-->
<param-name>log-request-headers</param-name>
<param-value>false</param-value>
</init-param>
<init-param>
<!-- The 'log-request-bodies' parameter is a boolean value, "true" (case-insensitive) for
true or any other value for false. If enabled, then the logging will include the body
of POST and PUT requests. If not specified, this parameter defaults to false.
Note that this may noticeably degrade responsiveness of your geoserver since it will
not begin to process requests until the entire request body has been received by the
server.
-->
<param-name>log-request-bodies</param-name>
<param-value>false</param-value>
</init-param>
</filter>

<filter>
<filter-name>Advanced Dispatch Filter</filter-name>
<filter-class>org.geoserver.platform.AdvancedDispatchFilter</filter-class>
Expand Down Expand Up @@ -245,12 +212,7 @@
<url-pattern>/*</url-pattern>
</filter-mapping>

<filter-mapping>
<filter-name>Request Logging Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>

<!--
<!--
If you want to use your security system comment out this one too
-->
<filter-mapping>
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/data/logging.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<logging>
<level>PRODUCTION_LOGGING.properties</level>
<level>PRODUCTION_LOGGING.xml</level>
<location>logs/geoserver.log</location>
<stdOutLogging>true</stdOutLogging>
</logging>
28 changes: 0 additions & 28 deletions src/main/webapp/data/logs/DEFAULT_LOGGING.properties
View file
Open in desktop

This file was deleted.

55 changes: 55 additions & 0 deletions src/main/webapp/data/logs/DEFAULT_LOGGING.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This log4j configuration file needs to stay here, and is used as the default logging setup -->
<!-- during data_dir upgrades and in case the chosen logging config isn't available. -->
<Configuration name="DEFAULT_LOGGING" status="fatal" dest="out">
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
</Console>
<RollingFile name="geoserverlogfile">
<filename>logs/geoserver.log</filename>
<filePattern>logs/geoserver-%i.log</filePattern>
<PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
<Policies>
<SizeBasedTriggeringPolicy size="20 MB" />
</Policies>
<DefaultRolloverStrategy max="3" fileIndex="min"/>
</RollingFile>
</Appenders>
<Loggers>
<Logger name="org.geotools" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Logger name="org.geotools.factory" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Logger name="org.geoserver" level="CONFIG" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Logger name="org.vfny.geoserver" level="CONFIG" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>

<Logger name="org.springframework" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>

<Logger name="org.geowebcache" level="CONFIG" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Logger name="org.geowebcache.seed" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Root level="warn">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Root>
</Loggers>
</Configuration>
40 changes: 0 additions & 40 deletions src/main/webapp/data/logs/GEOSERVER_DEVELOPER_LOGGING.properties
View file
Open in desktop

This file was deleted.

64 changes: 64 additions & 0 deletions src/main/webapp/data/logs/GEOSERVER_DEVELOPER_LOGGING.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This log4j configuration file needs to stay here, and is used as a default logging setup -->
<!-- during data_dir upgrades and in case the chosen logging config isn't available. -->
<Configuration name="GEOSERVER_DEVELOPER_LOGGING" status="fatal" dest="out">
<!-- As GeoTools uses java.util.logging levels instead of log4j, GeoServer makes the -->
<!-- following mappings to adjust the log4j levels specified in this file. -->
<!-- -->
<!-- Log4J Level java.util.logging Level -->
<!-- ==================== ======================= -->
<!-- ALL ALL -->
<!-- FINEST FINEST -->
<!-- TRACE FINER -->
<!-- DEBUG FINE -->
<!-- CONFIG CONFIG -->
<!-- INFO INFO -->
<!-- WARN WARNING -->
<!-- ERROR SEVERE -->
<!-- FATAL FATAL -->
<!-- OFF OFF -->
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
</Console>
<RollingFile name="geoserverlogfile">
<filename>logs/geoserver.log</filename>
<filePattern>logs/geoserver-%i.log</filePattern>
<PatternLayout pattern="%date{dd MMM HH:mm:ss} %-6level [%logger{2}] - %msg%n%throwable{filters(org.junit,org.apache.maven,sun.reflect,java.lang.reflect)}"/>
<Policies>
<SizeBasedTriggeringPolicy size="20 MB" />
</Policies>
<DefaultRolloverStrategy max="3" fileIndex="min"/>
</RollingFile>
</Appenders>
<Loggers>

<Logger name="org.geotools" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Logger name="org.geotools.factory" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>

<Logger name="org.geoserver" level="trace" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>
<Logger name="org.vfny.geoserver" level="trace" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>

<Logger name="org.springframework" level="warn" additivity="false">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Logger>

<Root level="warn">
<AppenderRef ref="stdout"/>
<AppenderRef ref="geoserverlogfile"/>
</Root>
</Loggers>
</Configuration>
46 changes: 0 additions & 46 deletions src/main/webapp/data/logs/GEOTOOLS_DEVELOPER_LOGGING.properties
View file
Open in desktop

This file was deleted.

Loading
Loading