diff --git a/lib/pom.xml b/lib/pom.xml index c6ca6a3081..f904eaa566 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -54,6 +54,7 @@ to fix locale errors for non-US developers. However, it breaks SonarQube's test coverage, so moving here for now. --> -Duser.language=en -Duser.region=US + 1.3.0 @@ -675,6 +676,12 @@ com.google.code.findbugs jsr305 + + + io.grpc + grpc-core + ${grpccore.version} + diff --git a/pipelines/basic/pom.xml b/pipelines/basic/pom.xml index 6e8eecae40..ea234f5a67 100644 --- a/pipelines/basic/pom.xml +++ b/pipelines/basic/pom.xml @@ -14,7 +14,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - @@ -26,8 +25,24 @@ 4.0.0 ONOS Basic pipeline - onos-pipelines-basic bundle + + + org.onosproject + onos-incubator-bmv2-model + ${project.version} + + + org.onosproject + onos-protocols-p4runtime-api + ${project.version} + + + org.onosproject + onos-drivers-default + ${project.version} + + diff --git a/pom.xml b/pom.xml index 89cad86f33..72e61e517e 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,10 @@ models - pipelines/basic - tools/package/archetypes tools/package/branding + + pipelines diff --git a/protocols/p4runtime/api/pom.xml b/protocols/p4runtime/api/pom.xml index 0d31cb583e..79e797f469 100644 --- a/protocols/p4runtime/api/pom.xml +++ b/protocols/p4runtime/api/pom.xml @@ -14,7 +14,6 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - @@ -30,4 +29,10 @@ onos-protocols-p4runtime-api bundle + + + org.onosproject + onos-api + + diff --git a/protocols/p4runtime/ctl/pom.xml b/protocols/p4runtime/ctl/pom.xml new file mode 100644 index 0000000000..99ff84437d --- /dev/null +++ b/protocols/p4runtime/ctl/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.onosproject + onos-protocols-p4runtime + 1.12.0-SNAPSHOT + + onos-protocols-p4runtime-ctl + bundle + + ONOS P4Runtime Controller + + + + org.onosproject + onos-protocols-p4runtime-api + ${project.version} + + + org.onosproject + onos-protocols-p4runtime-proto + ${project.version} + + + org.onosproject + onos-grpc-protocol-api + ${project.version} + + + + diff --git a/protocols/p4runtime/pom.xml b/protocols/p4runtime/pom.xml index e1afc1f35c..6dfdde6697 100644 --- a/protocols/p4runtime/pom.xml +++ b/protocols/p4runtime/pom.xml @@ -32,6 +32,8 @@ api + proto + ctl + + 4.0.0 + + org.onosproject + onos-protocols-p4runtime + 1.12.0-SNAPSHOT + + onos-protocols-p4runtime-proto + bundle + + ONOS P4Runtime Proto + + + linux-x86_64 + 3.0.2 + a8814a8ac40838a9df83fe47a17a025b69026fcf + https://github.com/p4lang/PI.git + + + + + org.onosproject + onos-protocols-p4runtime-api + ${project.version} + + + org.onosproject + onos-incubator-grpc + ${project.version} + + + io.grpc + grpc-core + ${grpccore.version} + + + com.google.protobuf + protobuf-java + ${protobuf.version} + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1.1 + + + clone pi + + exec + + initialize + + target + git + + clone + + ${piBaseUrl} + + + + + checkout pi + + exec + + initialize + + target/PI + git + + checkout + + -b + buck-build + ${piCommit} + + + + + submodule pi + + exec + + initialize + + target/PI + git + + submodule + update + + --init + --recursive + + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + 0.5.0 + + com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier} + grpc + io.grpc:protoc-gen-grpc-java:${grpccore.version}:exe:${os.detected.classifier} + + + + + compile + compile-custom + + generate-sources + + ${project.basedir}/target/PI/proto + + p4/**/*.proto + google/rpc/*.proto + + + openconfig/**/*.proto + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/generated-sources/protobuf/grpc-java + + + + + + + + + + + + + + + + + + + + + + + + + + + +