Skip to content

Commit d7131f2

Browse files
gkorlandgkorland
authored
Merge branch 'master' into master
2 parents 9e1e8aa + 7bd0dce commit d7131f2

File tree

90 files changed

+2872
-1576
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+2872
-1576
lines changed

‎.circleci.settings.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<settings>
2+
<servers>
3+
<server>
4+
<id>ossrh</id>
5+
<username>${env.OSSRH_USERNMAE}</username>
6+
<password>${env.OSSRH_PASSWORD}</password>
7+
</server>
8+
<server>
9+
<id>gpg.passphrase</id>
10+
<passphrase>${env.GPG_PASSPHRASE}</passphrase>
11+
</server>
12+
</servers>
13+
</settings>

‎.circleci/config.yml‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
version: 2.1
2+
commands:
3+
early_return_for_forked_pull_requests:
4+
description: >-
5+
If this build is from a fork, stop executing the current job and return success.
6+
This is useful to avoid steps that will fail due to missing credentials.
7+
steps:
8+
- run:
9+
name: Early return if this build is from a forked PR
10+
command: |
11+
if [ -n "$CIRCLE_PR_NUMBER" ]; then
12+
echo "Nothing to do for forked PRs, so marking this step successful"
13+
circleci step halt
14+
fi
15+
16+
executors:
17+
linux-8-jdk:
18+
docker:
19+
- image: circleci/openjdk:8-jdk
20+
linux-7-jdk:
21+
docker:
22+
- image: circleci/openjdk:7-jdk
23+
24+
jobs:
25+
build:
26+
parameters:
27+
os:
28+
type: executor
29+
30+
executor: << parameters.os >>
31+
32+
working_directory: ~/repo
33+
34+
environment:
35+
JVM_OPTS: -Xmx3200m
36+
TERM: dumb
37+
38+
steps:
39+
- checkout
40+
41+
# Download and cache dependencies
42+
- restore_cache:
43+
keys:
44+
- jedis-{{ checksum "pom.xml" }}
45+
46+
- run: mvn dependency:go-offline
47+
48+
- save_cache:
49+
paths:
50+
- ~/.m2
51+
key: jedis-{{ checksum "pom.xml" }}
52+
53+
- run: |
54+
sudo apt update
55+
sudo apt install -y stunnel
56+
57+
- run: make circleci-install
58+
59+
- run: TEST="" make test
60+
61+
- early_return_for_forked_pull_requests
62+
63+
- run: bash <(curl -s https://codecov.io/bash) -t ${CODECOV_TOKEN}
64+
65+
- run: mvn -s .circleci.settings.xml -DskipTests deploy
66+
67+
workflows:
68+
all-jdks:
69+
jobs:
70+
- build:
71+
matrix:
72+
parameters:
73+
# os: [linux-8-jdk, linux-7-jdk]
74+
os: [linux-8-jdk]

‎.github/workflows/build-jdk8.yml‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Makefile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ daemonize yes
66
protected-mode no
77
port 6379
88
requirepass foobared
9+
user acljedis on allcommands allkeys >fizzbuzz
910
pidfile /tmp/redis1.pid
1011
logfile /tmp/redis1.log
1112
save ""
@@ -379,6 +380,15 @@ travis-install:
379380
[ ! -e redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch redis-git || true
380381
$(MAKE) -C redis-git clean
381382
$(MAKE) -C redis-git
383+
384+
circleci-install:
385+
sudo apt-get install -y gcc-8 g++-8
386+
cd /usr/bin ;\
387+
sudo ln -sf gcc-8 gcc ;\
388+
sudo ln -sf g++-8 g++
389+
[ ! -e redis-git ] && git clone https://github.com/antirez/redis.git --branch unstable --single-branch redis-git || true
390+
$(MAKE) -C redis-git clean
391+
$(MAKE) -C redis-git
382392

383393
compile-module:
384394
gcc -shared -o /tmp/testmodule.so -fPIC src/test/resources/testmodule.c

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
[![Release](https://img.shields.io/github/release/redis/jedis.svg)](https://github.com/redis/jedis/releases/latest)
2-
[![Build Status](https://travis-ci.org/redis/jedis.png?branch=master)](https://travis-ci.org/redis/jedis)
2+
[![CircleCI](https://circleci.com/gh/redis/jedis/tree/master.svg?style=svg)](https://circleci.com/gh/redis/jedis/tree/master)
33
[![Maven Central](https://img.shields.io/maven-central/v/redis.clients/jedis.svg)](http://mvnrepository.com/artifact/redis.clients/jedis)
44
[![Javadocs](https://www.javadoc.io/badge/redis.clients/jedis.svg)](https://www.javadoc.io/doc/redis.clients/jedis)
55
[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.txt)
66
[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/redis/jedis.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/redis/jedis/context:java)
7+
[![codecov](https://codecov.io/gh/redis/jedis/branch/master/graph/badge.svg?token=pAstxAAjYo)](https://codecov.io/gh/redis/jedis)
78
[![Gitter](https://badges.gitter.im/redis/jedis.svg)](https://gitter.im/redis/jedis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
89

910
# Jedis
@@ -57,7 +58,7 @@ Or use it as a maven dependency:
5758
<dependency>
5859
<groupId>redis.clients</groupId>
5960
<artifactId>jedis</artifactId>
60-
<version>3.3.0</version>
61+
<version>3.4.1</version>
6162
<type>jar</type>
6263
<scope>compile</scope>
6364
</dependency>
@@ -90,7 +91,7 @@ and
9091
<dependency>
9192
<groupId>redis.clients</groupId>
9293
<artifactId>jedis</artifactId>
93-
<version>3.4.0-SNAPSHOT</version>
94+
<version>3.5.0-SNAPSHOT</version>
9495
</dependency>
9596
</dependencies>
9697
```
@@ -144,6 +145,9 @@ Thanks for helping!
144145

145146
## Sponsorship
146147

148+
![RedisLabs Logo](logo-redislabs.png)
149+
150+
147151
YourKit supports open source projects with its full-featured Java Profiler.
148152
YourKit, LLC is the creator of [YourKit Java Profiler](http://www.yourkit.com/java/profiler/index.jsp)
149153
and [YourKit .NET Profiler](http://www.yourkit.com/.net/profiler/index.jsp),

‎logo-redislabs.png‎

18.5 KB
Loading

‎pom.xml‎

Lines changed: 51 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<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/maven-v4_0_0.xsd">
2-
32
<parent>
43
<groupId>org.sonatype.oss</groupId>
54
<artifactId>oss-parent</artifactId>
@@ -9,10 +8,10 @@
98
<packaging>jar</packaging>
109
<groupId>redis.clients</groupId>
1110
<artifactId>jedis</artifactId>
12-
<version>3.4.0-SNAPSHOT</version>
11+
<version>3.5.0-SNAPSHOT</version>
1312
<name>Jedis</name>
1413
<description>Jedis is a blazingly small and sane Redis java client.</description>
15-
<url>https://github.com/xetorthio/jedis</url>
14+
<url>https://github.com/redis/jedis</url>
1615

1716
<mailingLists>
1817
<mailingList>
@@ -27,20 +26,20 @@
2726
<licenses>
2827
<license>
2928
<name>MIT</name>
30-
<url>https://github.com/xetorthio/jedis/raw/master/LICENSE.txt</url>
29+
<url>https://github.com/redis/jedis/raw/master/LICENSE.txt</url>
3130
<distribution>repo</distribution>
3231
</license>
3332
</licenses>
3433

3534
<issueManagement>
3635
<system>github</system>
37-
<url>https://github.com/xetorthio/jedis/issues</url>
36+
<url>https://github.com/redis/jedis/issues</url>
3837
</issueManagement>
3938

4039
<scm>
41-
<connection>scm:git:[email protected]:xetorthio/jedis.git</connection>
42-
<url>scm:git:[email protected]:xetorthio/jedis.git</url>
43-
<developerConnection>scm:git:[email protected]:xetorthio/jedis.git</developerConnection>
40+
<connection>scm:git:[email protected]:redis/jedis.git</connection>
41+
<url>scm:git:[email protected]:redis/jedis.git</url>
42+
<developerConnection>scm:git:[email protected]:redis/jedis.git</developerConnection>
4443
<tag>jedis-2.2.0</tag>
4544
</scm>
4645

@@ -105,10 +104,29 @@
105104

106105
<build>
107106
<plugins>
107+
<plugin>
108+
<groupId>org.jacoco</groupId>
109+
<artifactId>jacoco-maven-plugin</artifactId>
110+
<version>0.8.5</version>
111+
<executions>
112+
<execution>
113+
<goals>
114+
<goal>prepare-agent</goal>
115+
</goals>
116+
</execution>
117+
<execution>
118+
<id>report</id>
119+
<phase>test</phase>
120+
<goals>
121+
<goal>report</goal>
122+
</goals>
123+
</execution>
124+
</executions>
125+
</plugin>
108126
<plugin>
109127
<groupId>org.apache.maven.plugins</groupId>
110128
<artifactId>maven-compiler-plugin</artifactId>
111-
<version>3.1</version>
129+
<version>3.8.1</version>
112130
<configuration>
113131
<source>1.7</source>
114132
<target>1.7</target>
@@ -190,20 +208,6 @@
190208
</archive>
191209
</configuration>
192210
</plugin>
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-gpg-plugin</artifactId>
196-
<version>1.5</version>
197-
<executions>
198-
<execution>
199-
<id>sign-artifacts</id>
200-
<phase>verify</phase>
201-
<goals>
202-
<goal>sign</goal>
203-
</goals>
204-
</execution>
205-
</executions>
206-
</plugin>
207211
<plugin>
208212
<groupId>org.apache.felix</groupId>
209213
<artifactId>maven-bundle-plugin</artifactId>
@@ -220,4 +224,28 @@
220224
</plugin>
221225
</plugins>
222226
</build>
227+
<profiles>
228+
<profile>
229+
<id>release</id>
230+
<build>
231+
<plugins>
232+
<!--Sign the components - this is required by maven central for releases -->
233+
<plugin>
234+
<groupId>org.apache.maven.plugins</groupId>
235+
<artifactId>maven-gpg-plugin</artifactId>
236+
<version>1.5</version>
237+
<executions>
238+
<execution>
239+
<id>sign-artifacts</id>
240+
<phase>verify</phase>
241+
<goals>
242+
<goal>sign</goal>
243+
</goals>
244+
</execution>
245+
</executions>
246+
</plugin>
247+
</plugins>
248+
</build>
249+
</profile>
250+
</profiles>
223251
</project>

0 commit comments

Comments
 (0)