Update pom.xml to depend on official onos-dependencies parent pom
This patch fixes the issues seen when trying to release the app,
and in general, when trying to execute maven stages other than
build/install.
ONOS stopped publishing onos-dependencies with version 2.2.0, thus
requiring each app to explicitly declare dependencies and plugins. The
following ONOS patch revamps support for building 3rd-party apps with
Maven, including publishing of the onos-dependencies (parent) pom:
https://gerrit.onosproject.org/#/c/22790/
The new onos-dependencies exposes shared Java dependencies as well as
Maven plugins, already configured to support the whole life-cycle of
apps (from build, to reporting and release).
Change-Id: I531eae2f14e47c48b98cc945812f5cdb0a27982b
diff --git a/README-NEW-DESIGN.md b/README-NEW-DESIGN.md
index f043dd6..8dc061c 100644
--- a/README-NEW-DESIGN.md
+++ b/README-NEW-DESIGN.md
@@ -57,9 +57,9 @@
-------
To test the related work:
-- Run ONOS 2.2.0 using "ok clean"
+- Run ONOS 2.2 using "ok clean"
-- Go to 2.2.0/config directory and create cfg.json. If you want to test the remote address, then enter the entry:
+- Go to 2.2/config directory and create cfg.json. If you want to test the remote address, then enter the entry:
```
{
@@ -161,7 +161,7 @@
```
- Add the config that refers to cfg.json.
```
- onos-netcfg localhost /tmp/2.2.0/config/cfg.json
+ onos-netcfg localhost /tmp/2.2/config/cfg.json
```
- Connect to ONOS CLI and run SADIS commands:
diff --git a/api/pom.xml b/api/pom.xml
index 29c784b..8d9754d 100755
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -38,15 +38,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>3.1.0</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
diff --git a/app/pom.xml b/app/pom.xml
index 2a71bfe..779f3cd 100755
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -55,13 +55,6 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.onosproject</groupId>
<artifactId>onos-cli</artifactId>
<version>${onos.version}</version>
@@ -83,87 +76,36 @@
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.4.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</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>${karaf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
- <version>${karaf.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>22.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
-
<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>
-
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -174,19 +116,15 @@
WEB-INF/classes/apidoc/swagger.json=target/swagger.json,
{maven-resources}
</Include-Resource>
- <Bundle-SymbolicName>
- ${project.groupId}.${project.artifactId}
- </Bundle-SymbolicName>
<Import-Package>
*,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
<Karaf-Commands>org.opencord.sadis.cli</Karaf-Commands>
- <_dsannotations-options>inherit</_dsannotations-options>
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
+
</project>
diff --git a/pom.xml b/pom.xml
index a8c930d..ee818f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,14 +19,18 @@
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.1-b2</version>
+ </parent>
+
<groupId>org.opencord</groupId>
<artifactId>sadis</artifactId>
<version>4.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>2.2.0</onos.version>
<onos.app.name>org.opencord.sadis</onos.app.name>
<onos.app.category>Utility</onos.app.category>
<onos.app.title>
@@ -34,7 +38,6 @@
</onos.app.title>
<onos.app.origin>Open Networking Laboratory</onos.app.origin>
<onos.app.url>http://opencord.org</onos.app.url>
- <karaf.version>4.2.6</karaf.version>
</properties>
<modules>
@@ -56,27 +59,6 @@
<version>${onos.version}</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>2.9.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.9.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<repositories>
@@ -106,27 +88,6 @@
</repository>
</repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>4.1.0</version>
- <extensions>true</extensions>
- <inherited>true</inherited>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
- <configuration>
- <release>11</release>
- </configuration>
- <inherited>true</inherited>
- </plugin>
- </plugins>
- </build>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>