From: Ed Warnicke Date: Thu, 18 Sep 2014 11:59:43 +0000 (-0500) Subject: Bug 1948: Separate out restconf features. X-Git-Tag: release/helium~14^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dfa7da2f276adb04e1ab2cecc3b77d0d5a5433ce Bug 1948: Separate out restconf features. In order to avoid a maven project cycle in solving Bug 1948, we need to separate restconf features. Note, this is a first step, suffixing everything with -new. Subsquently, after everywhere using odl-restconf has been fixed to use this new repo, we will deprecate the ones in the mdsal features.xml and rename these to not have the -new. Change-Id: I80451e055c071b30a1d0a83ec5a5c14c41afb586 Signed-off-by: Ed Warnicke --- diff --git a/features/pom.xml b/features/pom.xml index 9f10b5908b..090469f243 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -28,5 +28,6 @@ adsal-compatibility akka netconf-connector + restconf \ No newline at end of file diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml new file mode 100644 index 0000000000..c95e7faa87 --- /dev/null +++ b/features/restconf/pom.xml @@ -0,0 +1,346 @@ + + + 4.0.0 + + org.opendaylight.controller + sal-parent + 1.1-SNAPSHOT + ../../opendaylight/md-sal + + + features-restconf + org.opendaylight.controller + + jar + + features.xml + + + + + + + + + org.opendaylight.yangtools + features-yangtools + ${yangtools.version} + features + xml + + + org.opendaylight.controller + features-mdsal + ${mdsal.version} + features + xml + + + org.opendaylight.aaa + features-aaa + ${aaa.version} + features + xml + + + + org.opendaylight.controller + sal-remote + + + + org.opendaylight.controller + sal-rest-connector + + + + com.google.code.gson + gson + + + + com.sun.jersey + jersey-core + + + com.sun.jersey + jersey-server + + + com.sun.jersey + jersey-servlet + + + io.netty + netty-buffer + + + io.netty + netty-codec + + + io.netty + netty-codec-http + + + io.netty + netty-common + + + io.netty + netty-handler + + + io.netty + netty-transport + + + + org.opendaylight.controller + sal-rest-connector-config + ${mdsal.version} + xml + config + + + + com.fasterxml.jackson.core + jackson-annotations + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.datatype + jackson-datatype-json-org + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + org.json + json + + + + org.opendaylight.yangtools + yang-data-codec-gson + + + + org.opendaylight.controller.samples + clustering-it-model + ${mdsal.version} + + + org.opendaylight.controller.samples + clustering-it-provider + ${mdsal.version} + + + org.opendaylight.controller.samples + clustering-it-config + ${mdsal.version} + xml + config + + + org.opendaylight.controller.samples + clustering-it-config + ${mdsal.version} + xml + testmoduleshardconf + + + org.opendaylight.controller.samples + clustering-it-config + ${mdsal.version} + xml + testmoduleconf + + + org.opendaylight.controller + sal-rest-docgen + + + + + + org.opendaylight.yangtools + features-test + ${yangtools.version} + test + + + + org.opendaylight.controller + opendaylight-karaf-empty + ${commons.opendaylight.version} + zip + + + + + + + + src/main/resources + true + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter + generate-resources + + resources + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/classes/${features.file} + xml + features + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${surefire.version} + + + org.opendaylight.controller + opendaylight-karaf-empty + ${commons.opendaylight.version} + + + org.opendaylight.yangtools:features-test + + + + + + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=summary + + diff --git a/features/restconf/src/main/resources/features.xml b/features/restconf/src/main/resources/features.xml new file mode 100644 index 0000000000..4d17b48cad --- /dev/null +++ b/features/restconf/src/main/resources/features.xml @@ -0,0 +1,148 @@ + + + + + + + mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features + mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features + mvn:org.opendaylight.aaa/features-aaa/${aaa.version}/xml/features + + + odl-restconf-new + odl-mdsal-apidocs-new + odl-clustering-test-app-new + + + + + odl-mdsal-broker + odl-aaa-authn + war + + mvn:org.opendaylight.controller/sal-remote/${project.version} + mvn:org.opendaylight.controller/sal-rest-connector/${project.version} + mvn:com.google.code.gson/gson/${gson.version} + mvn:org.opendaylight.yangtools/yang-data-codec-gson/${yangtools.version} + mvn:com.sun.jersey/jersey-core/${jersey.version} + mvn:com.sun.jersey/jersey-server/${jersey.version} + mvn:com.sun.jersey/jersey-servlet/${jersey.version} + mvn:io.netty/netty-buffer/${netty.version} + mvn:io.netty/netty-codec/${netty.version} + mvn:io.netty/netty-codec-http/${netty.version} + mvn:io.netty/netty-common/${netty.version} + mvn:io.netty/netty-handler/${netty.version} + mvn:io.netty/netty-transport/${netty.version} + mvn:org.opendaylight.controller/sal-rest-connector-config/${mdsal.version}/xml/config + + + odl-restconf-new + mvn:org.opendaylight.controller/sal-rest-docgen/${project.version} + mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version} + mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version} + mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version} + mvn:com.fasterxml.jackson.datatype/jackson-datatype-json-org/${jackson.version} + mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version} + mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version} + mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version} + mvn:com.sun.jersey/jersey-core/${jersey.version} + mvn:com.sun.jersey/jersey-server/${jersey.version} + mvn:com.sun.jersey/jersey-servlet/${jersey.version} + wrap:mvn:org.json/json/${org.json.version} + + + + odl-mdsal-clustering + odl-restconf-new + odl-yangtools-models + mvn:org.opendaylight.controller.samples/clustering-it-model/${project.version} + mvn:org.opendaylight.controller.samples/clustering-it-provider/${project.version} + mvn:org.opendaylight.controller.samples/clustering-it-config/${project.version}/xml/config + mvn:org.opendaylight.controller.samples/clustering-it-config/${project.version}/xml/testmoduleshardconf + mvn:org.opendaylight.controller.samples/clustering-it-config/${project.version}/xml/testmoduleconf + + + + odl-restconf-new + odl-toaster + + + + odl-mdsal-apidocs + odl-mdsal-xsql + odl-toaster-rest + + + +