From 136d18a8a6f9c191befbfa6017d50863d4c6707b Mon Sep 17 00:00:00 2001 From: Kiet Ly Date: Tue, 15 Mar 2016 09:49:06 -0400 Subject: [PATCH] Update apache licenses + add servlet-api dependency --- .../mvm/rya/blueprints/sail/RyaSailEdge.java | 4 +- .../rya/blueprints/sail/RyaSailVertex.java | 21 +- pom.xml | 1395 +++++++++-------- web/web.rya/pom.xml | 247 +-- 4 files changed, 846 insertions(+), 821 deletions(-) diff --git a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java index 22eff06a2..b6f191243 100644 --- a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java +++ b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailEdge.java @@ -1,5 +1,3 @@ -package mvm.rya.blueprints.sail; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,7 +17,7 @@ * under the License. */ - +package mvm.rya.blueprints.sail; import com.tinkerpop.blueprints.impls.sail.SailEdge; import org.openrdf.model.Resource; diff --git a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java index 2bb8f3f9a..25a12618a 100644 --- a/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java +++ b/extras/tinkerpop.rya/src/main/java/mvm/rya/blueprints/sail/RyaSailVertex.java @@ -1,5 +1,3 @@ -package mvm.rya.blueprints.sail; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -19,8 +17,25 @@ * under the License. */ +package mvm.rya.blueprints.sail; - +/* + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import com.tinkerpop.blueprints.Direction; import com.tinkerpop.blueprints.Edge; import com.tinkerpop.blueprints.util.MultiIterable; diff --git a/pom.xml b/pom.xml index dcbba4cee..02bcd5713 100644 --- a/pom.xml +++ b/pom.xml @@ -1,695 +1,704 @@ - - - 4.0.0 - - org.apache - apache - 17 - - - org.apache.rya - rya-project - 3.2.10-SNAPSHOT - - pom - - Apache Rya Project - - 2015 - - The Apache Software Foundation - http://www.apache.org/ - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - - Dev - dev-subscribe@rya.incubator.apache.org - dev-unsubscribe@rya.incubator.apache.org - dev@rya.incubator.apache.org - http://mail-archives.apache.org/mod_mbox/rya-dev - - - - ${maven.min-version} - - - common - dao - extras - osgi - pig - sail - web - - - 2.7.6 - - - 1.6.4 - 2.5.2 - - 0.9.2 - - 1.1.0-rc.6 - 3.6.2 - 2.1 - - 2.13.3 - 1.50.0 - - 2.5.0 - - 2.6 - 1.10 - 1.6 - - 1.3 - 2.3.11 - - 18.0 - - 2.2.11 - 1.2.0 - 3.4 - 1.7.2 - 1.3 - 2.7.5 - - 3.2.15.RELEASE - 1.0.2.RELEASE - 1.1.0.RELEASE - - 4.12 - 1.10.19 - 1.1.0 - 1.6.6 - - UTF-8 - UTF-8 - - - 3.0.4 - - - - - org.apache.rya - rya.api - ${project.version} - - - org.apache.rya - rya.sail - ${project.version} - - - org.apache.rya - accumulo.rya - ${project.version} - - - org.apache.rya - mongodb.rya - ${project.version} - - - org.apache.rya - accumulo.utils - ${project.version} - - - org.apache.rya - rya.prospector - ${project.version} - - - org.apache.rya - rya.provenance - ${project.version} - - - org.apache.rya - rya.indexing - ${project.version} - - - org.apache.rya - rya.indexing - accumulo-server - ${project.version} - - - org.apache.rya - rya.indexing - map-reduce - ${project.version} - - - - org.apache.accumulo - accumulo-core - ${accumulo.version} - - - - org.apache.rya - sesame-runtime-osgi - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-runtime - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-model - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-query - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-queryalgebra-model - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-queryparser-sparql - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-queryresultio-sparqlxml - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-rio-rdfxml - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-runtime-osgi - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-http-client - - - org.openrdf.sesame - sesame-http-server-spring - - - - - org.openrdf.sesame - sesame-rio-ntriples - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-rio-nquads - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-rio-trig - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-queryalgebra-evaluation - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-queryresultio-sparqljson - ${openrdf.sesame.version} - - - org.openrdf.sesame - sesame-repository-api - ${openrdf.sesame.version} - - - - com.google.guava - guava - ${guava.version} - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - - - - org.apache.camel - camel-core - ${camel.version} - - - org.apache.camel - camel-test - ${camel.version} - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - - org.apache.hadoop - hadoop-common - ${hadoop.version} - - - - com.tinkerpop.blueprints - blueprints-core - ${blueprints.version} - - - com.tinkerpop.blueprints - blueprints-sail-graph - ${blueprints.version} - - - com.tinkerpop.gremlin - gremlin-groovy - ${blueprints.version} - - - com.tinkerpop.rexster - rexster-server - ${blueprints.version} - - - - org.mongodb - mongo-java-driver - ${mongodb.version} - - - de.flapdoodle.embed - de.flapdoodle.embed.mongo - ${embed.mongo.version} - - - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - org.codehaus.gmaven.runtime - gmaven-runtime-1.7 - ${gmaven.version} - - - org.codehaus.groovy - groovy-all - - - - - - - org.springframework.shell - spring-shell - ${spring.shell.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - org.springframework.data - spring-data-hadoop - ${spring.hadoop.version} - - - - org.apache.karaf.shell - org.apache.karaf.shell.console - ${karaf.version} - provided - - - - - commons-lang - commons-lang - ${commons.lang.version} - - - commons-codec - commons-codec - ${commons.codec.version} - - - commons-pool - commons-pool - ${commons.pool.version} - - - - - org.apache.lucene - lucene-core - ${lucene.version} - - - org.apache.lucene - lucene-analyzers - ${lucene.version} - - - - - org.locationtech.geomesa - geomesa-accumulo-datastore - ${geomesa.version} - - - org.locationtech.geomesa - geomesa-distributed-runtime - ${geomesa.version} - - - - joda-time - joda-time - ${joda-time.version} - - - - org.apache.pig - pig - ${pig.version} - - - org.antlr - antlr-runtime - ${antlr-runtime.version} - provided - - - - net.sf.ehcache - ehcache-core - ${ehcache.version} - - - - org.calrissian.mango - mango-core - ${mango.version} - - - - org.mockito - mockito-all - ${mockito.version} - test - - - junit - junit - ${junit.version} - test - - - org.apache.mrunit - mrunit - ${mrunit.version} - hadoop2 - test - - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${project.build.sourceEncoding} - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-resources-plugin - - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - - org.apache.maven.plugins - maven-jar-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - - true - - - - org.apache.maven.plugins - maven-dependency-plugin - - - org.apache.maven.plugins - maven-enforcer-plugin - - - - [${maven.min-version},) - - - - - - org.apache.maven.plugins - maven-release-plugin - - true - true - install - - - - org.codehaus.gmaven - gmaven-plugin - ${gmaven.version} - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - org.codehaus.gmaven.runtime - gmaven-runtime-1.7 - ${gmaven.version} - - - org.codehaus.groovy - groovy-all - - - - - - - - 1.7 - - - generateStubs - compile - generateTestStubs - testCompile - - - - - - org.apache.maven.plugins - maven-shade-plugin - - true - - - - package - - shade - - - - - - - - - - - org.apache.rat - apache-rat-plugin - - - check-licenses - - check - - - - - **/*.ntriples - **/*.trig - **/*.ttl - **/*.owl - **/*.nt - - - **/resources/META-INF/services/** - - - - - - - maven-source-plugin - - - attach-sources - package - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-mvn - - enforce - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*IntegrationTest.java - - - - - - - - - - LocationTech - SNAPSHOT - https://repo.locationtech.org/content/repositories/snapshots/ - - - LocationTech - RELEASE - https://repo.locationtech.org/content/repositories/releases/ - - - - - scm:git:git://git.apache.org/incubator-rya.git - scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rya.git - v3.2.10-SNAPSHOT - https://git-wip-us.apache.org/repos/asf?p=incubator-rya.git - + + + 4.0.0 + + org.apache + apache + 17 + + + org.apache.rya + rya-project + 3.2.10-SNAPSHOT + + pom + + Apache Rya Project + + 2015 + + The Apache Software Foundation + http://www.apache.org/ + + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + + + + Dev + dev-subscribe@rya.incubator.apache.org + dev-unsubscribe@rya.incubator.apache.org + dev@rya.incubator.apache.org + http://mail-archives.apache.org/mod_mbox/rya-dev + + + + ${maven.min-version} + + + common + dao + extras + osgi + pig + sail + web + + + 2.7.6 + + + 1.6.5 + 2.7.1 + + 0.9.2 + + 1.1.0-rc.6 + 3.6.2 + 2.1 + + 2.13.3 + 1.50.0 + + 2.5.0 + + 2.6 + 1.10 + 1.6 + + 1.3 + 2.4.5 + + 18.0 + + 2.2.11 + 1.2.0 + 3.4 + 1.7.2 + 1.3 + 2.7.5 + + 4.2.5.RELEASE + 2.3.0.RELEASE + 1.1.0.RELEASE + + 4.12 + 1.10.19 + 1.1.0 + 1.6.6 + 3.1.0 + + UTF-8 + UTF-8 + + + 3.0.4 + + + + + org.apache.rya + rya.api + ${project.version} + + + org.apache.rya + rya.sail + ${project.version} + + + org.apache.rya + accumulo.rya + ${project.version} + + + org.apache.rya + mongodb.rya + ${project.version} + + + org.apache.rya + accumulo.utils + ${project.version} + + + org.apache.rya + rya.prospector + ${project.version} + + + org.apache.rya + rya.provenance + ${project.version} + + + org.apache.rya + rya.indexing + ${project.version} + + + org.apache.rya + rya.indexing + accumulo-server + ${project.version} + + + org.apache.rya + rya.indexing + map-reduce + ${project.version} + + + + org.apache.accumulo + accumulo-core + ${accumulo.version} + + + + org.apache.rya + sesame-runtime-osgi + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-runtime + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-model + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-query + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-queryalgebra-model + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-queryparser-sparql + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-queryresultio-sparqlxml + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-rio-rdfxml + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-runtime-osgi + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-http-client + + + org.openrdf.sesame + sesame-http-server-spring + + + + + org.openrdf.sesame + sesame-rio-ntriples + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-rio-nquads + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-rio-trig + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-queryalgebra-evaluation + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-queryresultio-sparqljson + ${openrdf.sesame.version} + + + org.openrdf.sesame + sesame-repository-api + ${openrdf.sesame.version} + + + + com.google.guava + guava + ${guava.version} + + + org.hamcrest + hamcrest-all + ${hamcrest.version} + + + + org.apache.camel + camel-core + ${camel.version} + + + org.apache.camel + camel-test + ${camel.version} + + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-log4j12 + ${slf4j.version} + + + + org.apache.hadoop + hadoop-common + ${hadoop.version} + + + + com.tinkerpop.blueprints + blueprints-core + ${blueprints.version} + + + com.tinkerpop.blueprints + blueprints-sail-graph + ${blueprints.version} + + + com.tinkerpop.gremlin + gremlin-groovy + ${blueprints.version} + + + com.tinkerpop.rexster + rexster-server + ${blueprints.version} + + + + org.mongodb + mongo-java-driver + ${mongodb.version} + + + de.flapdoodle.embed + de.flapdoodle.embed.mongo + ${embed.mongo.version} + + + + + org.codehaus.groovy + groovy-all + ${groovy.version} + + + org.codehaus.gmaven.runtime + gmaven-runtime-1.7 + ${gmaven.version} + + + org.codehaus.groovy + groovy-all + + + + + + + org.springframework.shell + spring-shell + ${spring.shell.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + org.springframework.data + spring-data-hadoop + ${spring.hadoop.version} + + + + org.apache.karaf.shell + org.apache.karaf.shell.console + ${karaf.version} + provided + + + + + commons-lang + commons-lang + ${commons.lang.version} + + + commons-codec + commons-codec + ${commons.codec.version} + + + commons-pool + commons-pool + ${commons.pool.version} + + + + + org.apache.lucene + lucene-core + ${lucene.version} + + + org.apache.lucene + lucene-analyzers + ${lucene.version} + + + + + org.locationtech.geomesa + geomesa-accumulo-datastore + ${geomesa.version} + + + org.locationtech.geomesa + geomesa-distributed-runtime + ${geomesa.version} + + + + joda-time + joda-time + ${joda-time.version} + + + + org.apache.pig + pig + ${pig.version} + + + org.antlr + antlr-runtime + ${antlr-runtime.version} + provided + + + + net.sf.ehcache + ehcache-core + ${ehcache.version} + + + + org.calrissian.mango + mango-core + ${mango.version} + + + + org.mockito + mockito-all + ${mockito.version} + test + + + + junit + junit + ${junit.version} + test + + + + org.apache.mrunit + mrunit + ${mrunit.version} + hadoop2 + test + + + + javax.servlet + javax.servlet-api + ${servlet.version} + test + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${project.build.sourceEncoding} + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-resources-plugin + + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Dfile.encoding=${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + + + org.apache.maven.plugins + maven-dependency-plugin + + + org.apache.maven.plugins + maven-enforcer-plugin + + + + [${maven.min-version},) + + + + + + org.apache.maven.plugins + maven-release-plugin + + true + true + install + + + + org.codehaus.gmaven + gmaven-plugin + ${gmaven.version} + + + org.codehaus.groovy + groovy-all + ${groovy.version} + + + org.codehaus.gmaven.runtime + gmaven-runtime-1.7 + ${gmaven.version} + + + org.codehaus.groovy + groovy-all + + + + + + + + 1.7 + + + generateStubs + compile + generateTestStubs + testCompile + + + + + + org.apache.maven.plugins + maven-shade-plugin + + true + + + + package + + shade + + + + + + + + + + + org.apache.rat + apache-rat-plugin + + + check-licenses + + check + + + + + **/*.ntriples + **/*.trig + **/*.ttl + **/*.owl + **/*.nt + + + **/resources/META-INF/services/** + + + **/*.log + + + + + + + + maven-source-plugin + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-mvn + + enforce + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*IntegrationTest.java + + + + + + + + + + LocationTech - SNAPSHOT + https://repo.locationtech.org/content/repositories/snapshots/ + + + LocationTech - RELEASE + https://repo.locationtech.org/content/repositories/releases/ + + + + + scm:git:git://git.apache.org/incubator-rya.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-rya.git + v3.2.10-SNAPSHOT + https://git-wip-us.apache.org/repos/asf?p=incubator-rya.git + diff --git a/web/web.rya/pom.xml b/web/web.rya/pom.xml index 204bbefb3..09c72bb74 100644 --- a/web/web.rya/pom.xml +++ b/web/web.rya/pom.xml @@ -1,136 +1,139 @@ - - http://www.apache.org/licenses/LICENSE-2.0 + + 4.0.0 + + org.apache.rya + rya.web + 3.2.10-SNAPSHOT + -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> + web.rya + Apache Rya Web Implementation - - 4.0.0 - - org.apache.rya - rya.web - 3.2.10-SNAPSHOT - + war - web.rya - Apache Rya Web Implementation + + + org.apache.rya + rya.api + + + org.apache.rya + rya.sail + + + org.apache.rya + accumulo.rya + + + org.apache.rya + rya.prospector + + + org.apache.rya + rya.indexing + - war + + org.openrdf.sesame + sesame-rio-rdfxml + + + org.openrdf.sesame + sesame-queryresultio-sparqljson + - - - org.apache.rya - rya.api - - - org.apache.rya - rya.sail - - - org.apache.rya - accumulo.rya - - - org.apache.rya - rya.prospector - - - org.apache.rya - rya.indexing - + + org.springframework.data + spring-data-hadoop + - - org.openrdf.sesame - sesame-rio-rdfxml - - - org.openrdf.sesame - sesame-queryresultio-sparqljson - + + org.springframework + spring-context + + + org.springframework + spring-core + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.springframework + spring-beans + + + + org.springframework + spring-test + - - org.springframework.data - spring-data-hadoop - + + org.hamcrest + hamcrest-all + - - org.springframework - spring-context - - - org.springframework - spring-core - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - org.springframework - spring-beans - - - org.springframework - spring-test - + + org.slf4j + slf4j-log4j12 + + + + commons-pool + commons-pool + - - org.hamcrest - hamcrest-all - + + junit + junit + test + + + + org.mockito + mockito-all + test + - - org.slf4j - slf4j-log4j12 - - - commons-pool - commons-pool - + + javax.servlet + javax.servlet-api + test + - - junit - junit - test - - - org.mockito - mockito-all - test - - - - web.rya - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 - - - /web.rya - resources - - - - - + + + web.rya + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.26 + + + /web.rya + resources + + + + +