Skip to content

Commit cb60dd7

Browse files
jodygarnettjodygarnett
committed
sync versions for GeoTools 34.0 bill-of-materials, and geoserver 2.28.0 release
1 parent 731d2bd commit cb60dd7

File tree

2 files changed

+56
-40
lines changed

2 files changed

+56
-40
lines changed

‎ReleaseNotes.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Mapfish Print 2 Release notes
22

3+
## Release 2.4.0
4+
5+
Release notes:
6+
7+
* Java 17 minium
8+
* GeoTools 34.0
9+
* Use GeoTools bill-of-materials to manage dependencies
10+
* ImageN 0.9.0
11+
* jackson dataformat 2.19.0
12+
* guava 33.4.8-jre
13+
* Xalan 2.7.3
14+
315
## Release 2.4-M0
416

517
Release notes:

‎pom.xml‎

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,34 @@
3838

3939
<properties>
4040
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41-
<log4j-version>2.24.3</log4j-version>
42-
<spring-version>5.3.39</spring-version>
43-
<gt-version>34-SNAPSHOT</gt-version>
44-
<imagen.version>0.9.0-SNAPSHOT</imagen.version>
45-
<pdfbox-version>2.0.34</pdfbox-version>
41+
<!--log4j-version>2.24.3</log4j-version-->
42+
<spring.version>5.3.39</spring.version>
43+
<gt.version>34.0</gt.version>
44+
<imagen.version>0.9.0</imagen.version> <!-- sync with gt-platform-dependences -->
45+
<pdfbox.version>2.0.34</pdfbox.version>
4646
<metrics-version>4.2.30</metrics-version>
47-
<jackson2.version>2.18.2</jackson2.version>
47+
<!--jackson2.version>2.18.2</jackson2.version-->
4848
<fork.javac>true</fork.javac>
4949
<javac.maxHeapSize>512m</javac.maxHeapSize>
5050
</properties>
5151

5252
<dependencyManagement>
5353
<dependencies>
5454
<dependency>
55+
<groupId>org.geotools</groupId>
56+
<artifactId>gt-bom</artifactId>
57+
<version>${gt.version}</version>
58+
<type>pom</type>
59+
<scope>import</scope>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.geotools</groupId>
63+
<artifactId>gt-platform-dependencies</artifactId>
64+
<version>${gt.version}</version>
65+
<type>pom</type>
66+
<scope>import</scope>
67+
</dependency>
68+
<!-- <dependency>
5569
<groupId>org.apache.httpcomponents</groupId>
5670
<artifactId>httpclient</artifactId>
5771
<version>4.5.13</version>
@@ -70,27 +84,18 @@
7084
<groupId>org.apache.logging.log4j</groupId>
7185
<artifactId>log4j-slf4j-impl</artifactId>
7286
<version>${log4j-version}</version>
73-
</dependency>
87+
</dependency>-->
7488
<dependency>
7589
<groupId>org.springframework</groupId>
7690
<artifactId>spring-context</artifactId>
77-
<version>${spring-version}</version>
91+
<version>${spring.version}</version>
7892
</dependency>
7993
<dependency>
8094
<groupId>org.springframework</groupId>
8195
<artifactId>spring-web</artifactId>
82-
<version>${spring-version}</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.geotools</groupId>
86-
<artifactId>gt-epsg-hsql</artifactId>
87-
<version>${gt-version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.geotools</groupId>
91-
<artifactId>gt-render</artifactId>
92-
<version>${gt-version}</version>
96+
<version>${spring.version}</version>
9397
</dependency>
98+
<!--
9499
<dependency>
95100
<groupId>com.fasterxml.jackson.core</groupId>
96101
<artifactId>jackson-databind</artifactId>
@@ -106,58 +111,55 @@
106111
<artifactId>jackson-dataformat-yaml</artifactId>
107112
<version>${jackson2.version}</version>
108113
</dependency>
114+
-->
109115
<!-- transitive dependency -->
110-
<dependency>
111-
<groupId>org.locationtech.jts</groupId>
112-
<artifactId>jts-core</artifactId>
113-
<version>1.19.0</version>
114-
<exclusions>
115-
<exclusion>
116-
<groupId>xerces</groupId>
117-
<artifactId>xercesImpl</artifactId>
118-
</exclusion>
119-
</exclusions>
120-
</dependency>
121116
<dependency>
122117
<groupId>javax.servlet</groupId>
123118
<artifactId>servlet-api</artifactId>
124119
<version>2.5</version>
125120
</dependency>
126-
<dependency>
121+
122+
<!-- <dependency>
127123
<groupId>com.google.guava</groupId>
128124
<artifactId>guava</artifactId>
129125
<version>15.0</version>
130126
</dependency>
127+
-->
131128
<dependency>
132129
<groupId>org.apache.pdfbox</groupId>
133130
<artifactId>pdfbox</artifactId>
134-
<version>${pdfbox-version}</version>
131+
<version>${pdfbox.version}</version>
135132
</dependency>
136133
<dependency>
137134
<groupId>org.apache.pdfbox</groupId>
138135
<artifactId>pdfbox-tools</artifactId>
139-
<version>${pdfbox-version}</version>
136+
<version>${pdfbox.version}</version>
140137
</dependency>
138+
<!-- sync with geoserver -->
141139
<dependency>
142140
<groupId>commons-httpclient</groupId>
143141
<artifactId>commons-httpclient</artifactId>
144142
<version>3.1</version>
145143
</dependency>
144+
146145
<dependency>
147146
<groupId>org.mockito</groupId>
148147
<artifactId>mockito-core</artifactId>
149-
<version>1.9.5</version>
148+
<version>5.15.2</version>
149+
</dependency>
150+
<dependency>
151+
<groupId>xerces</groupId>
152+
<artifactId>xercesImpl</artifactId>
153+
<version>2.12.2</version>
150154
</dependency>
155+
<!--
151156
<dependency>
152157
<groupId>org.apache.xmlgraphics</groupId>
153158
<artifactId>batik-transcoder</artifactId>
154159
<version>1.7</version>
155160
</dependency>
156-
<dependency>
157-
<groupId>xerces</groupId>
158-
<artifactId>xercesImpl</artifactId>
159-
<version>2.7.1</version>
160-
</dependency>
161+
-->
162+
161163
<dependency>
162164
<groupId>com.github.librepdf</groupId>
163165
<artifactId>openpdf</artifactId>
@@ -168,11 +170,13 @@
168170
<artifactId>json</artifactId>
169171
<version>20231013</version>
170172
</dependency>
173+
<!--
171174
<dependency>
172175
<groupId>org.eclipse.imagen</groupId>
173176
<artifactId>imagen-core</artifactId>
174177
<version>${imagen.version}</version>
175178
</dependency>
179+
-->
176180
<dependency>
177181
<groupId>org.eclipse.imagen</groupId>
178182
<artifactId>imagen-legacy-codec-core</artifactId>
@@ -182,7 +186,7 @@
182186
<dependency>
183187
<groupId>xalan</groupId>
184188
<artifactId>xalan</artifactId>
185-
<version>2.7.0</version>
189+
<version>2.7.3</version>
186190
</dependency>
187191
<dependency>
188192
<groupId>io.dropwizard.metrics</groupId>

0 commit comments

Comments
 (0)