Skip to content

Commit d9c660f

Browse files
authored
Fix compilation for Java 10 (#454)
1 parent c0a2f6d commit d9c660f

File tree

3 files changed

+32
-13
lines changed

3 files changed

+32
-13
lines changed

.kokoro/presubmit/java9.cfg

Lines changed: 0 additions & 7 deletions
This file was deleted.

google-http-client-jdo/pom.xml

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,32 @@
5454
</plugin>
5555
<plugin>
5656
<groupId>org.datanucleus</groupId>
57-
<artifactId>maven-datanucleus-plugin</artifactId>
57+
<artifactId>datanucleus-maven-plugin</artifactId>
58+
<version>${project.datanucleus-maven-plugin.version}</version>
5859
<configuration>
60+
<api>JDO</api>
5961
<verbose>true</verbose>
6062
</configuration>
63+
<dependencies>
64+
<dependency>
65+
<groupId>org.datanucleus</groupId>
66+
<artifactId>datanucleus-core</artifactId>
67+
<version>${project.datanucleus-core.version}</version>
68+
<scope>runtime</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>org.datanucleus</groupId>
72+
<artifactId>datanucleus-api-jdo</artifactId>
73+
<version>${project.datanucleus-api-jdo.version}</version>
74+
<scope>runtime</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>javax.jdo</groupId>
78+
<artifactId>jdo2-api</artifactId>
79+
<version>${project.jdo2-api.version}</version>
80+
<scope>runtime</scope>
81+
</dependency>
82+
</dependencies>
6183
<executions>
6284
<execution>
6385
<phase>process-classes</phase>

pom.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -242,17 +242,17 @@
242242
<dependency>
243243
<groupId>org.datanucleus</groupId>
244244
<artifactId>datanucleus-core</artifactId>
245-
<version>3.2.2</version>
245+
<version>${project.datanucleus-core.version}</version>
246246
</dependency>
247247
<dependency>
248248
<groupId>org.datanucleus</groupId>
249249
<artifactId>datanucleus-api-jdo</artifactId>
250-
<version>3.2.1</version>
250+
<version>${project.datanucleus-api-jdo.version}</version>
251251
</dependency>
252252
<dependency>
253253
<groupId>org.datanucleus</groupId>
254254
<artifactId>datanucleus-rdbms</artifactId>
255-
<version>3.2.1</version>
255+
<version>${project.datanucleus-rdbms.version}</version>
256256
</dependency>
257257
<dependency>
258258
<groupId>mysql</groupId>
@@ -382,7 +382,7 @@
382382
<plugin>
383383
<groupId>org.codehaus.mojo</groupId>
384384
<artifactId>clirr-maven-plugin</artifactId>
385-
<version>2.6</version>
385+
<version>2.8</version>
386386
</plugin>
387387
<plugin>
388388
<groupId>org.codehaus.mojo</groupId>
@@ -402,7 +402,7 @@
402402
<plugin>
403403
<groupId>org.datanucleus</groupId>
404404
<artifactId>maven-datanucleus-plugin</artifactId>
405-
<version>2.2.1</version>
405+
<version>${project.datanucleus-maven-plugin.version}</version>
406406
</plugin>
407407
</plugins>
408408
</pluginManagement>
@@ -562,5 +562,9 @@
562562
<project.commons-logging.version>1.1.1</project.commons-logging.version>
563563
<project.httpclient.version>4.5.5</project.httpclient.version>
564564
<project.jdo2-api.version>2.3-eb</project.jdo2-api.version>
565+
<project.datanucleus-core.version>3.2.2</project.datanucleus-core.version>
566+
<project.datanucleus-api-jdo.version>3.2.1</project.datanucleus-api-jdo.version>
567+
<project.datanucleus-rdbms.version>3.2.1</project.datanucleus-rdbms.version>
568+
<project.datanucleus-maven-plugin.version>4.0.3</project.datanucleus-maven-plugin.version>
565569
</properties>
566570
</project>

0 commit comments

Comments
 (0)