Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 72e7b32

Browse files
PhilippSalvisbergPhilippSalvisberg
committed
use JDK 17 for tests and produce JDK8 compatible classes, update versions of dependencies
1 parent e2de011 commit 72e7b32

File tree

1 file changed

+65
-14
lines changed

1 file changed

+65
-14
lines changed

‎sqldev/pom.xml

+65-14
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
<packaging>bundle</packaging>
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
13-
<jdk.version>1.8</jdk.version>
14-
<jdk.version.test>1.8</jdk.version.test>
13+
<jdk.version>8</jdk.version>
14+
<jdk.version.test>17</jdk.version.test>
1515
<!-- requires SQL Developer 4.1.0 or higher (first version based on JDK 1.8) -->
16-
<sqldev.basedir>/Applications/SQLDeveloper21.4.2.app/Contents/Resources/sqldeveloper</sqldev.basedir>
16+
<!-- last version of SQL Developer that uses JDK 8 is 21.4.3 -->
17+
<sqldev.basedir>/Applications/SQLDeveloper21.4.3.app/Contents/Resources/sqldeveloper</sqldev.basedir>
1718
<final.name>utplsql_for_SQLDev_${project.version}</final.name>
1819
<!-- arguments to by added by jacoco plugin for test runs with coverage -->
1920
<!-- -noverify is required in some environments to avoid java.lang.VerifyError -->
@@ -206,19 +207,19 @@
206207
<!-- used mainly to access the database via JdbcTemplate -->
207208
<groupId>org.springframework</groupId>
208209
<artifactId>spring-jdbc</artifactId>
209-
<version>5.3.16</version>
210+
<version>5.3.22</version>
210211
</dependency>
211212
<dependency>
212213
<!-- transitive reference, but IntelliJ wants to have it explicit (to avoid warnings) -->
213214
<groupId>org.springframework</groupId>
214215
<artifactId>spring-core</artifactId>
215-
<version>5.3.20</version>
216+
<version>5.3.22</version>
216217
</dependency>
217218
<dependency>
218219
<!-- used for HtmlUtils.htmlEscape in RunnerPanel -->
219220
<groupId>org.springframework</groupId>
220221
<artifactId>spring-web</artifactId>
221-
<version>5.3.16</version>
222+
<version>5.3.22</version>
222223
</dependency>
223224
<dependency>
224225
<!-- optional, for RunGenerator and TestGenerator -->
@@ -256,7 +257,7 @@
256257
<plugins>
257258
<plugin>
258259
<groupId>org.apache.maven.plugins</groupId>
259-
<version>3.10.0</version>
260+
<version>3.10.1</version>
260261
<artifactId>maven-compiler-plugin</artifactId>
261262
<configuration>
262263
<source>${jdk.version}</source>
@@ -316,7 +317,7 @@
316317
<plugin>
317318
<groupId>org.apache.maven.plugins</groupId>
318319
<artifactId>maven-antrun-plugin</artifactId>
319-
<version>3.0.0</version><!--$NO-MVN-MAN-VER$-->
320+
<version>3.1.0</version><!--$NO-MVN-MAN-VER$-->
320321
<executions>
321322
<execution>
322323
<phase>prepare-package</phase>
@@ -337,7 +338,7 @@
337338
<plugin>
338339
<groupId>org.codehaus.mojo</groupId>
339340
<artifactId>properties-maven-plugin</artifactId>
340-
<version>1.0.0</version>
341+
<version>1.1.0</version>
341342
<executions>
342343
<execution>
343344
<phase>initialize</phase>
@@ -357,7 +358,7 @@
357358
<plugin>
358359
<groupId>org.codehaus.mojo</groupId>
359360
<artifactId>build-helper-maven-plugin</artifactId>
360-
<version>3.1.0</version>
361+
<version>3.3.0</version>
361362
<executions>
362363
<execution>
363364
<id>parse-version</id>
@@ -427,7 +428,7 @@
427428
<!-- - Error:osgi: [org.utplsql.sqldev] Invalid value for Bundle-Version, ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} does not match \d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)? -->
428429
<groupId>org.apache.felix</groupId>
429430
<artifactId>maven-bundle-plugin</artifactId>
430-
<version>4.2.1</version>
431+
<version>5.1.7</version> <!-- Classes found in the wrong director warning with 5.1.7, TODO: find solution to remove it -->
431432
<extensions>true</extensions>
432433
<configuration>
433434
<finalName>${project.name}</finalName>
@@ -497,7 +498,7 @@
497498
</plugin>
498499
<plugin>
499500
<artifactId>maven-assembly-plugin</artifactId>
500-
<version>3.3.0</version><!--$NO-MVN-MAN-VER$-->
501+
<version>3.4.1</version><!--$NO-MVN-MAN-VER$-->
501502
<configuration>
502503
<finalName>${final.name}</finalName>
503504
<appendAssemblyId>false</appendAssemblyId>
@@ -519,7 +520,7 @@
519520
<plugin>
520521
<groupId>net.nicoulaj.maven.plugins</groupId>
521522
<artifactId>checksum-maven-plugin</artifactId>
522-
<version>1.9</version>
523+
<version>1.11</version>
523524
<executions>
524525
<execution>
525526
<id>calculate-checksums</id>
@@ -533,7 +534,7 @@
533534
<plugin>
534535
<groupId>org.jacoco</groupId>
535536
<artifactId>jacoco-maven-plugin</artifactId>
536-
<version>0.8.5</version>
537+
<version>0.8.8</version>
537538
<executions>
538539
<execution>
539540
<goals>
@@ -645,4 +646,54 @@
645646
<tag>master</tag>
646647
<url>https://github.com/utPLSQL/utPLSQL-SQLDeveloper</url>
647648
</scm>
649+
650+
<!-- Profiles as workaround for https://youtrack.jetbrains.com/issue/IDEA-85478 as described in -->
651+
<!-- https://intellij-support.jetbrains.com/hc/en-us/community/posts/360009767720-I-want-to-run-tests-with-different-java-version-than-my-source-java-version -->
652+
<profiles>
653+
<profile>
654+
<id>default</id>
655+
<activation>
656+
<activeByDefault>true</activeByDefault>
657+
</activation>
658+
<build>
659+
<plugins>
660+
<plugin>
661+
<groupId>org.apache.maven.plugins</groupId>
662+
<version>3.10.1</version>
663+
<artifactId>maven-compiler-plugin</artifactId>
664+
<configuration>
665+
<!-- different Java version for main and test -->
666+
<!-- works with Maven builder from IDE or command line -->
667+
<release>${jdk.version}</release>
668+
<testRelease>${jdk.test.version}</testRelease>
669+
</configuration>
670+
</plugin>
671+
</plugins>
672+
</build>
673+
</profile>
674+
<profile>
675+
<id>idea</id>
676+
<activation>
677+
<activeByDefault>false</activeByDefault>
678+
<property>
679+
<name>idea.maven.embedder.version</name>
680+
</property>
681+
</activation>
682+
<build>
683+
<plugins>
684+
<plugin>
685+
<groupId>org.apache.maven.plugins</groupId>
686+
<version>3.10.1</version>
687+
<artifactId>maven-compiler-plugin</artifactId>
688+
<configuration>
689+
<!-- IDEA requires same Java version for main and test -->
690+
<!-- see https://youtrack.jetbrains.com/issue/IDEA-85478 -->
691+
<release>${jdk.test.version}</release>
692+
<testRelease>${jdk.test.version}</testRelease>
693+
</configuration>
694+
</plugin>
695+
</plugins>
696+
</build>
697+
</profile>
698+
</profiles>
648699
</project>

0 commit comments

Comments
 (0)