Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@ottenhoff
ottenhoff committed Apr 14, 2017
1 parent 337829a commit 83670ae
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 48 deletions.
63 changes: 20 additions & 43 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<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>
<name>Logentries and Raven for Sakai</name>
<name>Raven for Sakai</name>
<groupId>org.sakaiproject.sentry</groupId>
<artifactId>logentries-sakai</artifactId>
<artifactId>raven-sakai</artifactId>
<packaging>jar</packaging>
<version>1.0.3</version>
<description>This jar packages the Logentries log4j appender and the Raven (Sentry) log4j appender and all dependencies into a shaded JAR for deployment into Sakai.</description>
<url>https://github.com/LongsightGroup/logentries-sakai</url>
<version>1.0.4</version>
<description>This jar packages the Raven (Sentry) log4j appender and all dependencies into a shaded JAR for deployment into Sakai.</description>
<url>https://github.com/LongsightGroup/raven-sakai</url>
<licenses>
<license>
<name>Educational Community License, Version 2.0</name>
Expand All @@ -17,48 +17,49 @@
</license>
</licenses>
<scm>
<connection>scm:git:git@github.com:LongsightGroup/logentries-sakai.git</connection>
<developerConnection>scm:git:git@github.com:LongsightGroup/logentries-sakai.git</developerConnection>
<url>git@github.com:LongsightGroup/logentries-sakai.git</url>
<connection>scm:git:git@github.com:LongsightGroup/raven-sakai.git</connection>
<developerConnection>scm:git:git@github.com:LongsightGroup/raven-sakai.git</developerConnection>
<url>git@github.com:LongsightGroup/raven-sakai.git</url>
</scm>

<properties>
<raven.version>6.0.0</raven.version>
<raven.version>8.0.1</raven.version>
</properties>

<dependencies>
<dependency>
<groupId>net.kencochrane.raven</groupId>
<groupId>com.getsentry.raven</groupId>
<artifactId>raven</artifactId>
<version>${raven.version}</version>
</dependency>
<dependency>
<groupId>net.kencochrane.raven</groupId>
<groupId>com.getsentry.raven</groupId>
<artifactId>raven-log4j</artifactId>
<version>${raven.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
<version>1.7.21</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
<version>1.7.21</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
<version>1.2.17</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.logentries</groupId>
<artifactId>logentries-appender</artifactId>
<version>1.1.30</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.3.5</version>
<scope>provided</scope>
</dependency>
</dependencies>

Expand All @@ -81,34 +82,10 @@
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<artifactSet>
<includes>
<include>net.kencochrane.raven:raven</include>
<include>net.kencochrane.raven:raven-log4j</include>
<include>com.fasterxml.jackson.core:jackson-core</include>
<include>com.google.guava:guava</include>
<include>com.google.thirdparty:guava</include>
<include>com.logentries:logentries-appender</include>
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
<include>com.getsentry.raven:raven</include>
<include>com.getsentry.raven:raven-log4j</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
<shadedPattern>org.sakaiproject.sentry.jackson</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.sakaiproject.sentry.guava</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
<shadedPattern>org.sakaiproject.sentry.google</shadedPattern>
</relocation>
<relocation>
<pattern>org.sfl4j</pattern>
<shadedPattern>org.sakaiproject.sentry.slf4j</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/sakaiproject/sentry/DockerEventBuilderHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.sakaiproject.sentry;

import net.kencochrane.raven.event.EventBuilder;
import net.kencochrane.raven.event.helper.EventBuilderHelper;
import com.getsentry.raven.event.EventBuilder;
import com.getsentry.raven.event.helper.EventBuilderHelper;

/**
* Under docker it might be the case that the hostname isn't the same as the interface IP.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/sakaiproject/sentry/DockerRavenFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.sakaiproject.sentry;

import net.kencochrane.raven.DefaultRavenFactory;
import net.kencochrane.raven.Raven;
import net.kencochrane.raven.dsn.Dsn;
import com.getsentry.raven.DefaultRavenFactory;
import com.getsentry.raven.Raven;
import com.getsentry.raven.dsn.Dsn;

/**
* This uses the DockerEventBuilder to set the hostname from the environment.
Expand Down

0 comments on commit 83670ae

Please sign in to comment.