[jackson-core] 06/07: Updated the parent POMs
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Dec 15 14:39:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jackson-core.
commit e382914d4746daccae9a38885bc9d9ac3201112a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Dec 15 15:33:04 2016 +0100
Updated the parent POMs
---
...ckson-parent-2.7.pom => jackson-parent-2.8.pom} | 39 ++++++++++------------
debian/{oss-parent-25.pom => oss-parent-27.pom} | 22 +++++++-----
debian/rules | 4 +--
3 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/debian/jackson-parent-2.7.pom b/debian/jackson-parent-2.8.pom
similarity index 93%
rename from debian/jackson-parent-2.7.pom
rename to debian/jackson-parent-2.8.pom
index d02f822..ef25a88 100644
--- a/debian/jackson-parent-2.7.pom
+++ b/debian/jackson-parent-2.8.pom
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>com.fasterxml</groupId>
+ <groupId>com.fasterxml</groupId>
<artifactId>oss-parent</artifactId>
- <version>25</version>
+ <version>27</version>
</parent>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-parent</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<packaging>pom</packaging>
<name>Jackson parent poms</name>
@@ -30,6 +30,11 @@
<developers>
<developer>
+ <id>cowtowncoder</id>
+ <name>Tatu Saloranta</name>
+ <email>tatu at fasterxml.com</email>
+ </developer>
+ <developer>
<id>christophercurrie</id>
<name>Christopher Currie</name>
<email />
@@ -39,11 +44,6 @@
<name>Paul Brown</name>
<email>prb at fasterxml.com</email>
</developer>
- <developer>
- <id>cowtowncoder</id>
- <name>Tatu Saloranta</name>
- <email>tatu at fasterxml.com</email>
- </developer>
</developers>
<contributors>
<contributor>
@@ -56,20 +56,17 @@
<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.7</tag>
+ <tag>jackson-parent-2.8</tag>
</scm>
<properties>
- <version.jackson.annotations>2.7.0</version.jackson.annotations>
+ <version.jackson.annotations>2.8.0</version.jackson.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)
-->
<javac.src.version>1.7</javac.src.version>
<javac.target.version>1.7</javac.target.version>
- <!-- With 2.4+, include all debug info for the main executable; need to figure
- out a way to build "non-debug" variants as well
- -->
<javac.debuglevel>lines,source,vars</javac.debuglevel>
<!-- Versions for other dependencies -->
@@ -85,15 +82,6 @@
</properties>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -101,6 +89,13 @@
<artifactId>jackson-annotations</artifactId>
<version>${version.jackson.annotations}</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/debian/oss-parent-25.pom b/debian/oss-parent-27.pom
similarity index 96%
rename from debian/oss-parent-25.pom
rename to debian/oss-parent-27.pom
index c784916..edc9d3c 100644
--- a/debian/oss-parent-25.pom
+++ b/debian/oss-parent-27.pom
@@ -5,7 +5,7 @@
<groupId>com.fasterxml</groupId>
<artifactId>oss-parent</artifactId>
- <version>25</version>
+ <version>27</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-25</tag>
+ <tag>oss-parent-27</tag>
</scm>
<issueManagement>
<system>GitHub Issue Management</system>
@@ -83,21 +83,26 @@
<osgi.requiredExecutionEnvironment />
<osgi.versionpolicy>${range;[===,=+);${@}}</osgi.versionpolicy>
<osgi.includeResource>{maven-resources}</osgi.includeResource>
+ <!-- 27-Dec-2015, tatu: Allow use of "Main-Class" too, default to empty -->
+ <osgi.mainClass />
+
<!--
| shared build/report plugins version
-->
- <!-- 11-Jul-2015, tatu: For some reason version 2.5.4 fails when
- used with Shade plugin (2.2 - 2.4); hence 2.5.3 is still used for Jackson 2.6
+ <!-- 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
-->
- <version.plugin.bundle>2.5.3</version.plugin.bundle>
+ <version.plugin.bundle>3.0.1</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.2</version.plugin.release>
+ <version.plugin.release>2.5.3</version.plugin.release>
<version.plugin.replacer>1.5.2</version.plugin.replacer>
- <version.plugin.shade>2.4</version.plugin.shade>
+ <version.plugin.shade>2.4.3</version.plugin.shade>
<version.plugin.surefire>2.17</version.plugin.surefire>
<javadoc.maxmemory>1g</javadoc.maxmemory>
@@ -185,7 +190,6 @@
<Bundle-DocURL>${project.url}</Bundle-DocURL>
<Bundle-RequiredExecutionEnvironment>${osgi.requiredExecutionEnvironment}</Bundle-RequiredExecutionEnvironment>
-
<Implementation-Build-Date>${maven.build.timestamp}</Implementation-Build-Date>
<X-Compile-Source-JDK>${javac.src.version}</X-Compile-Source-JDK>
<X-Compile-Target-JDK>${javac.target.version}</X-Compile-Target-JDK>
@@ -198,6 +202,8 @@
<Specification-Title>${project.name}</Specification-Title>
<Specification-Version>${project.version}</Specification-Version>
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+
+ <Main-Class>${osgi.mainClass}</Main-Class>
</instructions>
</configuration>
</plugin>
diff --git a/debian/rules b/debian/rules
index 892d89f..3d44bbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,8 @@ 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-25.pom
- mh_installpom -plibjackson2-core-java --keep-elements=build debian/jackson-parent-2.7.pom
+ 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
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