diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-09-21 16:07:02 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-09-21 16:23:44 -0400 |
| commit | 37d6468cc670045ab4ff1ee23315739a429aa5e3 (patch) | |
| tree | 5bfc27601f810a69d2c9442c02b2e6c5f7b392a0 /utils/pom.xml | |
| parent | b98b8dd82639f1a9c0494896f8fc689a5196c523 (diff) | |
Install sdnc-core utils as karaf package
New utils jar was added in another change, but wasn't bundled as a karaf
feature and was not being installed in container. This broke odlsli
docker container. This change wraps that util package as a new
feature (sdnc-core-utils).
Change-Id: Ie8c1d608e2c67aa1635837bc400cec942761c81c
Issue-ID: CCSDK-54
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'utils/pom.xml')
| -rwxr-xr-x[-rw-r--r--] | utils/pom.xml | 105 |
1 files changed, 64 insertions, 41 deletions
diff --git a/utils/pom.xml b/utils/pom.xml index 93326a9dc..cf7dbc50f 100644..100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -1,56 +1,79 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-sli-core</artifactId> <version>0.1.2-SNAPSHOT</version> </parent> + <modelVersion>4.0.0</modelVersion> - <packaging>bundle</packaging> + <packaging>pom</packaging> + <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils</artifactId> - <name>SLI Core Utilities Package</name> - - <description> - The SLI Core Utilities Package provides common functionality for setting up SLI connectivity. - </description> - - <dependencies> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - <dependency> - <groupId>equinoxSDK381</groupId> - <artifactId>org.eclipse.osgi</artifactId> - <version>${equinox.osgi.version}</version> - </dependency> - - <!-- Testing Dependencies --> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> + + + <name>SLI Utils</name> + <description>Utilities used across sli-core</description> + + <version>0.1.2-SNAPSHOT</version> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${bundle.plugin.version}</version> - </plugin> - </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven.compile.plugin.version}</version> + <configuration> + <source>${java.version.source}</source> + <target>${java.version.target}</target> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.10</version> + + <executions> + <execution> + <id>aggregate</id> + <goals> + <goal>aggregate</goal> + </goals> + <phase>site</phase> + + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <version>2.1.1</version> + <executions> + <execution> + <id>bundle-sources</id> + <phase>package</phase> + <goals> + <!-- produce source artifact for main project sources --> + <goal>jar-no-fork</goal> + + <!-- produce source artifact for project test sources --> + <goal>test-jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </pluginManagement> </build> <organization> - <name>Inocybe Technologies and Others</name> + <name>AT&T</name> </organization> + <modules> + <module>provider</module> + <module>features</module> + <module>installer</module> + </modules> </project> |