Skip to content

Commit

Permalink
Merge pull request #376 from Jaspersoft/8.1.0
Browse files Browse the repository at this point in the history 
Pushing 8.1.0 changes
  • Loading branch information
@hguntupa-tibco
hguntupa-tibco authored Jul 27, 2022
2 parents 9989746 + dbac0b7 commit 64edbe8
Show file tree
Hide file tree
Showing 222 changed files with 1,331 additions and 18,834 deletions.
181 changes: 92 additions & 89 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@

<groupId>com.jaspersoft</groupId>
<artifactId>jrs-rest-java-client</artifactId>
<version>8.0.0</version>
<version>8.1.0</version>
<name>REST client for JasperReports server</name>
<url>http://github.com/Jaspersoft/jrs-rest-java-client</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powermock.version>1.5.5</powermock.version>
<jasperserver-dto.version>8.0.0</jasperserver-dto.version>
<jasperserver-dto.version>8.1.0</jasperserver-dto.version>
<powermock.version>2.0.9</powermock.version>
<jersey.version>2.36</jersey.version>
<jackson.version>2.13.3</jackson.version>
</properties>

<scm>
Expand All @@ -25,16 +27,16 @@

<repositories>
<repository>
<id>jaspersoft-clients-snapshots</id>
<name>Jaspersoft clients snapshots</name>
<url>https://jaspersoft.jfrog.io/jaspersoft/jaspersoft-clients-releases</url>
<id>jaspersoft-clients-snapshots</id>
<name>Jaspersoft clients snapshots</name>
<url>https://jaspersoft.jfrog.io/jaspersoft/jaspersoft-clients-releases</url>
</repository>
<repository>
<id>central</id>
<name>jaspersoft-releases</name>
<url>https://jaspersoft.jfrog.io/jaspersoft/jrs-ce-releases</url>
<id>central</id>
<name>jaspersoft-releases</name>
<url>https://jaspersoft.jfrog.io/jaspersoft/jrs-ce-releases</url>
</repository>
</repositories>
</repositories>

<dependencies>
<dependency>
Expand All @@ -46,54 +48,97 @@
<artifactId>jackson-annotations</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Jersey-->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<version>2.22.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>2.22.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>1.19</version>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>2.22.1</version>
<artifactId>jersey-media-json-processing</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>2.22.1</version>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>

<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.5.0</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>

<!-- TestNG -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.7</version>
<version>7.4.0</version>
<scope>test</scope>
</dependency>

<!-- Mockito & extensions -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<!-- Cannot update to latest 4.x version, as powermock 2.0.9 has compatibility issue with it -->
<version>3.12.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
<artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<artifactId>powermock-module-testng</artifactId>
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -103,60 +148,46 @@
<version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>

<!-- EasyMock -->
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.2</version>
<version>4.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.owlike</groupId>
<artifactId>genson</artifactId>
<version>0.99</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.51</version>
<version>1.70</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.0</version>
<version>3.12.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<version>2.11.0</version>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.17.2</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>1.7.12</version>
<version>1.7.36</version>
</dependency>
</dependencies>

Expand All @@ -166,16 +197,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>3.8.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.5.2</version>
<version>2.7</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
Expand All @@ -188,7 +219,9 @@
</exclude>
<exclude>**/com/jaspersoft/jasperserver/jaxrs/client/core/exceptions/**</exclude>
<exclude>**/com/jaspersoft/jasperserver/jaxrs/client/core/enums/**</exclude>
<exclude>**/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/adhoc/queryexecution/enums/**</exclude>
<exclude>
**/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/adhoc/queryexecution/enums/**
</exclude>
</excludes>
</instrumentation>
</configuration>
Expand All @@ -197,7 +230,7 @@
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<version>2.0.0</version>
<version>4.3.0</version>
<configuration>
<branch>develop</branch>
</configuration>
Expand All @@ -207,7 +240,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.12</version>
<version>2.22.2</version>
<configuration>
<skipTests>false</skipTests>
<testFailureIgnore>false</testFailureIgnore>
Expand Down Expand Up @@ -241,17 +274,17 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.4</version>
<version>3.15.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.14</version>
<version>3.1.2</version>
<configuration>
<configLocation>config/sun_checks.xml</configLocation>
</configuration>
Expand All @@ -263,34 +296,4 @@
</plugin>
</plugins>
</reporting>
<developers>
<developer>
<id>borys.kolesnykov</id>
<name>Borys Kolesnykov</name>
<email>[email protected]</email>
<roles>
<role>architect</role>
<role>developer</role>
</roles>
<timezone>+3</timezone>
</developer>
<developer>
<id>Krasnyanskiy</id>
<name>Alexander Krasnyanskiy</name>
<email>[email protected]</email>
<roles>
<role>developer</role>
</roles>
<timezone>+3</timezone>
</developer>
<developer>
<id>tetiana.iefimenko</id>
<name>Tetiana Iefiemenko</name>
<email>[email protected]</email>
<roles>
<role>developer</role>
</roles>
<timezone>+3</timezone>
</developer>
</developers>
</project>
10 changes: 0 additions & 10 deletions ...oft/jasperserver/jaxrs/client/apiadapters/adhoc/queryexecution/QueryExecutionAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,6 @@ public <T> OperationResult<T> retrieveData(String executionId) {
return request.get();
}

/**
* @deprecated Replaced by {@link QueryExecutionAdapter#delete()}
*/
@Deprecated
public <T> OperationResult<T> deleteExecution(String executionId) {
uri.add(executionId);
JerseyRequest<T> request = buildRequest(responseClass);
return request.delete();
}

public OperationResult delete() {
JerseyRequest request = buildRequest(Object.class);
return request.delete();
Expand Down
1 change: 1 addition & 0 deletions ...m/jaspersoft/jasperserver/jaxrs/client/apiadapters/attributes/SingleAttributeAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.jaspersoft.jasperserver.jaxrs.client.core.ThreadPoolUtil;
import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;

import java.util.ArrayList;

/**
Expand Down
9 changes: 1 addition & 8 deletions ...t/jasperserver/jaxrs/client/apiadapters/authority/organizations/OrganizationsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public OrganizationsService(SessionStorage sessionStorage) {

public SingleOrganizationAdapter organization(ClientTenant organization) {
if (organization != null && ((organization.getAlias() != null && !organization.getAlias().isEmpty())
||(organization.getId() != null && !organization.getId().isEmpty()) )) {
|| (organization.getId() != null && !organization.getId().isEmpty()))) {
return new SingleOrganizationAdapter(sessionStorage, organization);
}
throw new IllegalArgumentException("Organization is not valid.");
Expand All @@ -46,12 +46,5 @@ public BatchOrganizationsAdapter allOrganizations() {
return new BatchOrganizationsAdapter(sessionStorage);
}

/**
* @deprecated Replaced by {@link OrganizationsService#allOrganizations()}.
*/
@Deprecated
public BatchOrganizationsAdapter organizations() {
return new BatchOrganizationsAdapter(sessionStorage);
}

}
Loading

0 comments on commit 64edbe8

Please sign in to comment.