update dependencies version
version bump
This commit is contained in:
21
Makefile
21
Makefile
@@ -112,4 +112,25 @@ test:
|
|||||||
kill `cat /tmp/sentinel2.pid`
|
kill `cat /tmp/sentinel2.pid`
|
||||||
kill `cat /tmp/sentinel3.pid`
|
kill `cat /tmp/sentinel3.pid`
|
||||||
|
|
||||||
|
release:
|
||||||
|
echo "$$REDIS1_CONF" | redis-server -
|
||||||
|
echo "$$REDIS2_CONF" | redis-server -
|
||||||
|
echo "$$REDIS3_CONF" | redis-server -
|
||||||
|
echo "$$REDIS4_CONF" | redis-server -
|
||||||
|
echo "$$REDIS_SENTINEL1" | redis-sentinel -
|
||||||
|
echo "$$REDIS_SENTINEL2" | redis-sentinel -
|
||||||
|
echo "$$REDIS_SENTINEL3" | redis-sentinel -
|
||||||
|
|
||||||
|
mvn clean deploy
|
||||||
|
|
||||||
|
kill `cat /tmp/redis1.pid`
|
||||||
|
kill `cat /tmp/redis2.pid`
|
||||||
|
# this get's segfaulted by the tests
|
||||||
|
kill `cat /tmp/redis3.pid` || true
|
||||||
|
kill `cat /tmp/redis4.pid`
|
||||||
|
kill `cat /tmp/sentinel1.pid`
|
||||||
|
kill `cat /tmp/sentinel2.pid`
|
||||||
|
kill `cat /tmp/sentinel3.pid`
|
||||||
|
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
|||||||
87
pom.xml
87
pom.xml
@@ -1,16 +1,10 @@
|
|||||||
<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">
|
<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">
|
||||||
|
|
||||||
<parent>
|
|
||||||
<groupId>org.sonatype.oss</groupId>
|
|
||||||
<artifactId>oss-parent</artifactId>
|
|
||||||
<version>7</version>
|
|
||||||
</parent>
|
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<groupId>redis.clients</groupId>
|
<groupId>redis.clients</groupId>
|
||||||
<artifactId>jedis</artifactId>
|
<artifactId>jedis</artifactId>
|
||||||
<version>2.2.2-SNAPSHOT</version>
|
<version>2.3.0</version>
|
||||||
<name>Jedis</name>
|
<name>Jedis</name>
|
||||||
<description>Jedis is a blazingly small and sane Redis java client.</description>
|
<description>Jedis is a blazingly small and sane Redis java client.</description>
|
||||||
<url>https://github.com/xetorthio/jedis</url>
|
<url>https://github.com/xetorthio/jedis</url>
|
||||||
@@ -20,8 +14,8 @@
|
|||||||
<name>Jedis Mailing List</name>
|
<name>Jedis Mailing List</name>
|
||||||
<post>jedis_redis@googlegroups.com</post>
|
<post>jedis_redis@googlegroups.com</post>
|
||||||
<archive>
|
<archive>
|
||||||
http://groups.google.com/group/jedis_redis
|
http://groups.google.com/group/jedis_redis
|
||||||
</archive>
|
</archive>
|
||||||
</mailingList>
|
</mailingList>
|
||||||
</mailingLists>
|
</mailingLists>
|
||||||
|
|
||||||
@@ -38,49 +32,58 @@
|
|||||||
<url>http://github.com/xetorthio/jedis/issues</url>
|
<url>http://github.com/xetorthio/jedis/issues</url>
|
||||||
</issueManagement>
|
</issueManagement>
|
||||||
|
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:git@github.com:xetorthio/jedis.git</connection>
|
<connection>scm:git:git@github.com:xetorthio/jedis.git</connection>
|
||||||
<url>scm:git:git@github.com:xetorthio/jedis.git</url>
|
<url>scm:git:git@github.com:xetorthio/jedis.git</url>
|
||||||
<developerConnection>scm:git:git@github.com:xetorthio/jedis.git</developerConnection>
|
<developerConnection>scm:git:git@github.com:xetorthio/jedis.git</developerConnection>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<redis-hosts>localhost:6379,localhost:6380,localhost:6381,localhost:6382</redis-hosts>
|
<redis-hosts>localhost:6379,localhost:6380,localhost:6381,localhost:6382</redis-hosts>
|
||||||
<sentinel-hosts>localhost:26379,localhost:26380</sentinel-hosts>
|
<sentinel-hosts>localhost:26379,localhost:26380</sentinel-hosts>
|
||||||
|
<github.global.server>github</github.global.server>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
<artifactId>junit</artifactId>
|
<artifactId>junit</artifactId>
|
||||||
<version>4.8.1</version>
|
<version>4.11</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-pool</groupId>
|
<groupId>commons-pool</groupId>
|
||||||
<artifactId>commons-pool</artifactId>
|
<artifactId>commons-pool</artifactId>
|
||||||
<version>1.5.5</version>
|
<version>1.6</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
<distributionManagement>
|
||||||
|
<repository>
|
||||||
|
<id>github</id>
|
||||||
|
<name>GitHub ${project.artifactId} Repository</name>
|
||||||
|
<url>https://raw.github.com/xetorthio/${project.artifactId}/mvn-repo</url>
|
||||||
|
</repository>
|
||||||
|
</distributionManagement>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>2.0.2</version>
|
<version>3.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.5</source>
|
<source>1.6</source>
|
||||||
<target>1.5</target>
|
<target>1.6</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>2.6</version>
|
<version>2.16</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<redis-hosts>${redis-hosts}</redis-hosts>
|
<redis-hosts>${redis-hosts}</redis-hosts>
|
||||||
@@ -90,7 +93,7 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
<artifactId>maven-source-plugin</artifactId>
|
||||||
<version>2.1.2</version>
|
<version>2.2.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<attach>true</attach>
|
<attach>true</attach>
|
||||||
</configuration>
|
</configuration>
|
||||||
@@ -98,16 +101,46 @@
|
|||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<version>2.7</version>
|
<version>2.9.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<aggregate>true</aggregate>
|
<aggregate>true</aggregate>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-release-plugin</artifactId>
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
<version>2.0-beta-9</version>
|
<version>2.4.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
|
<version>2.7</version>
|
||||||
|
<configuration>
|
||||||
|
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>com.github.github</groupId>
|
||||||
|
<artifactId>site-maven-plugin</artifactId>
|
||||||
|
<version>0.8</version>
|
||||||
|
<configuration>
|
||||||
|
<message>Maven artifacts for ${project.version}</message> <!-- git commit message -->
|
||||||
|
<noJekyll>true</noJekyll> <!-- disable webpage processing -->
|
||||||
|
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory> <!-- matches distribution management repository url above -->
|
||||||
|
<branch>refs/heads/mvn-repo</branch> <!-- remote branch name -->
|
||||||
|
<includes><include>**/*</include></includes>
|
||||||
|
<repositoryName>jedis</repositoryName> <!-- github repo name -->
|
||||||
|
<repositoryOwner>xetorthio</repositoryOwner> <!-- github username -->
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<!-- run site-maven-plugin's 'site' target as part of the build's normal 'deploy' phase -->
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>site</goal>
|
||||||
|
</goals>
|
||||||
|
<phase>deploy</phase>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
Reference in New Issue
Block a user