Skip to content

Commit

Permalink
Release 1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@dan1
dan1 committed Jan 8, 2019
2 parents 772921d + 187f886 commit f7dcde3
Show file tree
Hide file tree
Showing 17 changed files with 188 additions and 155 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Expand Up @@ -11,3 +11,6 @@ TODOS
.classpath
.project
.settings

docs
docs.zip
2 changes: 1 addition & 1 deletion .travis.yml
View file
Expand Up @@ -28,8 +28,8 @@ before_install:
- sleep 30

env:
- SPLUNK_VERSION=6.6-sdk
- SPLUNK_VERSION=7.0-sdk
- SPLUNK_VERSION=7.2-sdk

language: java

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
@@ -1,5 +1,10 @@
# Splunk Logging for Java Changelog

## Version 1.7.0

* Change HttpEventCollectorLogbackAppender stop method to call this.sender.close() [#93](https://github.com/splunk/splunk-library-javalogging/pull/93).
* Rename 'Http' plugin name for HttpEventCollectorLog4jAppender to 'SplunkHttp' [#92](https://github.com/splunk/splunk-library-javalogging/pull/92).

## Version 1.6.2

* Add support to allow users to define their own event body serializer for HTTP event adapter: Simply create a class implementing `com.splunk.logging.EventBodySerializer`,
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
@@ -1,6 +1,6 @@
# Splunk Logging for Java

#### Version 1.6.2
#### Version 1.7.0

Splunk logging for Java enables you to log events to HTTP Event Collector or to a TCP input on a Splunk Enterprise instance within your Java applications. You can use three major Java logging frameworks: [Logback](http://logback.qos.ch), [Log4j 2](http://logging.apache.org/log4j/2.x/), and [java.util.logging](https://docs.oracle.com/javase/7/docs/api/java/util/logging/package-summary.html). Splunk logging for Java is also enabled for [Simple Logging Facade for Java (SLF4J)](http://www.slf4j.org).

Expand Down
272 changes: 145 additions & 127 deletions pom.xml
View file
@@ -1,18 +1,20 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
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>

<groupId>com.splunk.logging</groupId>
<artifactId>splunk-library-javalogging</artifactId>
<version>1.6.2</version>
<packaging>jar</packaging>
<groupId>com.splunk.logging</groupId>
<artifactId>splunk-library-javalogging</artifactId>
<version>1.7.0</version>
<packaging>jar</packaging>

<name>Splunk Logging for Java</name>
<url>http://dev.splunk.com/goto/sdk-slj</url>
<name>Splunk Logging for Java</name>
<url>http://dev.splunk.com/goto/sdk-slj</url>

<description>Library for structured, semantic logging of Common Information Model compliant events, meant for use with SLF4J.</description>
<description>Library for structured, semantic logging of Common Information Model compliant events, meant for use
with SLF4J.
</description>

<properties>
<maven.resources.overwrite>true</maven.resources.overwrite>
Expand All @@ -34,7 +36,7 @@
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
<version>3.5.0</version>
Expand Down Expand Up @@ -70,6 +72,22 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<configuration>
<additionalparam>-Xdoclint:syntax</additionalparam>
<additionalOptions>-Xdoclint:syntax</additionalOptions>
</configuration>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
Expand Down Expand Up @@ -135,136 +153,136 @@
</profiles>


<repositories>
<repository>
<id>splunk-artifactory</id>
<name>Splunk Releases</name>
<url>http://splunk.artifactoryonline.com/splunk/ext-releases-local</url>
</repository>
</repositories>
<repositories>
<repository>
<id>splunk-artifactory</id>
<name>Splunk Releases</name>
<url>http://splunk.artifactoryonline.com/splunk/ext-releases-local</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>1.1.11</version>
<scope>provided</scope>
</dependency>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.1.11</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-access</artifactId>
<version>1.1.11</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.1.3</version>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.5</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
<version>4.1.3</version>
</dependency>

<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.1</version>
</dependency>

<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.1</version>
</dependency>

<dependency>
<groupId>com.splunk</groupId>
<artifactId>splunk</artifactId>
<version>1.5.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>1.1.1</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>
<dependency>
<groupId>com.splunk</groupId>
<artifactId>splunk</artifactId>
<version>1.5.0.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.0</version>
<scope>test</scope>
</dependency>

</dependencies>
</dependencies>

<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<organization>
<name>Splunk, Inc.</name>
<url>http://dev.splunk.com</url>
</organization>
<organization>
<name>Splunk, Inc.</name>
<url>http://dev.splunk.com</url>
</organization>

<contributors>
<contributor>
<name>Paul van Assen</name>
<email>source@pvanassen.nl</email>
</contributor>
<contributor>
<name>Damien Dallimore</name>
<email>ddallimore@splunk.com</email>
</contributor>
<contributor>
<name>Fred Ross</name>
<email>fross@splunk.com</email>
</contributor>
<contributor>
<name>Shakeel Mohamed</name>
<email>shakeel@splunk.com</email>
</contributor>
</contributors>
<contributors>
<contributor>
<name>Paul van Assen</name>
<email>source@pvanassen.nl</email>
</contributor>
<contributor>
<name>Damien Dallimore</name>
<email>ddallimore@splunk.com</email>
</contributor>
<contributor>
<name>Fred Ross</name>
<email>fross@splunk.com</email>
</contributor>
<contributor>
<name>Shakeel Mohamed</name>
<email>shakeel@splunk.com</email>
</contributor>
</contributors>

<scm>
<connection>scm:git:git@github.com:splunk/splunk-library-javalogging.git</connection>
<developerConnection>scm:git:git@github.com:splunk/splunk-library-javalogging.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/splunk/splunk-library-javalogging</url>
</scm>
<scm>
<connection>scm:git:git@github.com:splunk/splunk-library-javalogging.git</connection>
<developerConnection>scm:git:git@github.com:splunk/splunk-library-javalogging.git</developerConnection>
<tag>HEAD</tag>
<url>https://github.com/splunk/splunk-library-javalogging</url>
</scm>


</project>
6 changes: 6 additions & 0 deletions src/main/java/com/splunk/logging/EventBodySerializer.java
View file
Expand Up @@ -4,6 +4,12 @@
import java.util.Map;
import org.json.simple.JSONObject;

/**
*
* Define the interface to allow users to define their own event body serializer for HTTP event adapter:
* Simply create a class implementing this interface, and add the full class name as a property (`eventBodySerializer`) to the adapter.
*
*/
public interface EventBodySerializer {

String serializeEventBody(
Expand Down

0 comments on commit f7dcde3

Please sign in to comment.