|
23 | 23 | </scm>
|
24 | 24 |
|
25 | 25 | <properties>
|
26 |
| - <!-- 16-Sep-2016, tatu: Retain Java6/JDK1.6 compatibility for streaming for Jackson 2.x --> |
| 26 | + <!-- 04-Mar-2019, tatu: Retain Java6/JDK1.6 compatibility for annotations for Jackson 2.x, |
| 27 | + but use Moditect to get JDK9+ module info support; need newer bundle plugin as well |
| 28 | + --> |
27 | 29 | <javac.src.version>1.6</javac.src.version>
|
28 | 30 | <javac.target.version>1.6</javac.target.version>
|
29 | 31 |
|
30 |
| - <!-- 04-May-2016, tatu: Bundle-plugin 3.x seems to require Java 7, so to |
31 |
| - build for Java 6 need to downgrade here to last working 2.x version |
32 |
| - (2.5.4 had some issues wrt shading) |
33 |
| - --> |
34 |
| - <version.plugin.bundle>2.5.3</version.plugin.bundle> |
| 32 | + <maven.compiler.source>1.6</maven.compiler.source> |
| 33 | + <maven.compiler.target>1.6</maven.compiler.target> |
| 34 | + |
| 35 | + <version.plugin.bundle>3.2.0</version.plugin.bundle> |
35 | 36 |
|
36 | 37 | <osgi.export>com.fasterxml.jackson.core;version=${project.version},
|
37 | 38 | com.fasterxml.jackson.core.*;version=${project.version}
|
@@ -95,6 +96,30 @@ com.fasterxml.jackson.core.*;version=${project.version}
|
95 | 96 | <groupId>com.google.code.maven-replacer-plugin</groupId>
|
96 | 97 | <artifactId>replacer</artifactId>
|
97 | 98 | </plugin>
|
| 99 | + |
| 100 | + <!-- 04-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8 |
| 101 | + will have to use `moduleInfoFile` which is crappy but anything else requires |
| 102 | + JDK 9+. With Jackson 3.0 will upgrade. |
| 103 | + --> |
| 104 | + <plugin> |
| 105 | + <groupId>org.moditect</groupId> |
| 106 | + <artifactId>moditect-maven-plugin</artifactId> |
| 107 | + <executions> |
| 108 | + <execution> |
| 109 | + <id>add-module-infos</id> |
| 110 | + <phase>package</phase> |
| 111 | + <goals> |
| 112 | + <goal>add-module-info</goal> |
| 113 | + </goals> |
| 114 | + <configuration> |
| 115 | + <overwriteExistingFiles>true</overwriteExistingFiles> |
| 116 | + <module> |
| 117 | + <moduleInfoFile>src/moditect/module-info.java</moduleInfoFile> |
| 118 | + </module> |
| 119 | + </configuration> |
| 120 | + </execution> |
| 121 | + </executions> |
| 122 | + </plugin> |
98 | 123 | </plugins>
|
99 | 124 | </build>
|
100 | 125 |
|
|
0 commit comments