diff options
Diffstat (limited to 'dblib')
| -rw-r--r-- | dblib/features/ccsdk-dblib/pom.xml | 64 | ||||
| -rw-r--r-- | dblib/features/ccsdk-dblib/src/main/feature/feature.xml | 13 | ||||
| -rw-r--r-- | dblib/features/features-dblib/pom.xml | 29 | ||||
| -rwxr-xr-x | dblib/features/pom.xml | 23 | ||||
| -rwxr-xr-x | dblib/installer/pom.xml | 14 | ||||
| -rwxr-xr-x | dblib/pom.xml | 1 |
6 files changed, 0 insertions, 144 deletions
diff --git a/dblib/features/ccsdk-dblib/pom.xml b/dblib/features/ccsdk-dblib/pom.xml deleted file mode 100644 index 883cd1d86..000000000 --- a/dblib/features/ccsdk-dblib/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>single-feature-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-dblib</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - - - <dependencies> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>dblib-provider</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat-jdbc</artifactId> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>utils-provider</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>karaf-maven-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <excludedArtifactIds> - <excludedArtifactId>slf4j-api</excludedArtifactId> - <excludedArtifactId>tomcat-jdbc</excludedArtifactId> - <excludedArtifactId>tomcat-juli</excludedArtifactId> - </excludedArtifactIds> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml b/dblib/features/ccsdk-dblib/src/main/feature/feature.xml deleted file mode 100644 index 771c37455..000000000 --- a/dblib/features/ccsdk-dblib/src/main/feature/feature.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="ccsdk-dblib"> - - <feature name="ccsdk-dblib" description="ccsdk-sli-core :: dblib :: ccsdk-dblib" version="${project.version}"> - <details>Root POM to be used in place of odlparent for CCSDK based projects</details> - <feature prerequisite="true" dependency="false">wrap</feature> - <bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle> - <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle> - <bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> - <bundle>wrap:mvn:org.apache.tomcat/tomcat-juli/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*,org.apache.derby.*&overwrite=merge</bundle> - <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle> - </feature> -</features> diff --git a/dblib/features/features-dblib/pom.xml b/dblib/features/features-dblib/pom.xml deleted file mode 100644 index 72af77776..000000000 --- a/dblib/features/features-dblib/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>feature-repo-parent</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>features-dblib</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>feature</packaging> - - <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>ccsdk-dblib</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> - - </dependencies> -</project> diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml deleted file mode 100755 index 9addcdb41..000000000 --- a/dblib/features/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?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"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>1.5.1-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>dblib-feature-aggregator</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-sli-core :: dblib :: ${project.artifactId}</name> - - <modules> - <module>features-dblib</module> - <module>ccsdk-dblib</module> - </modules> -</project> diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index bf19ba0eb..caa0c0be8 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -27,20 +27,6 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>${application.name}</artifactId> - <version>${project.version}</version> - <type>xml</type> - <classifier>features</classifier> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>dblib-provider</artifactId> <version>${project.version}</version> </dependency> diff --git a/dblib/pom.xml b/dblib/pom.xml index 23284604a..2fb49cbf2 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -22,7 +22,6 @@ <modules> <module>provider</module> - <module>features</module> <module>installer</module> </modules> </project> |