Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GSON lookup implementation and various improvements in Maven POM. #9

Closed
wants to merge 2 commits into from
Closed

GSON lookup implementation and various improvements in Maven POM. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a08a6
Removed NSQLookupDynMapImpl in favor of GSON-based implementation.
Mar 25, 2014
98c4294
Fixed bug with exception trace not shown in logs.
Mar 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .classpath
View file
Open in desktop

This file was deleted.

19 changes: 11 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
# Generic IDE and binary excludes
*.class

build/classes
build/jar
build/build.num
.idea
*.iml
target

# Package Files #
*.war
*.ear
*/target
*/build
*.pyc
*.*~
.classpath
.project
.settings
.metadata
17 changes: 0 additions & 17 deletions .project
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions build.xml
View file
Open in desktop

This file was deleted.

Binary file removed build/nsq-client.jar
View file
Open in desktop
Binary file not shown.
Binary file removed lib/trendrr-oss.jar
View file
Open in desktop
Binary file not shown.
153 changes: 102 additions & 51 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.dustismo</groupId>
<artifactId>trendrr-nsq-client</artifactId>
<version>1.2-SNAPSHOT</version>

<dependencies>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.0.13</version>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.0.13</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>3.6.1.Final</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.4</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<phase>verify</phase>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.github.dustismo</groupId>
<artifactId>trendrr-nsq-client</artifactId>
<version>1.3-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<!-- Enforce project-wide source encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Maven plugins setup -->
<java.version>1.7</java.version>

<!-- Maven dependencies versions -->
<slf4j.version>1.7.2</slf4j.version>
<logback.version>1.0.13</logback.version>
<netty.version>3.6.1.Final</netty.version>
<gson.version>2.2.2</gson.version>
<junit.version>4.10</junit.version>
</properties>

<dependencies>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>

<!-- GSON parser -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
</dependency>

<!-- Netty -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>

<!-- Test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
98 changes: 0 additions & 98 deletions src/main/java/com/trendrr/nsq/lookup/NSQLookupDynMapImpl.java
View file
Open in desktop

This file was deleted.

Loading