metron-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o...@apache.org
Subject [34/51] [abbrv] metron git commit: METRON-1812: Fix dependencies_with_url.csv (mmiklavc via mmiklavc) closes apache/metron#1230
Date Wed, 24 Oct 2018 15:04:23 GMT
METRON-1812: Fix dependencies_with_url.csv (mmiklavc via mmiklavc) closes apache/metron#1230


Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/1f1b9cdd
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/1f1b9cdd
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/1f1b9cdd

Branch: refs/heads/feature/METRON-1090-stellar-assignment
Commit: 1f1b9cdd3cef7557ff68b7ab33693161b142ef1d
Parents: 747220f
Author: mmiklavc <michael.miklavcic@gmail.com>
Authored: Tue Oct 9 14:51:57 2018 -0600
Committer: Michael Miklavcic <michael.miklavcic@gmail.com>
Committed: Tue Oct 9 14:51:57 2018 -0600

----------------------------------------------------------------------
 dependencies_with_url.csv | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/metron/blob/1f1b9cdd/dependencies_with_url.csv
----------------------------------------------------------------------
diff --git a/dependencies_with_url.csv b/dependencies_with_url.csv
index 53977f3..fb6c03c 100644
--- a/dependencies_with_url.csv
+++ b/dependencies_with_url.csv
@@ -256,12 +256,8 @@ io.dropwizard.metrics:metrics-json:jar:3.1.5:compile,ASLv2,https://github.com/dr
 io.dropwizard.metrics:metrics-jvm:jar:3.1.5:compile,ASLv2,https://github.com/dropwizard/metrics
 io.netty:netty-all:jar:4.0.23.Final:compile,ASLv2,
 io.netty:netty-all:jar:4.0.23.Final:provided,ASLv2,
-<<<<<<< HEAD
 io.netty:netty-all:jar:4.1.17.Final:compile,ASLv2,
-=======
 io.netty:netty-all:jar:4.1.23.Final:compile,ASLv2,
-io.netty:netty:jar:3.10.5.Final:compile,Apache License, Version 2.0,http://netty.io/
->>>>>>> apache/master
 io.netty:netty:jar:3.6.2.Final:compile,Apache License, Version 2.0,http://netty.io/
 io.netty:netty:jar:3.7.0.Final:compile,Apache License, Version 2.0,http://netty.io/
 io.netty:netty:jar:3.9.9.Final:compile,Apache License, Version 2.0,http://netty.io/
@@ -472,20 +468,20 @@ org.eclipse.persistence:org.eclipse.persistence.jpa:jar:2.6.4:compile,EPL
1.0,ht
 com.github.ben-manes.caffeine:caffeine:jar:2.6.2:compile,ASLv2,https://github.com/ben-manes/caffeine/blob/v2.6.2/LICENSE
 com.google.code.gson:gson:jar:2.2:compile,ASLv2,https://github.com/google/gson
 com.google.code.gson:gson:jar:2.8.2:compile,ASLv2,https://github.com/google/gson
-  org.codehaus.plexus:plexus-classworlds:jar:2.4:compile
-  org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile
-  org.codehaus.plexus:plexus-interpolation:jar:1.14:compile
-  org.codehaus.plexus:plexus-utils:jar:2.0.7:compile
-  org.jsoup:jsoup:jar:1.6.1:compile
-  org.sonatype.aether:aether-api:jar:1.12:compile
-  org.sonatype.aether:aether-connector-file:jar:1.12:compile
-  org.sonatype.aether:aether-connector-wagon:jar:1.12:compile
-  org.sonatype.aether:aether-impl:jar:1.12:compile
-  org.sonatype.aether:aether-spi:jar:1.12:compile
-  org.sonatype.aether:aether-util:jar:1.12:compile
-  org.sonatype.sisu:sisu-guice:jar:no_aop:3.0.2:compile
-  org.sonatype.sisu:sisu-inject-bean:jar:2.2.2:compile
-  org.sonatype.sisu:sisu-inject-plexus:jar:2.2.2:compile
+org.codehaus.plexus:plexus-classworlds:jar:2.4:compile
+org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile
+org.codehaus.plexus:plexus-interpolation:jar:1.14:compile
+org.codehaus.plexus:plexus-utils:jar:2.0.7:compile
+org.jsoup:jsoup:jar:1.6.1:compile
+org.sonatype.aether:aether-api:jar:1.12:compile
+org.sonatype.aether:aether-connector-file:jar:1.12:compile
+org.sonatype.aether:aether-connector-wagon:jar:1.12:compile
+org.sonatype.aether:aether-impl:jar:1.12:compile
+org.sonatype.aether:aether-spi:jar:1.12:compile
+org.sonatype.aether:aether-util:jar:1.12:compile
+org.sonatype.sisu:sisu-guice:jar:no_aop:3.0.2:compile
+org.sonatype.sisu:sisu-inject-bean:jar:2.2.2:compile
+org.sonatype.sisu:sisu-inject-plexus:jar:2.2.2:compile
 com.zaxxer:HikariCP:jar:2.7.8:compile,ASLv2,https://github.com/brettwooldridge/HikariCP
 org.hibernate.validator:hibernate-validator:jar:6.0.9.Final:compile,ASLv2,https://github.com/hibernate/hibernate-validator
 com.github.palindromicity:simple-syslog-5424:jar:0.0.8:compile,ASLv2,https://github.com/palindromicity/simple-syslog-5424


Mime
View raw message