METRON-1545 Upgrade Spring and Spring Boot (merrimanr) closes apache/metron#1008
Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/ac056381 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/ac056381 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/ac056381 Branch: refs/heads/feature/METRON-1090-stellar-assignment Commit: ac05638160288b32535b986adbeb8f14e594e740 Parents: 3bb926d Author: merrimanr <merrim...@gmail.com> Authored: Fri May 4 16:22:17 2018 -0500 Committer: merrimanr <merrim...@apache.org> Committed: Fri May 4 16:22:17 2018 -0500 ---------------------------------------------------------------------- dependencies_with_url.csv | 56 +++++++++++++++++++- metron-interface/metron-rest/README.md | 2 + metron-interface/metron-rest/pom.xml | 17 ++++-- .../metron/rest/MetronRestApplication.java | 7 +++ .../apache/metron/rest/MetronRestConstants.java | 2 + .../metron/rest/config/JpaConfiguration.java | 6 +-- .../metron/rest/config/WebSecurityConfig.java | 19 +++++-- .../src/main/resources/application-test.yml | 2 +- .../metron-rest/src/main/scripts/metron-rest.sh | 2 +- 9 files changed, 97 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/dependencies_with_url.csv ---------------------------------------------------------------------- diff --git a/dependencies_with_url.csv b/dependencies_with_url.csv index 1e73eb1..df3bcd2 100644 --- a/dependencies_with_url.csv +++ b/dependencies_with_url.csv @@ -4,6 +4,7 @@ org.objenesis:objenesis:jar:1.2:compile,Apache v2,http://objenesis.org/ org.objenesis:objenesis:jar:2.1:compile,Apache v2,http://objenesis.org/ org.ow2.asm:asm:jar:4.1:compile,BSD,http://asm.ow2.org/ org.ow2.asm:asm:jar:5.0.3:compile,BSD,http://asm.ow2.org/ +org.ow2.asm:asm:jar:5.0.4:compile,BSD,http://asm.ow2.org/ org.reflections:reflections:jar:0.9.10:compile,BSD,https://github.com/ronmamo/reflections org.javassist:javassist:jar:3.19.0-GA:compile,Apache v2,https://github.com/jboss-javassist/javassist org.javassist:javassist:jar:3.17.1-GA:compile,Apache v2,https://github.com/jboss-javassist/javassist @@ -23,6 +24,7 @@ com.google.protobuf:protobuf-java:jar:2.5.0:compile,New BSD license,http://code. com.google.protobuf:protobuf-java:jar:2.6.1:compile,New BSD license,http://code.google.com/p/protobuf com.jcraft:jsch:jar:0.1.42:compile,BSD,http://www.jcraft.com/jsch/ com.jayway.jsonpath:json-path:jar:2.3.0:compile,Apache v2,https://github.com/json-path/JsonPath +com.jayway.jsonpath:json-path:jar:2.4.0:compile,Apache v2,https://github.com/json-path/JsonPath net.minidev:accessors-smart:jar:1.2:compile,Apache v2,https://github.com/netplex/json-smart-v2 net.minidev:json-smart:jar:2.3:compile,Apache v2,https://github.com/netplex/json-smart-v2 com.maxmind.db:maxmind-db:jar:1.2.1:compile,CC-BY-SA 3.0,https://github.com/maxmind/MaxMind-DB @@ -34,10 +36,12 @@ it.unimi.dsi:fastutil:jar:7.0.6:compile,ASLv2,https://github.com/vigna/fastutil javassist:javassist:jar:3.12.1.GA:compile,Apache v2,http://www.javassist.org/ javax.activation:activation:jar:1.1:compile,Common Development and Distribution License (CDDL) v1.0,http://java.sun.com/products/javabeans/jaf/index.jsp javax.annotation:jsr250-api:jar:1.0:compile,COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0,http://jcp.org/aboutJava/communityprocess/final/jsr250/index.html +javax.annotation:javax.annotation-api:jar:1.3.2:compile,CDDL 1.1,https://github.com/javaee/javax.annotation/ javax.mail:mail:jar:1.4:compile,Common Development and Distribution License (CDDL) v1.0,https://glassfish.dev.java.net/javaee5/mail/ javax.servlet:javax.servlet-api:jar:3.1.0:compile,CDDL,http://servlet-spec.java.net javax.xml.bind:jaxb-api:jar:2.2.11:compile,CDDL,http://jaxb.java.net/ javax.xml.bind:jaxb-api:jar:2.2.2:compile,CDDL,https://jaxb.dev.java.net/ +javax.xml.bind:jaxb-api:jar:2.3.0:compile,CDDL,https://jaxb.dev.java.net/ javax.xml.stream:stax-api:jar:1.0-2:compile,COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0,https://docs.oracle.com/javase/7/docs/api/javax/xml/stream/package-summary.html jline:jline:jar:0.9.94:compile,BSD,http://jline.sourceforge.net junit:junit:jar:4.12:compile,Eclipse Public License 1.0,http://junit.org @@ -87,15 +91,18 @@ org.slf4j:slf4j-api:jar:1.7.5:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-api:jar:1.7.6:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-api:jar:1.7.7:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-api:jar:1.7.21:compile,MIT,http://www.slf4j.org +org.slf4j:slf4j-api:jar:1.7.25:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-log4j12:jar:1.6.1:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-log4j12:jar:1.7.10:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-log4j12:jar:1.7.10:runtime,MIT,http://www.slf4j.org org.slf4j:slf4j-log4j12:jar:1.7.21:compile,MIT,http://www.slf4j.org +org.slf4j:slf4j-log4j12:jar:1.7.25:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-log4j12:jar:1.7.5:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-log4j12:jar:1.7.7:compile,MIT,http://www.slf4j.org org.slf4j:slf4j-simple:jar:1.7.7:compile,MIT,http://www.slf4j.org org.slf4j:jcl-over-slf4j:jar:1.7.21:compile,MIT,http://www.slf4j.org org.slf4j:jul-to-slf4j:jar:1.7.21:compile,MIT,http://www.slf4j.org +org.slf4j:jul-to-slf4j:jar:1.7.25:compile,MIT,http://www.slf4j.org aopalliance:aopalliance:jar:1.0:compile,Public Domain,http://aopalliance.sourceforge.net com.101tec:zkclient:jar:0.8:compile,The Apache Software License, Version 2.0,https://github.com/sgroschupf/zkclient com.github.stephenc.findbugs:findbugs-annotations:jar:1.3.9-1:compile,Apache License, Version 2.0,http://stephenc.github.com/findbugs-annotations @@ -111,14 +118,17 @@ com.esotericsoftware.reflectasm:reflectasm:jar:shaded:1.07:compile,BSD,https://g com.fasterxml.jackson.core:jackson-annotations:jar:2.2.3:compile,ASLv2,http://wiki.fasterxml.com/JacksonHome com.fasterxml.jackson.core:jackson-annotations:jar:2.7.4:compile,ASLv2,http://github.com/FasterXML/jackson com.fasterxml.jackson.core:jackson-annotations:jar:2.8.3:compile,ASLv2,http://github.com/FasterXML/jackson +com.fasterxml.jackson.core:jackson-annotations:jar:2.9.0:compile,ASLv2,http://github.com/FasterXML/jackson com.fasterxml.jackson.core:jackson-core:jar:2.2.3:compile,ASLv2,http://wiki.fasterxml.com/JacksonHome com.fasterxml.jackson.core:jackson-core:jar:2.6.6:compile,ASLv2,https://github.com/FasterXML/jackson-core com.fasterxml.jackson.core:jackson-core:jar:2.7.4:compile,ASLv2,https://github.com/FasterXML/jackson-core com.fasterxml.jackson.core:jackson-core:jar:2.8.3:compile,ASLv2,https://github.com/FasterXML/jackson-core +com.fasterxml.jackson.core:jackson-core:jar:2.9.5:compile,ASLv2,https://github.com/FasterXML/jackson-core com.fasterxml.jackson.core:jackson-databind:jar:2.2.3:compile,ASLv2,http://wiki.fasterxml.com/JacksonHome com.fasterxml.jackson.core:jackson-databind:jar:2.4.3:compile,ASLv2,http://github.com/FasterXML/jackson com.fasterxml.jackson.core:jackson-databind:jar:2.7.4:compile,ASLv2,http://github.com/FasterXML/jackson com.fasterxml.jackson.core:jackson-databind:jar:2.8.3:compile,ASLv2,http://github.com/FasterXML/jackson +com.fasterxml.jackson.core:jackson-databind:jar:2.9.5:compile,ASLv2,http://github.com/FasterXML/jackson com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.6.6:compile,ASLv2,http://wiki.fasterxml.com/JacksonForCbor com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.6.6:compile,ASLv2,http://wiki.fasterxml.com/JacksonForSmile com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.6.6:compile,ASLv2,https://github.com/FasterXML/jackson @@ -126,7 +136,12 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.7.4:compile,ASLv2 com.fasterxml.jackson.dataformat:jackson-dataformat-smile:jar:2.7.4:compile,ASLv2,http://wiki.fasterxml.com/JacksonForSmile com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.7.4:compile,ASLv2,https://github.com/FasterXML/jackson com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.8.1:compile,ASLv2,https://github.com/FasterXML/jackson-datatype-joda +com.fasterxml.jackson.datatype:jackson-datatype-joda:jar:2.9.5:compile,ASLv2,https://github.com/FasterXML/jackson-datatype-joda +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.9.5:compile,ASLv2,https://github.com/FasterXML/jackson-modules-java8 +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.9.5:compile,ASLv2,https://github.com/FasterXML/jackson-modules-java8 +com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.9.5:compile,ASLv2,https://github.com/FasterXML/jackson-modules-java8 com.fasterxml:classmate:jar:1.3.1:compile,ASLv2,http://github.com/cowtowncoder/java-classmate +com.fasterxml:classmate:jar:1.3.4:compile,ASLv2,http://github.com/cowtowncoder/java-classmate com.google.code.gson:gson:jar:2.2.4:compile,The Apache Software License, Version 2.0,http://code.google.com/p/google-gson/ com.google.code.gson:gson:jar:2.7:compile,The Apache Software License, Version 2.0,http://code.google.com/p/google-gson/ com.google.guava:guava:jar:11.0.2:compile,ASLv2, @@ -158,6 +173,7 @@ commons-codec:commons-codec:jar:1.10:compile,ASLv2,http://commons.apache.org/pro commons-codec:commons-codec:jar:1.4:compile,ASLv2,http://commons.apache.org/codec/ commons-codec:commons-codec:jar:1.6:compile,ASLv2,http://commons.apache.org/codec/ commons-codec:commons-codec:jar:1.9:compile,ASLv2,http://commons.apache.org/proper/commons-codec/ +commons-codec:commons-codec:jar:1.11:compile,ASLv2,http://commons.apache.org/proper/commons-codec/ commons-collections:commons-collections:jar:3.2.1:compile,ASLv2,http://commons.apache.org/collections/ commons-collections:commons-collections:jar:3.2.2:compile,ASLv2,http://commons.apache.org/collections/ commons-configuration:commons-configuration:jar:1.10:compile,ASLv2,http://commons.apache.org/configuration/ @@ -197,6 +213,7 @@ io.thekraken:grok:jar:0.1.0:compile,Apache License, Version 2.0,http://maven.apa javax.inject:javax.inject:jar:1:compile,The Apache Software License, Version 2.0,http://code.google.com/p/atinject/ joda-time:joda-time:jar:2.3:compile,Apache 2,http://www.joda.org/joda-time/ joda-time:joda-time:jar:2.8.2:compile,Apache 2,http://www.joda.org/joda-time/ +joda-time:joda-time:jar:2.9.9:compile,Apache 2,http://www.joda.org/joda-time/ log4j:log4j:jar:1.2.15:compile,The Apache Software License, Version 2.0,http://logging.apache.org:80/log4j/1.2/ log4j:log4j:jar:1.2.16:compile,The Apache Software License, Version 2.0,http://logging.apache.org/log4j/1.2/ log4j:log4j:jar:1.2.17:compile,The Apache Software License, Version 2.0,http://logging.apache.org/log4j/1.2/ @@ -234,24 +251,36 @@ org.springframework.integration:spring-integration-http:jar:3.0.0.RELEASE:compil org.springframework.retry:spring-retry:jar:1.0.3.RELEASE:compile,Apache 2.0,http://www.springsource.org org.springframework:spring-aop:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-aop:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-aop:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-aspects:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-aspects:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-beans:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-beans:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-beans:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-context:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-context:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-context:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-core:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-core:jar:4.1.4.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-core:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-core:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-expression:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-expression:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-expression:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-jcl:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-jdbc:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-jdbc:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-orm:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-orm:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-tx:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-tx:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-tx:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-web:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-web:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-web:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.springframework:spring-webmvc:jar:3.2.6.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/SpringSource/spring-framework org.springframework:spring-webmvc:jar:4.3.3.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework +org.springframework:spring-webmvc:jar:5.0.5.RELEASE:compile,The Apache Software License, Version 2.0,https://github.com/spring-projects/spring-framework org.tukaani:xz:jar:1.0:compile,Public Domain,http://tukaani.org/xz/java.html org.xerial.snappy:snappy-java:jar:1.0.4.1:compile,The Apache Software License, Version 2.0,http://code.google.com/p/snappy-java/ org.xerial.snappy:snappy-java:jar:1.1.1.7:compile,The Apache Software License, Version 2.0,https://github.com/xerial/snappy-java @@ -277,30 +306,50 @@ io.swagger:swagger-annotations:jar:1.5.9:compile,ASLv2,https://github.com/swagge io.swagger:swagger-models:jar:1.5.9:compile,ASLv2,https://github.com/swagger-api/swagger-core javax.transaction:javax.transaction-api:jar:1.2:compile,CDDL-1.0,https://java.net/projects/jta-spec/ javax.validation:validation-api:jar:1.1.0.Final:compile,ASLv2,http://beanvalidation.org +javax.validation:validation-api:jar:2.0.1.Final:compile,ASLv2,http://beanvalidation.org joda-time:joda-time:jar:2.9.4:compile,ASLv2,https://github.com/JodaOrg/joda-time org.aspectj:aspectjweaver:jar:1.8.9:compile,EPL 1.0,https://eclipse.org/aspectj +org.aspectj:aspectjweaver:jar:1.8.13:compile,EPL 1.0,https://eclipse.org/aspectj org.jboss.logging:jboss-logging:jar:3.3.0.Final:compile,ASLv2,https://github.com/jboss-logging +org.jboss.logging:jboss-logging:jar:3.3.2.Final:compile,ASLv2,https://github.com/jboss-logging org.jboss:jandex:jar:2.0.0.Final:compile,ASLv2,https://github.com/wildfly/jandex org.mapstruct:mapstruct:jar:1.0.0.Final:compile,ASLv2,https://github.com/mapstruct/mapstruct org.springframework.boot:spring-boot-autoconfigure:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-autoconfigure:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-aop:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-aop:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-data-jpa:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-data-jpa:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-jdbc:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-jdbc:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-json:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-logging:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-logging:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-security:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-security:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-tomcat:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-tomcat:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter-web:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter-web:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot-starter:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot-starter:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.boot:spring-boot:jar:1.4.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot +org.springframework.boot:spring-boot:jar:2.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-boot org.springframework.data:spring-data-commons:jar:1.12.3.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-data-commons +org.springframework.data:spring-data-commons:jar:2.0.6.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-data-commons org.springframework.data:spring-data-jpa:jar:1.10.3.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-data-jpa +org.springframework.data:spring-data-jpa:jar:2.0.6.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-data-jpa org.springframework.plugin:spring-plugin-core:jar:1.2.0.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-plugin org.springframework.plugin:spring-plugin-metadata:jar:1.2.0.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-plugin org.springframework.security:spring-security-config:jar:4.1.3.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security +org.springframework.security:spring-security-config:jar:5.0.4.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security org.springframework.security:spring-security-core:jar:4.1.3.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security +org.springframework.security:spring-security-core:jar:5.0.4.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security org.springframework.security:spring-security-web:jar:4.1.3.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security +org.springframework.security:spring-security-web:jar:5.0.4.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security antlr:antlr:jar:2.7.7:compile,BSD 3-Clause License,http://www.antlr2.org com.h2database:h2:jar:1.4.192:compile,EPL 1.0,http://www.h2database.com/html/license.html +com.h2database:h2:jar:1.4.197:compile,EPL 1.0,http://www.h2database.com/html/license.html de.jollyday:jollyday:jar:0.5.2:compile,ASLv2,http://jollyday.sourceforge.net/license.html org.threeten:threeten-extra:jar:1.0:compile,BSD,http://www.threeten.org/threeten-extra/license.html org.atteo.classindex:classindex:jar:3.3:compile,ASLv2,https://github.com/atteo/classindex @@ -311,6 +360,7 @@ net.byteseek:byteseek:jar:2.0.3:compile,BSD,https://github.com/nishihatapalmer/b org.springframework.security.kerberos:spring-security-kerberos-client:jar:1.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security-kerberos org.springframework.security.kerberos:spring-security-kerberos-core:jar:1.0.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-security-kerberos org.springframework.kafka:spring-kafka:jar:1.1.1.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-kafka +org.springframework.kafka:spring-kafka:jar:2.0.4.RELEASE:compile,ASLv2,https://github.com/spring-projects/spring-kafka ch.hsr:geohash:jar:1.3.0:compile,ASLv2,https://github.com/kungfoo/geohash-java org.locationtech.spatial4j:spatial4j:jar:0.6:compile,ASLv2,https://github.com/locationtech/spatial4j com.github.spullara.mustache.java:compiler:jar:0.9.3:compile,ASLv2,https://github.com/spullara/mustache.java/blob/master/LICENSE @@ -345,7 +395,8 @@ org.eclipse.persistence:org.eclipse.persistence.core:jar:2.6.4:compile,EPL 1.0,h org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:jar:2.6.4:compile,EPL 1.0,http://www.eclipse.org/eclipselink org.eclipse.persistence:org.eclipse.persistence.jpa:jar:2.6.4:compile,EPL 1.0,http://www.eclipse.org/eclipselink 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 +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 @@ -360,3 +411,6 @@ com.google.code.gson:gson:jar:2.2: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 + http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/README.md ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/README.md b/metron-interface/metron-rest/README.md index c928d8f..2a6a0e0 100644 --- a/metron-interface/metron-rest/README.md +++ b/metron-interface/metron-rest/README.md @@ -135,6 +135,8 @@ The following configures the application for MySQL: GRANT ALL PRIVILEGES ON metronrest.* TO 'metron'@'node1'; ``` +1. Create the security tables as described in the [Spring Security Guide](https://docs.spring.io/spring-security/site/docs/5.0.4.RELEASE/reference/htmlsingle/#user-schema). + 1. Install the MySQL JDBC client onto the REST application host and configurate the METRON_JDBC_CLIENT_PATH variable: ``` cd $METRON_HOME/lib http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/pom.xml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/pom.xml b/metron-interface/metron-rest/pom.xml index dcdea2b..13d23fe 100644 --- a/metron-interface/metron-rest/pom.xml +++ b/metron-interface/metron-rest/pom.xml @@ -29,13 +29,15 @@ <antlr.version>4.5</antlr.version> <curator.version>2.7.1</curator.version> <powermock.version>1.6.4</powermock.version> - <spring.boot.version>1.4.1.RELEASE</spring.boot.version> + <spring.boot.version>2.0.1.RELEASE</spring.boot.version> <spring.kerberos.version>1.0.1.RELEASE</spring.kerberos.version> <swagger.version>2.5.0</swagger.version> <mysql.client.version>5.1.40</mysql.client.version> - <spring-kafka.version>1.1.1.RELEASE</spring-kafka.version> - <spring.version>4.2.2.RELEASE</spring.version> + <spring-kafka.version>2.0.4.RELEASE</spring-kafka.version> + <spring.version>5.0.5.RELEASE</spring.version> <eclipse.link.version>2.6.4</eclipse.link.version> + <jackson.version>2.9.5</jackson.version> + <jsonpath.version>2.4.0</jsonpath.version> </properties> <dependencies> <dependency> @@ -129,12 +131,12 @@ <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> - <version>2.8.3</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-joda</artifactId> - <version>2.8.1</version> + <version>${jackson.version}</version> </dependency> <dependency> <groupId>org.apache.metron</groupId> @@ -223,6 +225,11 @@ </exclusions> </dependency> <dependency> + <groupId>com.jayway.jsonpath</groupId> + <artifactId>json-path</artifactId> + <version>${jsonpath.version}</version> + </dependency> + <dependency> <groupId>io.springfox</groupId> <artifactId>springfox-swagger2</artifactId> <version>${swagger.version}</version> http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestApplication.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestApplication.java b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestApplication.java index 5135849..52cdf8f 100644 --- a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestApplication.java +++ b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestApplication.java @@ -19,13 +19,20 @@ package org.apache.metron.rest; import org.apache.metron.rest.util.ParserIndex; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; +import org.springframework.boot.autoconfigure.kafka.KafkaAutoConfiguration; + +import static org.apache.metron.rest.MetronRestConstants.LOGGING_SYSTEM_PROPERTY; @SpringBootApplication +@EnableAutoConfiguration(exclude = { GsonAutoConfiguration.class, KafkaAutoConfiguration.class }) public class MetronRestApplication { public static void main(String[] args) { ParserIndex.reload(); + System.setProperty(LOGGING_SYSTEM_PROPERTY, "none"); SpringApplication.run(MetronRestApplication.class, args); } } http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestConstants.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestConstants.java b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestConstants.java index 4567197..c4873f9 100644 --- a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestConstants.java +++ b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/MetronRestConstants.java @@ -72,4 +72,6 @@ public class MetronRestConstants { public static final String USER_SETTINGS_HBASE_TABLE_SPRING_PROPERTY = "user.settings.table"; public static final String USER_SETTINGS_HBASE_CF_SPRING_PROPERTY = "user.settings.cf"; + + public static final String LOGGING_SYSTEM_PROPERTY = "org.springframework.boot.logging.LoggingSystem"; } http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/JpaConfiguration.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/JpaConfiguration.java b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/JpaConfiguration.java index 80c9d1a..f1d48e1 100644 --- a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/JpaConfiguration.java +++ b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/JpaConfiguration.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; +import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers; import org.springframework.context.annotation.Configuration; import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter; @@ -34,9 +35,8 @@ import org.springframework.transaction.jta.JtaTransactionManager; @EntityScan("org.apache.metron") public class JpaConfiguration extends JpaBaseConfiguration { - protected JpaConfiguration(DataSource dataSource, JpaProperties properties, - ObjectProvider<JtaTransactionManager> jtaTransactionManagerProvider) { - super(dataSource, properties, jtaTransactionManagerProvider); + protected JpaConfiguration(DataSource dataSource, JpaProperties properties, ObjectProvider<JtaTransactionManager> jtaTransactionManager, ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers) { + super(dataSource, properties, jtaTransactionManager, transactionManagerCustomizers); } @Override http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java index 36846de..f84cdfa 100644 --- a/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java +++ b/metron-interface/metron-rest/src/main/java/org/apache/metron/rest/config/WebSecurityConfig.java @@ -22,6 +22,7 @@ import static org.apache.metron.rest.MetronRestConstants.SECURITY_ROLE_USER; import org.apache.metron.rest.MetronRestConstants; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; @@ -29,6 +30,9 @@ import org.springframework.security.config.annotation.method.configuration.Enabl import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler; import org.springframework.security.web.csrf.CookieCsrfTokenRepository; import org.springframework.stereotype.Controller; @@ -87,13 +91,18 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { List<String> activeProfiles = Arrays.asList(environment.getActiveProfiles()); if (activeProfiles.contains(MetronRestConstants.DEV_PROFILE) || activeProfiles.contains(MetronRestConstants.TEST_PROFILE)) { - auth.jdbcAuthentication().dataSource(dataSource) - .withUser("user").password("password").roles(SECURITY_ROLE_USER).and() - .withUser("user1").password("password").roles(SECURITY_ROLE_USER).and() - .withUser("user2").password("password").roles(SECURITY_ROLE_USER).and() - .withUser("admin").password("password").roles(SECURITY_ROLE_USER, SECURITY_ROLE_ADMIN); + auth.jdbcAuthentication().dataSource(dataSource) + .withUser("user").password("password").roles(SECURITY_ROLE_USER).and() + .withUser("user1").password("password").roles(SECURITY_ROLE_USER).and() + .withUser("user2").password("password").roles(SECURITY_ROLE_USER).and() + .withUser("admin").password("password").roles(SECURITY_ROLE_USER, SECURITY_ROLE_ADMIN); } else { auth.jdbcAuthentication().dataSource(dataSource); } } + + @Bean + public PasswordEncoder passwordEncoder() { + return NoOpPasswordEncoder.getInstance(); + } } http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/src/main/resources/application-test.yml ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/resources/application-test.yml b/metron-interface/metron-rest/src/main/resources/application-test.yml index 891f554..0e794cb 100644 --- a/metron-interface/metron-rest/src/main/resources/application-test.yml +++ b/metron-interface/metron-rest/src/main/resources/application-test.yml @@ -24,7 +24,7 @@ spring: hibernate: ddl-auto: create-drop main: - banner-mode: off + banner-mode: 'off' grok: path: http://git-wip-us.apache.org/repos/asf/metron/blob/ac056381/metron-interface/metron-rest/src/main/scripts/metron-rest.sh ---------------------------------------------------------------------- diff --git a/metron-interface/metron-rest/src/main/scripts/metron-rest.sh b/metron-interface/metron-rest/src/main/scripts/metron-rest.sh index c293566..420c539 100644 --- a/metron-interface/metron-rest/src/main/scripts/metron-rest.sh +++ b/metron-interface/metron-rest/src/main/scripts/metron-rest.sh @@ -78,7 +78,7 @@ echo "METRON_SPRING_PROFILES_ACTIVE=${METRON_SPRING_PROFILES_ACTIVE}" # the vagrant Spring profile provides configuration values, otherwise configuration is provided by rest_application.yml if [[ !(${METRON_SPRING_PROFILES_ACTIVE} == *"vagrant"*) ]]; then - METRON_CONFIG_LOCATION=" --spring.config.location=$METRON_HOME/config/rest_application.yml" + METRON_CONFIG_LOCATION=" --spring.config.location=$METRON_HOME/config/rest_application.yml,classpath:/application.yml" echo "METRON_CONFIG_LOCATION=${METRON_CONFIG_LOCATION}" METRON_SPRING_OPTIONS+=${METRON_CONFIG_LOCATION} fi