[jackson-core] 03/11: Replace jackson-bom, jackson-parent and oss-parent with latest versions.
Markus Koschany
apo at moszumanska.debian.org
Wed Oct 11 22:10:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository jackson-core.
commit 319e3b276f352017579e9fa90869be7bdd6ab9eb
Author: Markus Koschany <apo at debian.org>
Date: Wed Oct 11 21:48:37 2017 +0200
Replace jackson-bom, jackson-parent and oss-parent with latest versions.
---
...ckson-bom-2.8.5.1.pom => jackson-bom-2.9.1.pom} | 134 +++++++++++++--------
...son-parent-2.8.pom => jackson-parent-2.9.1.pom} | 24 ++--
debian/{oss-parent-27.pom => oss-parent-31.pom} | 96 ++++++++++-----
debian/rules | 6 +-
4 files changed, 163 insertions(+), 97 deletions(-)
diff --git a/debian/jackson-bom-2.8.5.1.pom b/debian/jackson-bom-2.9.1.pom
similarity index 63%
rename from debian/jackson-bom-2.8.5.1.pom
rename to debian/jackson-bom-2.9.1.pom
index 671d603..dbf6e75 100644
--- a/debian/jackson-bom-2.8.5.1.pom
+++ b/debian/jackson-bom-2.9.1.pom
@@ -5,11 +5,12 @@
<parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-parent</artifactId>
- <version>2.8</version>
+ <!-- need newer version over 2.9.0 to compile on Java 9 -->
+ <version>2.9.1</version>
</parent>
<artifactId>jackson-bom</artifactId>
- <version>2.8.5.1</version>
+ <version>2.9.1</version>
<packaging>pom</packaging>
<url>https://github.com/FasterXML/jackson-bom</url>
@@ -17,11 +18,31 @@
<connection>scm:git:git at github.com:FasterXML/jackson-bom.git</connection>
<developerConnection>scm:git:git at github.com:FasterXML/jackson-bom.git</developerConnection>
<url>http://github.com/FasterXML/jackson-bom</url>
- <tag>jackson-bom-2.8.5.1</tag>
+ <tag>jackson-bom-2.9.1</tag>
</scm>
<properties>
- <jackson.version>2.8.5</jackson.version>
+ <jackson.version>2.9.1</jackson.version>
+
+ <!-- 29-Jul-2017, tatu: With Jackson 2.x we will release full patch-level versions
+ of annotations BUT they are all identical, content-wise. Because of this
+ there is no point in updating dependency to later versions when using BOM.
+ With 3.x we will most likely drop patch level altogether.
+ -->
+ <!-- 07-Sep-2017, tatu: ... although in special case of 2.9.1 that would
+ add Java 9 Automatic Module Name so need to consider
+ -->
+ <jackson.version.annotations>2.9.0</jackson.version.annotations>
+ <jackson.version.core>${jackson.version}</jackson.version.core>
+ <jackson.version.databind>${jackson.version}</jackson.version.databind>
+ <jackson.version.dataformat>${jackson.version}</jackson.version.dataformat>
+ <jackson.version.datatype>${jackson.version}</jackson.version.datatype>
+ <jackson.version.jaxrs>${jackson.version}</jackson.version.jaxrs>
+ <jackson.version.jacksonjr>${jackson.version}</jackson.version.jacksonjr>
+
+ <jackson.version.module>${jackson.version}</jackson.version.module>
+ <jackson.version.module.kotlin>${jackson.version.module}</jackson.version.module.kotlin>
+ <jackson.version.module.scala>${jackson.version.module}</jackson.version.module.scala>
</properties>
<dependencyManagement>
@@ -31,232 +52,247 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.annotations}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.core}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.databind}</version>
</dependency>
<!-- Data Formats -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-avro</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-ion</artifactId>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-properties</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-protobuf</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.dataformat}</version>
</dependency>
<!-- Data Types -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate3</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate4</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hibernate5</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-hppc</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jaxrs</artifactId>
- <version>${jackson.version}</version>
+ <!-- Should this follow datatype or JAX-RS version info?
+ -->
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-json-org</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr353</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-pcollections</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.datatype}</version>
</dependency>
<!-- JAX-RS -->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson.version.jaxrs}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-cbor-provider</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jaxrs}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jaxrs}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-smile-provider</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jaxrs}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-xml-provider</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jaxrs}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-yaml-provider</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jaxrs}</version>
</dependency>
<!-- Jackson Jr. -->
<dependency>
<groupId>com.fasterxml.jackson.jr</groupId>
<artifactId>jackson-jr-all</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jacksonjr}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jr</groupId>
<artifactId>jackson-jr-objects</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jacksonjr}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jr</groupId>
<artifactId>jackson-jr-retrofit2</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jacksonjr}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jr</groupId>
<artifactId>jackson-jr-stree</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.jacksonjr}</version>
</dependency>
- <!-- Modules -->
+ <!-- Modules, basic -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-guice</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jsonSchema</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module.kotlin}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-mrbean</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-osgi</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-parameter-names</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-paranamer</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module}</version>
</dependency>
+
+ <!-- Language Modules -->
+
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.10</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module.scala}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.11</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module.scala}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-scala_2.12</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.version.module.scala}</version>
</dependency>
</dependencies>
diff --git a/debian/jackson-parent-2.8.pom b/debian/jackson-parent-2.9.1.pom
similarity index 93%
rename from debian/jackson-parent-2.8.pom
rename to debian/jackson-parent-2.9.1.pom
index ef25a88..306f42b 100644
--- a/debian/jackson-parent-2.8.pom
+++ b/debian/jackson-parent-2.9.1.pom
@@ -5,12 +5,12 @@
<parent>
<groupId>com.fasterxml</groupId>
<artifactId>oss-parent</artifactId>
- <version>27</version>
+ <version>30</version>
</parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-parent</artifactId>
- <version>2.8</version>
+ <version>2.9.1</version>
<packaging>pom</packaging>
<name>Jackson parent poms</name>
@@ -45,25 +45,19 @@
<email>prb at fasterxml.com</email>
</developer>
</developers>
- <contributors>
- <contributor>
- <name>Simone Tripodi</name>
- <email>simonetripodi at apache.org</email>
- </contributor>
- </contributors>
<scm>
<connection>scm:git:git at github.com:FasterXML/jackson-parent.git</connection>
<developerConnection>scm:git:git at github.com:FasterXML/jackson-parent.git</developerConnection>
<url>http://github.com/FasterXML/jackson-parent</url>
- <tag>jackson-parent-2.8</tag>
+ <tag>jackson-parent-2.9.1</tag>
</scm>
<properties>
- <version.jackson.annotations>2.8.0</version.jackson.annotations>
+ <jackson.version.annotations>2.9.0</jackson.version.annotations>
<!-- 02-Oct-2015, tatu: Jackson 2.4 and above are Java 6 (earlier versions Java 5);
- Jackson 2.7 and above Java 6 (with exception of `jackson-core`/`jackson-annotations` still Java 6)
+ Jackson 2.7 and above Java 7 (with exception of `jackson-core`/`jackson-annotations` still Java 6),
-->
<javac.src.version>1.7</javac.src.version>
<javac.target.version>1.7</javac.target.version>
@@ -87,14 +81,16 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${version.jackson.annotations}</version>
+ <version>${jackson.version.annotations}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
+ <!-- 06-Sep-2017, tatu: As per [#6], forcing scope here can be problematic so remove
<scope>test</scope>
+ -->
</dependency>
</dependencies>
</dependencyManagement>
@@ -107,7 +103,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <!-- 06-Sep-2017, tatu: Need this version for Java 9 builds
+ -->
+ <version>3.0.0-M1</version>
<executions>
<execution>
<id>enforce-java</id>
diff --git a/debian/oss-parent-27.pom b/debian/oss-parent-31.pom
similarity index 90%
rename from debian/oss-parent-27.pom
rename to debian/oss-parent-31.pom
index edc9d3c..ae498c7 100644
--- a/debian/oss-parent-27.pom
+++ b/debian/oss-parent-31.pom
@@ -5,7 +5,7 @@
<groupId>com.fasterxml</groupId>
<artifactId>oss-parent</artifactId>
- <version>27</version>
+ <version>31</version>
<packaging>pom</packaging>
<name>FasterXML.com parent pom</name>
@@ -38,7 +38,7 @@
<connection>scm:git:git at github.com:FasterXML/oss-parent.git</connection>
<developerConnection>scm:git:git at github.com:FasterXML/oss-parent.git</developerConnection>
<url>http://github.com/FasterXML/oss-parent</url>
- <tag>oss-parent-27</tag>
+ <tag>oss-parent-31</tag>
</scm>
<issueManagement>
<system>GitHub Issue Management</system>
@@ -64,6 +64,10 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir>
+
+ <javadoc.maxmemory>1g</javadoc.maxmemory>
+
<!-- Use 1.6 as default baseline -->
<javac.src.version>1.6</javac.src.version>
<javac.target.version>1.6</javac.target.version>
@@ -90,24 +94,29 @@
| shared build/report plugins version
-->
- <!-- 11-Jul-2015, tatu: For some reason version 2.5.4 failed when
- used with Shade plugin (2.2 - 2.4); hence 2.5.3 was still used for Jackson 2.7
-
- 29-Apr-2016, tatu: trying to upgrade to 3.0.1 now, for Jackson 2.8
+ <!-- 29-Apr-2016, tatu: trying to upgrade to 3.0.1 now, for Jackson 2.8
+ 04-Nov-2016, tatu: and to 3.2.0 for Jackson 2.9
-->
- <version.plugin.bundle>3.0.1</version.plugin.bundle>
+ <version.plugin.bundle>3.2.0</version.plugin.bundle>
<version.plugin.jar>2.5</version.plugin.jar>
<version.plugin.javadoc>2.9.1</version.plugin.javadoc>
+
<!-- 2.4.2 had issues in releasing non-snapshot versions -->
<version.plugin.release>2.5.3</version.plugin.release>
- <version.plugin.replacer>1.5.2</version.plugin.replacer>
+ <version.plugin.replacer>1.5.3</version.plugin.replacer>
<version.plugin.shade>2.4.3</version.plugin.shade>
- <version.plugin.surefire>2.17</version.plugin.surefire>
- <javadoc.maxmemory>1g</javadoc.maxmemory>
+ <version.plugin.cobertura>2.7</version.plugin.cobertura>
+ <!-- 08-Aug-2017, tatu: Enforcer plugin will not work with Java 9
+ prior to 3.0.0
+ -->
+ <version.plugin.enforcer>3.0.0-M1</version.plugin.enforcer>
+ <version.plugin.surefire>2.17</version.plugin.surefire>
+ <version.plugin.compiler>3.2</version.plugin.compiler>
- <generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir>
+ <!-- other "well-known" lib versions -->
+ <version.junit>4.12</version.junit>
</properties>
@@ -129,39 +138,57 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.7</version>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.3.1</version>
+ <!-- 09-Dec-2016, tatu: 'skip' added in 2.4 (latest now 2.5.2)
+ -->
+ <version>2.4</version>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.7</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${version.plugin.javadoc}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.google.code.maven-replacer-plugin</groupId>
+ <artifactId>maven-replacer-plugin</artifactId>
+ <version>${version.plugin.replacer}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${version.plugin.shade}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.1</version>
</plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.6</version>
+ <version>${version.plugin.cobertura}</version>
</plugin>
<plugin>
@@ -173,7 +200,15 @@
<!--
| stops the "uses" clauses being added to "Export-Package" manifest entry
-->
+<!-- 04-Nov-2016, tatu: Not quite sure why it was disabled; see
+
+ https://github.com/FasterXML/jackson-jaxrs-providers/issues/93
+
+ for problem caused. Because of this, removed from Jackson 2.9
+
<_nouses>true</_nouses>
+-->
+
<!--
| Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd
-->
@@ -208,6 +243,9 @@
</configuration>
</plugin>
+ <!-- Plug-in settings needed for Maven/Nexus release handling
+ -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -218,7 +256,6 @@
<arguments>-Prelease</arguments>
</configuration>
</plugin>
-
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-maven-plugin</artifactId>
@@ -229,12 +266,6 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
- </plugin>
-
</plugins>
</pluginManagement>
@@ -242,7 +273,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.3.1</version>
+ <version>${version.plugin.enforcer}</version>
<executions>
<execution>
<id>enforce-java</id>
@@ -252,9 +283,10 @@
</goals>
<configuration>
<rules>
+ <!-- 08-Aug-2017, tatu: No FX/CTC lib allows 1.5 any more -->
<requireJavaVersion>
- <version>[1.5,)</version>
- <message>[ERROR] The currently supported version of Java is 1.5 or higher</message>
+ <version>[1.6,)</version>
+ <message>[ERROR] The currently supported version of Java is 1.6 or higher</message>
</requireJavaVersion>
<requireMavenVersion>
<version>[3.0,)</version>
@@ -276,7 +308,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.2</version>
+ <version>${version.plugin.compiler}</version>
<configuration>
<source>${javac.src.version}</source>
<target>${javac.target.version}</target>
diff --git a/debian/rules b/debian/rules
index 7bfb873..a30b4cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,9 +13,9 @@ override_dh_auto_install:
dh_auto_install
# Install the parent poms (used by the other jackson packages)
- mh_installpom -plibjackson2-core-java --keep-elements=build debian/oss-parent-27.pom
- mh_installpom -plibjackson2-core-java --keep-elements=build debian/jackson-parent-2.8.pom
- mh_installpom -plibjackson2-core-java --keep-elements=build debian/jackson-bom-2.8.5.1.pom
+ mh_installpom -plibjackson2-core-java --keep-elements=build debian/oss-parent-31.pom
+ mh_installpom -plibjackson2-core-java --keep-elements=build debian/jackson-parent-2.9.1.pom
+ mh_installpom -plibjackson2-core-java --keep-elements=build debian/jackson-bom-2.9.1.pom
override_dh_auto_clean:
rm -f $(VERSION_FILE)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-core.git
More information about the pkg-java-commits
mailing list