Skip to content

Commit

Permalink
Fix #42 (I hope)
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed May 5, 2016
1 parent cd633c7 commit ee99a29
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 8 deletions.
7 changes: 7 additions & 0 deletions jr-objects/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ has no other dependencies, and provides additional builder-style content generat
<packageVersion.template.output>${generatedSourcesDir}/${packageVersion.dir}/PackageVersion.java</packageVersion.template.output>
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
7 changes: 7 additions & 0 deletions jr-stree/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ has no other dependencies.
<packageVersion.template.output>${generatedSourcesDir}/${packageVersion.dir}/PackageVersion.java</packageVersion.template.output>
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
Expand Down
18 changes: 10 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.jackson>2.7.3</version.jackson>
<version.jackson>2.7.4</version.jackson>
<!-- 26-Nov-2015, tatu: This should still work with 2.7, as jackson-core
only requires Java 6 (unlike databind and other modules)
-->
Expand All @@ -40,12 +40,14 @@
<javac.debuglevel>source</javac.debuglevel>
</properties>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${version.jackson}</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${version.jackson}</version>
</dependency>
</dependencies>
</dependencyManagement>

</project>
6 changes: 6 additions & 0 deletions release-notes/VERSION
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Project: jackson-jr
=== Releases ===
------------------------------------------------------------------------

2.7.5 (not yet released)

#42: Incorrect `jackson-core` dependency form parent pom leads to inclusion
of non-shaded core jar in `jr-all`
(reported by Adam V)

2.7.4 (29-Apr-2016)

No changes since 2.7.3.
Expand Down

0 comments on commit ee99a29

Please sign in to comment.