Skip to content

Commit

Permalink
Bump version to 0.10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
shzlw committed Aug 15, 2019
1 parent 6b13bfe commit 128b16b
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine

WORKDIR /app

COPY target/poli-0.10.0.jar /app/poli-0.10.0.jar
COPY target/poli-0.10.1.jar /app/poli-0.10.1.jar
COPY db/poli.db /app/db/poli.db
COPY start.sh /app/start.sh
COPY config/poli.docker.properties /app/config/poli.properties
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# **Poli**

[![Version](https://img.shields.io/badge/Version-0.10.0-0065FF.svg)](#)
[![Version](https://img.shields.io/badge/Version-0.10.1-0065FF.svg)](#)
[![license: MIT](https://img.shields.io/badge/license-MIT-FF5630.svg)](https://opensource.org/licenses/MIT)
[![Download](https://img.shields.io/github/downloads/shzlw/poli/total.svg?color=6554C0)](https://github.com/shzlw/poli/releases)
[![Docker Pulls](https://img.shields.io/docker/pulls/zhonglu/poli.svg)](https://cloud.docker.com/u/zhonglu/repository/docker/zhonglu/poli)
Expand Down Expand Up @@ -56,13 +56,13 @@ Auto refresh, drill through, fullscreen, embeds, color themes + more features in
Windows/Linux

```sh
java -jar poli-0.10.0.jar
java -jar poli-0.10.1.jar
```

Docker

```sh
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.10.0
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.10.1
```

Check [installation guide](https://shzlw.github.io/poli/#/installation) for more details.
Expand Down
10 changes: 9 additions & 1 deletion docs/change-logs.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# Change Logs

## v0.10.0
## v0.10.1

### Improvements
- Set default JDBC fetch size to 100.

### Bug Fixes
- Fix multiple issues that affect shared report to work properly.

## v0.10.1

### Breaking Changes & Upgrade Steps
```sh
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
1. Pull and run the Poli image.

```bash
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.10.0
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.10.1
```
2. Add JDBC drivers.

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.shzlw.poli</groupId>
<artifactId>poli</artifactId>
<packaging>jar</packaging>
<version>0.10.0</version>
<version>0.10.1</version>

<properties>
<java.version>1.8</java.version>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/shzlw/poli/filter/AuthFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;

@Component
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/shzlw/poli/rest/SharedReportWs.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
import com.shzlw.poli.dto.SharedReportRow;
import com.shzlw.poli.model.SharedReport;
import com.shzlw.poli.model.User;
import com.shzlw.poli.service.ReportService;
import com.shzlw.poli.service.SharedReportService;
import com.shzlw.poli.service.UserService;
import com.shzlw.poli.util.CommonUtil;
import com.shzlw.poli.util.Constants;
import com.shzlw.poli.util.PasswordUtil;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/shzlw/poli/service/ReportService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.shzlw.poli.dao.ReportDao;
import com.shzlw.poli.dao.UserDao;
import com.shzlw.poli.dto.SharedLinkInfo;
import com.shzlw.poli.model.Report;
import com.shzlw.poli.model.User;
import com.shzlw.poli.util.Constants;
Expand All @@ -15,7 +13,9 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.util.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;

Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/shzlw/poli/service/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.shzlw.poli.dao.UserDao;
import com.shzlw.poli.dto.SharedLinkInfo;
import com.shzlw.poli.model.Report;
import com.shzlw.poli.model.User;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/shzlw/poli/util/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public final class Constants {

private Constants() {}

public static final String CURRENT_VERSION = "0.10.0";
public static final String CURRENT_VERSION = "0.10.1";

public static final String SUCCESS = "success";
public static final String GOOD = "";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/shzlw/poli/filter/AuthFilterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public void testShareKeyAccess() throws IOException, ServletException {
Mockito.when(sharedLinkInfo.getComponentQueryUrls()).thenReturn(componentQueryUrls);

List<AccessRule> accessRules = Arrays.asList(
new AccessRule(Constants.HTTP_METHOD_GET, "/ws/report/sharekey" + shareKey),
new AccessRule(Constants.HTTP_METHOD_GET, "/ws/report/sharekey/" + shareKey),
new AccessRule(Constants.HTTP_METHOD_GET, "/ws/report/" + reportId),
new AccessRule(Constants.HTTP_METHOD_GET, "/ws/component/report/" + reportId),
new AccessRule(Constants.HTTP_METHOD_POST, "/ws/jdbcquery/component/1"),
Expand Down
2 changes: 1 addition & 1 deletion start.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -jar poli-0.10.0.jar --spring.config.name=application,poli
java -jar poli-0.10.1.jar --spring.config.name=application,poli
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
set -e

java -jar poli-0.10.0.jar --spring.config.name=application,poli
java -jar poli-0.10.1.jar --spring.config.name=application,poli
30 changes: 22 additions & 8 deletions web-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "poli-web-app",
"version": "0.10.0",
"version": "0.10.1",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.17",
Expand Down

0 comments on commit 128b16b

Please sign in to comment.