Skip to content

Commit 611aa82

Browse files
committed
Merge branch 'main' into UIMA-6425-uimaFIT-3.3.0-release
* main: [UIMA-6432] Upgrade dependencies [UIMA-6432] Upgrade dependencies [UIMA-6432] Upgrade dependencies [UIMA-6432] Upgrade dependencies (uimaFIT 3.3.0) [UIMA-6463] Use toolchains to ensure compatibility with Java 1.8 % Conflicts: % RELEASE_NOTES.md % uimafit-parent/pom.xml
2 parents e37cfb0 + e67b593 commit 611aa82

2 files changed

Lines changed: 25 additions & 7 deletions

File tree

RELEASE_NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ uimaFIT 3.3.0 should be used in combination with
4646

4747
* Java 1.8 or higher
4848
* UIMA Java SDK 3.3.0 or higher
49-
* Spring Framework 5.3.19 or higher
49+
* Spring Framework 5.3.20 or higher

uimafit-parent/pom.xml

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<groupId>org.apache.uima</groupId>
2424
<artifactId>parent-pom</artifactId>
2525
<relativePath />
26-
<version>15-SNAPSHOT</version>
26+
<version>15</version>
2727
</parent>
2828
<artifactId>uimafit-parent</artifactId>
2929
<version>3.3.0-SNAPSHOT</version>
@@ -41,19 +41,19 @@
4141
<maven.compiler.source>1.8</maven.compiler.source>
4242
<maven.compiler.target>1.8</maven.compiler.target>
4343
<api_check_oldVersion>3.2.0</api_check_oldVersion>
44-
44+
4545
<assertj-version>3.22.0</assertj-version>
4646
<commons-io-version>2.11.0</commons-io-version>
4747
<commons-lang3-version>3.12.0</commons-lang3-version>
4848
<junit-version>5.8.2</junit-version>
4949
<groovy-version>3.0.10</groovy-version>
5050
<mockito-version>4.4.0</mockito-version>
51-
<spring-version>5.3.19</spring-version>
51+
<spring-version>5.3.20</spring-version>
5252
<slf4j-version>1.7.36</slf4j-version>
5353
<uima-version>3.3.0</uima-version>
5454
<xmlunit-version>2.9.0</xmlunit-version>
5555
</properties>
56-
56+
5757
<dependencies>
5858
<dependency>
5959
<groupId>org.junit.jupiter</groupId>
@@ -192,6 +192,24 @@
192192

193193
<build>
194194
<plugins>
195+
<plugin>
196+
<groupId>org.apache.maven.plugins</groupId>
197+
<artifactId>maven-toolchains-plugin</artifactId>
198+
<executions>
199+
<execution>
200+
<goals>
201+
<goal>toolchain</goal>
202+
</goals>
203+
</execution>
204+
</executions>
205+
<configuration>
206+
<toolchains>
207+
<jdk>
208+
<version>${maven.compiler.target}</version>
209+
</jdk>
210+
</toolchains>
211+
</configuration>
212+
</plugin>
195213
<plugin>
196214
<!-- See: https://issues.apache.org/jira/browse/UIMA-6351 -->
197215
<groupId>com.github.siom79.japicmp</groupId>
@@ -244,15 +262,15 @@
244262
<goal>execute</goal>
245263
</goals>
246264
<configuration>
247-
<source>
265+
<source><![CDATA[
248266
def noticeFile = new File(project.basedir.path + "/NOTICE");
249267
if (noticeFile.exists()) {
250268
project.properties.postNoticeText = noticeFile.text;
251269
println "Loaded NOTICE file content into property [postNoticeText]"
252270
} else {
253271
println "No NOTICE file was found - content not loaded into property [postNoticeText]"
254272
}
255-
</source>
273+
]]></source>
256274
</configuration>
257275
</execution>
258276
</executions>

0 commit comments

Comments
 (0)