rdev/gossip-revisited
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sreev/incubator-gossip

Browse Source
This commit is contained in:
Edward Capriolo
2016-06-25 07:44:35 -04:00
parent 4f1993a7fc 563365664f
commit d28d9b321c
5 changed files with 146 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
pom.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.
@ -12,27 +12,46 @@
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<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">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>io.teknek</groupId>
<artifactId>gossip</artifactId>
<name>gossip</name>
<version>0.0.4-SNAPSHOT</version>
<description>A peer to peer cluster discovery service</description>
<packaging>jar</packaging>
<properties>
</properties>
<parent> <parent>
<groupId>org.sonatype.oss</groupId> <groupId>org.apache</groupId>
<artifactId>oss-parent</artifactId> <artifactId>apache</artifactId>
<version>7</version> <version>RELEASE</version>
</parent> </parent>
<groupId>org.apache.gossip</groupId>
<artifactId>gossip</artifactId>
<name>gossip</name>
<version>0.1.0-incubating</version>
<packaging>jar</packaging>
<description>A peer to peer cluster discovery service</description>
<url>http://gossip.incubator.apache.org/</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<!-- dependecy versions -->
<jackson-datatype-json-org.version>1.8.0</jackson-datatype-json-org.version>
<junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
<tunit.version>0.0.0</tunit.version>
<!-- plugins versions -->
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<maven-jar-plugin.version>3.0.0</maven-jar-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
</properties>
<licenses> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
@ -42,32 +61,39 @@
</licenses> </licenses>
<scm> <scm>
<url>https://github.com/edwardcapriolo/gossip</url> <connection>scm:git:git@github.com:apache/incubator-gossip.git</connection>
<connection>https://github.com/edwardcapriolo/gossip.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-gossip.git</developerConnection>
<developerConnection>scm:git:git@github.com:edwardcapriolo/gossip.git</developerConnection> <url>scm:git:git@github.com:apache/incubator-gossip.git</url>
<tag>HEAD</tag>
</scm> </scm>
<issueManagement>
<system>JIRA</system>
<url>https://issues.apache.org/jira/browse/GOSSIP</url>
</issueManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.fasterxml.jackson</groupId> <groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-datatype-json-org</artifactId> <artifactId>jackson-datatype-json-org</artifactId>
<version>1.8.0</version> <version>${jackson-datatype-json-org.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>${junit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.teknek</groupId> <groupId>io.teknek</groupId>
<artifactId>tunit</artifactId> <artifactId>tunit</artifactId>
<version>0.0.0</version> <version>${tunit.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.15</version> <version>${log4j.version}</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
@ -85,8 +111,8 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
@ -97,6 +123,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
@ -110,10 +137,9 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.2</version> <version>${maven-jar-plugin.version}</version>
<configuration> <configuration>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -125,12 +151,11 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId> <artifactId>maven-eclipse-plugin</artifactId>
<version>2.5.1</version> <version>${maven-eclipse-plugin.version}</version>
<configuration> <configuration>
<projectNameTemplate>[artifactId]</projectNameTemplate> <projectNameTemplate>[artifactId]</projectNameTemplate>
<wtpmanifest>true</wtpmanifest> <wtpmanifest>true</wtpmanifest>
<wtpapplicationxml>true</wtpapplicationxml> <wtpapplicationxml>true</wtpapplicationxml>
<wtpversion>1.5</wtpversion>
<additionalBuildcommands> <additionalBuildcommands>
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
<buildcommand>org.maven.ide.eclipse.maven2Builder</buildcommand> <buildcommand>org.maven.ide.eclipse.maven2Builder</buildcommand>
@ -142,37 +167,81 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>1.7</source> <source>${java.version}</source>
<target>1.7</target> <target>${java.version}</target>
<showWarnings>true</showWarnings>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId> <artifactId>maven-dependency-plugin</artifactId>
<version>2.4</version> <version>${maven-dependency-plugin.version}</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<repositories> <repositories>
<repository>
<id>central</id>
<name>Maven Repository</name>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories> </repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>https://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
<developers> <developers>
<developer> <developer>
<id>ecapriolo</id> <id>ecapriolo</id>
<name>Edward Capriolo</name> <name>Edward Capriolo</name>
<email>edlinuxguru@gmail.com</email> <email>edlinuxguru@gmail.com</email>
<url /> <url>https://github.com/edwardcapriolo</url>
<organization /> <organization>Apache Software Foundation</organization>
<organizationUrl /> <organizationUrl>http://gossip.incubator.apache.org/</organizationUrl>
<roles> <roles>
<role>developer</role> <role>developer</role>
</roles> </roles>
<timezone>-6</timezone> <timezone>-6</timezone>
</developer> </developer>
</developers> </developers>
<mailingLists>
<mailingList>
<name>Dev Mailing List</name>
<post>dev@gossip.incubator.apache.org</post>
<subscribe>dev-subscribe@gossip.incubator.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@gossip.incubator.apache.org</unsubscribe>
</mailingList>
<mailingList>
<name>Commits Mailing List</name>
<post>commits@gossip.incubator.apache.org</post>
<subscribe>commits-subscribe@gossip.incubator.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@gossip.incubator.apache.org</unsubscribe>
</mailingList>
</mailingLists>
<profiles> <profiles>
<profile> <profile>
<id>release-sign-artifacts</id> <id>release-sign-artifacts</id>
@ -187,7 +256,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId> <artifactId>maven-gpg-plugin</artifactId>
<version>1.1</version> <version>${maven-gpg-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<id>sign-artifacts</id> <id>sign-artifacts</id>
@ -203,4 +272,3 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>

20
src/main/resources/log4j.properties Normal file
View File

@ -0,0 +1,20 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
log4j.rootLogger=INFO,stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
log4j.logger.io.teknek=DEBUG
log4j.logger.com.google.code.gossip=INFO

2
src/test/java/io/teknek/gossip/ShutdownDeadtimeTest.java → src/test/java/org/apache/gossip/ShutdownDeadtimeTest.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.teknek.gossip; package org.apache.gossip;
import io.teknek.tunit.TUnit; import io.teknek.tunit.TUnit;

2
src/test/java/io/teknek/gossip/StartupSettingsTest.java → src/test/java/org/apache/gossip/StartupSettingsTest.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.teknek.gossip; package org.apache.gossip;
import org.apache.gossip.GossipMember; import org.apache.gossip.GossipMember;
import org.apache.gossip.GossipService; import org.apache.gossip.GossipService;

2
src/test/java/io/teknek/gossip/TenNodeThreeSeedTest.java → src/test/java/org/apache/gossip/TenNodeThreeSeedTest.java
View File

@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package io.teknek.gossip; package org.apache.gossip;
import io.teknek.tunit.TUnit; import io.teknek.tunit.TUnit;