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: I0f854ce79302a9efe52b09f1c65ee0ae35f62383
diff --git a/api/pom.xml b/api/pom.xml
index 836ab0f..f8035f9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.5</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -55,15 +54,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 55422d9..d96f919 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -39,7 +39,6 @@
org.opencord.sadis
</onos.app.requires>
<sadis.api.version>4.0.0-SNAPSHOT</sadis.api.version>
- <karaf.version>4.2.6</karaf.version>
</properties>
<dependencies>
@@ -96,58 +95,14 @@
<dependency>
<groupId>org.apache.karaf.shell</groupId>
<artifactId>org.apache.karaf.shell.core</artifactId>
- <version>${karaf.version}</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.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.core</artifactId>
- <version>5.0.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>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.25</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
@@ -155,23 +110,6 @@
<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>app</id>
- <phase>package</phase>
- <goals>
- <goal>app</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -179,11 +117,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-SymbolicName>
- ${project.groupId}.${project.artifactId}
- </Bundle-SymbolicName>
<Karaf-Commands>org.opencord.aaa.cli</Karaf-Commands>
- <_dsannotations-options>inherit</_dsannotations-options>
</instructions>
</configuration>
</plugin>
diff --git a/pom.xml b/pom.xml
index b266b6a..7ae812d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,59 +19,22 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_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>aaa</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <onos.version>2.2.0</onos.version>
- </properties>
-
<modules>
<module>app</module>
<module>api</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>22.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.7</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <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>
-
<repositories>
<repository>
<id>central</id>
@@ -87,7 +50,6 @@
<checksumPolicy>fail</checksumPolicy>
</releases>
</repository>
-
<repository>
<id>snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>