Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged json-utils with jolt-core so there are no modularity issues #873

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
language: java
dist: trusty
jdk:
- oraclejdk8
2 changes: 1 addition & 1 deletion cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-parent</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand Down
9 changes: 2 additions & 7 deletions complete/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-parent</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand All @@ -17,12 +17,7 @@
<dependencies>
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>json-utils</artifactId>
<artifactId>jolt-core-all</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
17 changes: 5 additions & 12 deletions gettingStarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,18 @@ Maven Dependency to Add to your pom file
``` xml
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-core</artifactId>
<version>${latest.jolt.version}</version>
</dependency>
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>json-utils</artifactId>
<artifactId>jolt-core-all</artifactId>
<version>${latest.jolt.version}</version>
</dependency>
```

Where `latest.jolt.version` looks like `0.0.16`, and can be found by looking at the [project's releases](https://github.com/bazaarvoice/jolt/releases).

The two maven artifacts are:

1. `jolt-core` : only one dependency on apache.commons for StringUtils
* The goal is for the `jolt-core` artifact to be pure Java, so that it does not cause any dependency issues.
2. `json-utils` : Jackson wrapper and testing utilities. Used by jolt-core as a test dependency.
* If you are willing to pull in Jackson 2, this artifact provides nice utility methods.
The maven artifact is:

1. `jolt-core-all` : Previously there were two dependencies but that made it incompatible with Java 9+, and they were pretty much always
used together so, they have been merged into one.
* Only dependencies are on apache.commons for StringUtils and Jackson 2 to provide nice utility methods.

## 2 Code and Sample Data

Expand Down
10 changes: 2 additions & 8 deletions guice/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-parent</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

Expand All @@ -27,13 +27,7 @@

<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>json-utils</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-core</artifactId>
<artifactId>jolt-core-all</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
32 changes: 24 additions & 8 deletions jolt-core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-parent</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>

<artifactId>jolt-core</artifactId>
<artifactId>jolt-core-all</artifactId>
<name>Jolt Core</name>
<packaging>jar</packaging>

Expand All @@ -24,15 +28,16 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>json-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>

<dependency>
Expand Down Expand Up @@ -61,6 +66,17 @@
</formats>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Automatic-Module-Name>jolt.core.all</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
39 changes: 0 additions & 39 deletions json-utils/pom.xml

This file was deleted.

2 changes: 1 addition & 1 deletion parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-parent</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Jolt Parent</name>
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-parent</artifactId>
<version>0.1.2-SNAPSHOT</version>
<version>0.2.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>

Expand All @@ -22,7 +22,6 @@
<modules>
<module>parent</module>
<module>jolt-core</module>
<module>json-utils</module>
<module>cli</module>
<module>guice</module>
<module>complete</module>
Expand Down