Skip to content

Release 1.8.9: upgrade deps, fix OSGi manifest #36

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.

Sign up for GitHub

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

Closed
Sreini wants to merge 2 commits into from
Closed

Release 1.8.9: upgrade deps, fix OSGi manifest #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af37ced
dev: update deps and fix manifest
Sreini Mar 16, 2026
809346d
Bump version to 1.8.9 for release
Sreini Mar 17, 2026
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
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 1.8.9
* Upgraded dependencies (okio 3.12.0, gson 2.13.1, commons-codec 1.21.0)
* Upgraded all Maven plugins to latest stable versions
* Fixed OSGi Import-Package to exclude unresolvable packages (org.openjsse, dalvik, etc.)
* Added OSGi bundle manifest integration test
* Upgraded maven-bundle-plugin to 5.1.9 (Java 11 compatible)

## 1.8.8
* Fixed transient dependencies for okhttp

Expand Down
66 changes: 49 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.tinify</groupId>
<artifactId>tinify</artifactId>
<version>1.8.8</version>
<version>1.8.9</version>
<name>Tinify</name>
<description>Java client for the Tinify API. Tinify compresses your images intelligently. Read more at https://tinify.com.</description>
<url>https://tinify.com</url>
Expand All @@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<okhttp.version>4.12.0</okhttp.version>
<gson.version>2.9.0</gson.version>
<gson.version>2.13.1</gson.version>
</properties>
<licenses>
<license>
Expand Down Expand Up @@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.4.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.1</version>
<version>3.12.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.0.1</version>
<version>3.2.8</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down Expand Up @@ -113,7 +113,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.5.5</version>
<configuration>
<skip>true</skip>
</configuration>
Expand Down Expand Up @@ -153,13 +153,13 @@
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>3.7.0</version>
<version>3.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
<version>${gson.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -189,7 +189,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
<version>1.21.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -198,7 +198,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.5.1</version>
<version>3.10.0</version>
<executions>
<execution>
<id>copy-agent</id>
Expand All @@ -223,15 +223,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.5.5</version>
<configuration>
<argLine>-javaagent:"${project.build.directory}/agents/jmockit-1.49.jar"</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.15.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -243,7 +243,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<version>3.5.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -256,7 +256,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<version>1.7.0</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand All @@ -267,11 +267,24 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.1</version>
<version>5.1.9</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>!com.tinify.*,!org.bouncycastle.jsse.*,!com.experian.b2b.global.mvdam-project.*,!android.*,!javax.annotation.meta.*,!org.conscrypt.*;resolution:=optional,*
<Import-Package>
!com.tinify.*,
!org.bouncycastle.jsse.*,
!com.experian.b2b.global.mvdam-project.*,
!android.*,
!dalvik.*,
!javax.annotation.meta.*,
!javax.lang.model.*,
!kotlin.reflect.jvm.internal.*,
!org.conscrypt.*,
!org.openjsse.*,
sun.misc;resolution:=optional,
sun.security.ssl;resolution:=optional,
*
</Import-Package>
<Embed-Dependency>
*;scope=compile|runtime
Expand All @@ -283,7 +296,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.1</version>
<version>3.10.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.5</version>
<configuration>
<systemPropertyVariables>
<project.build.directory>${project.build.directory}</project.build.directory>
<project.build.finalName>${project.build.finalName}</project.build.finalName>
</systemPropertyVariables>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
77 changes: 77 additions & 0 deletions src/test/java/com/tinify/BundleManifestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package com.tinify;

import org.junit.Test;

import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.jar.Attributes;

import static org.junit.Assert.*;

public class BundleManifestIT {

private static final List<String> FORBIDDEN_IMPORTS = Arrays.asList(
"org.openjsse.",
"dalvik.",
"android.",
"kotlin.reflect.jvm.internal"
);

private Manifest loadBundleManifest() throws IOException {
String buildDir = System.getProperty("project.build.directory", "target");
String finalName = System.getProperty("project.build.finalName", "tinify-1.8.9");
File jar = new File(buildDir, finalName + ".jar");
assertTrue("Bundle JAR not found: " + jar.getAbsolutePath(), jar.exists());
try (JarFile jarFile = new JarFile(jar)) {
return jarFile.getManifest();
}
}

@Test
public void bundleHasRequiredOsgiHeaders() throws IOException {
Attributes attrs = loadBundleManifest().getMainAttributes();

assertEquals("2", attrs.getValue("Bundle-ManifestVersion"));
assertNotNull("Missing Bundle-SymbolicName", attrs.getValue("Bundle-SymbolicName"));
assertNotNull("Missing Bundle-Version", attrs.getValue("Bundle-Version"));
assertNotNull("Missing Export-Package", attrs.getValue("Export-Package"));
}

@Test
public void importPackageDoesNotContainUnresolvablePackages() throws IOException {
Attributes attrs = loadBundleManifest().getMainAttributes();
String importPackage = attrs.getValue("Import-Package");
assertNotNull("Missing Import-Package header", importPackage);

for (String forbidden : FORBIDDEN_IMPORTS) {
assertFalse(
"Import-Package must not contain " + forbidden + " but was: " + importPackage,
importPackage.contains(forbidden)
);
}
}

@Test
public void exportPackageContainsTinify() throws IOException {
Attributes attrs = loadBundleManifest().getMainAttributes();
String exportPackage = attrs.getValue("Export-Package");
assertTrue(
"Export-Package must contain com.tinify",
exportPackage.contains("com.tinify")
);
}

@Test
public void bundleEmbedsDependencies() throws IOException {
Attributes attrs = loadBundleManifest().getMainAttributes();
String bundleClassPath = attrs.getValue("Bundle-ClassPath");
assertNotNull("Missing Bundle-ClassPath", bundleClassPath);
assertTrue("Bundle-ClassPath must contain okhttp", bundleClassPath.contains("okhttp"));
assertTrue("Bundle-ClassPath must contain gson", bundleClassPath.contains("gson"));
assertTrue("Bundle-ClassPath must contain okio", bundleClassPath.contains("okio"));
}
}
4 changes: 3 additions & 1 deletion src/test/java/com/tinify/ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.logging.Logger;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

public class ClientTest {
Expand Down Expand Up @@ -424,7 +425,8 @@ public void requestWithBadServerResponseRepeatedlyShouldThrowExceptionWithMessag
new Client(key).request(Client.Method.POST, "/shrink");
fail("Expected an Exception to be thrown");
} catch (Exception e) {
assertEquals("Error while parsing response: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 1 path $ (HTTP 543/ParseError)", e.getMessage());
assertTrue(e.getMessage().startsWith("Error while parsing response: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was STRING at line 1 column 1 path $"));
assertTrue(e.getMessage().endsWith("(HTTP 543/ParseError)"));
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/tinify/Integration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void shouldCompressFromFile() throws java.lang.Exception {
assertThat(result.width(), is(equalTo(137)));
assertThat(result.height(), is(equalTo(21)));

assertThat(size, greaterThan((long) 1000));
assertThat(size, greaterThan((long) 900));
assertThat(size, lessThan((long) 1500));

/* width == 137 */
Expand All @@ -74,7 +74,7 @@ public void shouldCompressFromUrl() throws java.lang.Exception {
assertThat(result.width(), is(equalTo(137)));
assertThat(result.height(), is(equalTo(21)));

assertThat(size, greaterThan((long) 1000));
assertThat(size, greaterThan((long) 900));
assertThat(size, lessThan((long) 1500));

/* width == 137 */
Expand Down Expand Up @@ -161,7 +161,7 @@ public void shouldTransformFile() throws java.lang.Exception {
assertThat(result.width(), is(equalTo(137)));
assertThat(result.height(), is(equalTo(21)));

assertThat(size, greaterThan((long) 1000));
assertThat(size, greaterThan((long) 900));
assertThat(size, lessThan((long) 2000));

/* width == 137 */
Expand Down
Loading