Skip to content

Commit

Permalink
Simplify pom.xml by inheriting from onos-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@ccascone
ccascone committed May 5, 2020
1 parent 2756ce0 commit 57c9bcb
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 66 deletions.
91 changes: 26 additions & 65 deletions app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.onosproject</groupId>
<artifactId>onos-dependencies</artifactId>
<version>2.2.2</version>
</parent>

<groupId>org.onosproject</groupId>
<artifactId>ngsdn-tutorial</artifactId>
<version>1.0-SNAPSHOT</version>
Expand All @@ -28,15 +34,14 @@
<url>http://www.onosproject.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<onos.version>2.2.2</onos.version>
<onos.app.name>org.onosproject.ngsdn-tutorial</onos.app.name>
<onos.app.title>NG-SDN Tutorial App</onos.app.title>
<onos.app.origin>http://www.onosproject.org</onos.app.origin>
<onos.app.origin>https://www.onosproject.org</onos.app.origin>
<onos.app.category>Traffic Steering</onos.app.category>
<onos.app.url>http://www.onosproject.org</onos.app.url>
<onos.app.url>https://www.onosproject.org</onos.app.url>
<onos.app.readme>
Provides IPv6 routing capabilities to a leaf-spine network of P4 switches
Provides IPv6 routing capabilities to a leaf-spine network of
Stratum switches
</onos.app.readme>
</properties>

Expand All @@ -45,63 +50,72 @@
<groupId>org.onosproject</groupId>
<artifactId>onos-api</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-protocols-p4runtime-model</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-protocols-p4runtime-api</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-protocols-grpc-api</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-misc</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>22.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.3</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>

Expand All @@ -116,28 +130,18 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
<version>1.4.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.console</artifactId>
<version>4.2.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand All @@ -147,60 +151,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>4.1.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Karaf-Commands>org.onosproject.ngsdn.tutorial.cli</Karaf-Commands>
<Karaf-Commands>
org.onosproject.ngsdn.tutorial.cli
</Karaf-Commands>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<release>11</release>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.26.0</version>
<configuration>
<supportedProjectTypes>
<supportedProjectType>bundle</supportedProjectType>
<supportedProjectType>war</supportedProjectType>
</supportedProjectTypes>
</configuration>
</plugin>
<plugin>
<groupId>org.onosproject</groupId>
<artifactId>onos-maven-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<id>cfg</id>
<phase>generate-resources</phase>
<goals>
<goal>cfg</goal>
</goals>
</execution>
<execution>
<id>swagger</id>
<phase>generate-sources</phase>
<goals>
<goal>swagger</goal>
</goals>
</execution>
<execution>
<id>app</id>
<phase>package</phase>
<goals>
<goal>app</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion util/docker/Makefile.vars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ P4RT_SH_SHA := sha256:6ae50afb5bde620acb9473ce6cd7b990ff6cc63fe4113cf5584c8e38fe
P4C_SHA := sha256:8f9d27a6edf446c3801db621359fec5de993ebdebc6844d8b1292e369be5dfea
MN_STRATUM_SHA := sha256:ae7c59885509ece8062e196e6a8fb6aa06386ba25df646ed27c765d92d131692
PTF_SHA := sha256:77ea53bf5d17c0ab984103919da9b7effd322031dadb943fcc108f9dc9607097
MVN_SHA := sha256:be12d38e25c7ecb826040cea09c9c1bbb08cd230306580e53d84a1f88ae7eeb1
MVN_SHA := sha256:415a46bd733b3b0eb66c93beff031f6fecaa6e7a5a5c8e5ed25545ea1de1f476
GNMI_CLI_SHA := sha256:6f1590c35e71c07406539d0e1e288e87e1e520ef58de25293441c3b9c81dffc0
YANG_SHA := sha256:feb2dc322af113fc52f17b5735454abfbe017972c867e522ba53ea44e8386fd2

0 comments on commit 57c9bcb

Please sign in to comment.