Skip to content

Commit

Permalink
Merge pull request #34 from clearswift/feature/INNO-147
Browse files Browse the repository at this point in the history 
Fixed issues mentioned in #33
  • Loading branch information
@hypfvieh
hypfvieh authored Dec 18, 2018
2 parents 8876514 + b0bad1b commit 0d0c937
Show file tree
Hide file tree
Showing 4 changed files with 174 additions and 95 deletions.
192 changes: 102 additions & 90 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,51 +1,56 @@
<?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>
<packaging>jar</packaging>

<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java</artifactId>
<version>3.0.1-SNAPSHOT</version>

<name>${project.artifactId}</name>

<description>
Improved version of the DBus-Java library provided by freedesktop.org (https://dbus.freedesktop.org/doc/dbus-java/).
</description>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>

<groupId>com.github.hypfvieh</groupId>
<artifactId>dbus-java</artifactId>
<version>3.0.1-SNAPSHOT</version>

<name>${project.artifactId}</name>

<description>
Improved version of the DBus-Java library provided by freedesktop.org (https://dbus.freedesktop.org/doc/dbus-java/).
</description>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<configuration>
<systemPropertyVariables>
<logback.configurationFile>${basedir}/src/test/resources/logback.xml</logback.configurationFile>
</systemPropertyVariables>
</configuration>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
Expand All @@ -65,24 +70,24 @@
</dependencies>
</plugin>

</plugins>
</build>
</plugins>
</build>

<dependencies>
<dependencies>

<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>java-utils</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>com.github.hypfvieh</groupId>
<artifactId>java-utils</artifactId>
<version>1.0.4</version>
</dependency>

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

<!-- JUnit testing framework. -->
<!-- JUnit testing framework. -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down Expand Up @@ -112,12 +117,19 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.25</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<scope>test</scope>
</dependency>

<!-- Mockito mocking framework. -->
<dependency>
Expand All @@ -126,31 +138,31 @@
<version>2.13.0</version>
</dependency>

</dependencies>

<scm>
<connection>scm:git:https://github.com/hypfvieh/dbus-java.git</connection>
<developerConnection>scm:git:https://github.com/hypfvieh/dbus-java.git</developerConnection>
<url>https://github.com/hypfvieh/dbus-java.git</url>
</scm>

<licenses>
<license>
<name>GNU Lesser/Library General Public License version 2</name>
<url>https://www.gnu.org/licenses/lgpl.html</url>
</license>
</licenses>

<developers>
<developer>
<id>matthew</id>
<name>Matthew Johnson</name>
<email>src@matthew.ath.cx</email>
</developer>
<developer>
<id>hypfvieh</id>
<name>David M.</name>
<email>hypfvieh@googlemail.com</email>
</developer>
</developers>
</dependencies>

<scm>
<connection>scm:git:https://github.com/hypfvieh/dbus-java.git</connection>
<developerConnection>scm:git:https://github.com/hypfvieh/dbus-java.git</developerConnection>
<url>https://github.com/hypfvieh/dbus-java.git</url>
</scm>

<licenses>
<license>
<name>GNU Lesser/Library General Public License version 2</name>
<url>https://www.gnu.org/licenses/lgpl.html</url>
</license>
</licenses>

<developers>
<developer>
<id>matthew</id>
<name>Matthew Johnson</name>
<email>src@matthew.ath.cx</email>
</developer>
<developer>
<id>hypfvieh</id>
<name>David M.</name>
<email>hypfvieh@googlemail.com</email>
</developer>
</developers>
</project>
2 changes: 1 addition & 1 deletion src/main/java/org/freedesktop/dbus/MessageWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void writeMessage(Message m) throws IOException {

@Override
public void close() throws IOException {
logger.info("Closing Message Writer");
logger.debug("Closing Message Writer");
if (outputStream != null) {
outputStream.close();
}
Expand Down
Loading

0 comments on commit 0d0c937

Please sign in to comment.