Skip to content

Commit

Permalink
v1.3.2 - fixed jersey dependency that targets java 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
sargue committed Jan 24, 2017
1 parent d5d7b76 commit 53061b5
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 12 deletions.
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ Add the dependency to your project:

#### Gradle

`compile 'net.sargue:mailgun:1.3.1'`
`compile 'net.sargue:mailgun:1.3.2'`

#### Maven

```xml
<dependency>
<groupId>net.sargue</groupId>
<artifactId>mailgun</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
</dependency>
```

Expand Down Expand Up @@ -235,6 +235,10 @@ Mail.using(configuration)

* Merged PR [MailBuilder support for null name, to reduce burden of user](https://github.com/sargue/mailgun/pull/9)

### v1.3.2

* Fixed dependency: Jersey 2.25 as >2.26 targets Java EE 8 and Java 8 language level.

## Test suite

There is a test suite using [WireMock](http://wiremock.org) to mock the Mailgun
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apply plugin: 'maven'

group 'net.sargue'
archivesBaseName = 'mailgun'
version '1.3.1'
version '1.3.2'

sourceCompatibility = 1.7

Expand All @@ -17,8 +17,8 @@ repositories {
}

dependencies {
compile 'org.glassfish.jersey.core:jersey-client:[2.22,)'
compile 'org.glassfish.jersey.media:jersey-media-multipart:[2.22,)'
compile 'org.glassfish.jersey.core:jersey-client:2.25'
compile 'org.glassfish.jersey.media:jersey-media-multipart:2.25'
testCompile 'com.github.tomakehurst:wiremock:1.57'
testCompile 'org.awaitility:awaitility:2.0.0'
testCompile 'org.slf4j:slf4j-simple:1.7.21'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sargue/mailgun/MultipartBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public MultipartBuilder attachment(String content, String filename) {
* @param cidName the name to give to the attachment as referenced by the HTML email body
* i.e. use cidName sample-image.png for the below example
* <p>
* <img src="cid:sample-image.png"/>
* <img src="cid:sample-image.png" alt="sample">
* </p>
* @return this builder
*/
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/sargue/mailgun/content/Body.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public String html() {
* Sets the HTML representation of this email body content.
*
* @param html the new HTML representation of this email body content
* @return this same Body object for call chaining
*/
public Body html(String html) {
this.html = html;
Expand All @@ -72,6 +73,7 @@ public String text() {
* Sets the plain text representation of this email body content.
*
* @param text the new plain text representation of this email body content
* @return this same Body object for call chaining
*/
public Body text(String text) {
this.text = text;
Expand Down
19 changes: 13 additions & 6 deletions src/main/java/net/sargue/mailgun/content/Builder.java
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public Builder p(String content) {

/**
* Opens a {@code <pre>} tag.
* <p/>
* <p>
* @return this builder
*/
public Builder pre() {
Expand All @@ -321,7 +321,7 @@ public Builder pre() {
/**
* Adds a {@code <pre>} block with text content. The plain text version will
* get only the content.
* <p/>
* <p>
* @param content the text content
* @return this builder
*/
Expand All @@ -331,7 +331,7 @@ public Builder pre(String content) {

/**
* Opens a {@code <em>} tag.
* <p/>
* <p>
*
* @return this builder
*/
Expand All @@ -352,7 +352,7 @@ public Builder em(String content) {

/**
* Opens a {@code <strong>} tag.
* <p/>
* <p>
*
* @return this builder
*/
Expand Down Expand Up @@ -404,6 +404,7 @@ public Builder row() {
/**
* Adds a new row with one column.
*
* @param <T> the type parameter
* @param firstCell the first cell content
* @return this builder
*/
Expand All @@ -414,6 +415,7 @@ public <T> Builder row(T firstCell) {
/**
* Adds a new row with two columns.
*
* @param <T> the type parameter
* @param firstCell the first cell content
* @param secondCell the second cell content
* @return this builder
Expand All @@ -425,8 +427,9 @@ public <T> Builder row(T firstCell, T secondCell) {
/**
* Adds a new row with two columns, the first one being a header cell.
*
* @param label the header cell content
* @param data the second cell content
* @param <T> the type parameter
* @param label the header cell content
* @param data the second cell content
* @return this builder
*/
public <T> Builder rowh(String label, T data) {
Expand All @@ -436,6 +439,7 @@ public <T> Builder rowh(String label, T data) {
/**
* Adds a new row with three columns.
*
* @param <T> the type parameter
* @param firstCell the first cell content
* @param secondCell the second cell content
* @param thirdCell the third cell content
Expand All @@ -454,6 +458,7 @@ public <T> Builder row(T firstCell,
/**
* Adds a new row with four columns.
*
* @param <T> the type parameter
* @param firstCell the first cell content
* @param secondCell the second cell content
* @param thirdCell the third cell content
Expand Down Expand Up @@ -493,6 +498,7 @@ public Builder cellHeader() {
/**
* Adds a new cell with text content.
*
* @param <T> the type parameter
* @param content the content to show inside the cell
* @return this builder
*/
Expand All @@ -503,6 +509,7 @@ public <T> Builder cell(T content) {
/**
* Adds a new cell header with text content.
*
* @param <T> the type parameter
* @param content the content to show inside the cell header
* @return this builder
*/
Expand Down

0 comments on commit 53061b5

Please sign in to comment.