diff options
Diffstat (limited to 'ms/neng')
| -rw-r--r-- | ms/neng/pom.xml | 555 | ||||
| -rw-r--r-- | ms/neng/src/main/compose/docker-compose.yaml | 2 |
2 files changed, 276 insertions, 281 deletions
diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 4a40ad17..9c3ee6f3 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -18,15 +18,27 @@ * limitations under the License. * ============LICENSE_END========================================================= --> - <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.apps</groupId> + <artifactId>ccsdk-apps-ms</artifactId> + <version>1.3.0-SNAPSHOT</version> + </parent> + <groupId>org.onap.ccsdk.apps</groupId> <artifactId>ccsdk-apps-ms-neng</artifactId> <version>1.3.0-SNAPSHOT</version> + <name>Naming Generation</name> + <developers> + <developer> + <id>${userId}</id> + </developer> + </developers> + <properties> <swagger.directory>${basedir}/target/classes/META-INF/resources/swagger</swagger.directory> <icd.file>service.json</icd.file> @@ -56,191 +68,6 @@ <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> - <profiles> - <profile> - <id>all-tests</id> - <properties> - <build.profile.id>all-tests</build.profile.id> - <skip.integration.tests>false</skip.integration.tests> - <skip.unit.tests>false</skip.unit.tests> - </properties> - </profile> - <profile> - <id>dev</id> - </profile> - <profile> - <id>integration-test</id> - <properties> - <build.profile.id>integration-test</build.profile.id> - <skip.integration.tests>false</skip.integration.tests> - <skip.unit.tests>true</skip.unit.tests> - </properties> - </profile> - - <profile> - <id>blackduck</id> - <activation> - <property> - <name>blackduck-scan</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>com.blackducksoftware.integration</groupId> - <artifactId>hub-maven-plugin</artifactId> - <version>1.4.0</version> - <inherited>false</inherited> - <configuration> - <hubProjectName>${project.name}</hubProjectName> - <outputDirectory>${project.basedir}</outputDirectory> - </configuration> - <executions> - <execution> - <id>create-bdio-file</id> - <phase>package</phase> - <goals> - <goal>createHubOutput</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>startService.sh</include> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-app-jar</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>package</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>${basedir}/target/</directory> - <includes> - <include>NetworkElementNameGen.jar</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-config</id> - <goals> - <goal>copy-resources</goal> - </goals> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/etc/config</outputDirectory> - <resources> - <resource> - <directory>${basedir}/opt/etc/config</directory> - <includes> - <include>*</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.28.0</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - </tags> - </build> - </image> - </images> - <verbose>true</verbose> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>${docker.push.phase}</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - - <developers> - <developer> - <id>${userId}</id> - </developer> - </developers> - - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>spring-boot-25-starter-parent</artifactId> - <version>2.3.0</version> - <relativePath/> - </parent> - - - <dependencies> <dependency> <groupId>io.swagger</groupId> @@ -364,100 +191,6 @@ <build> <finalName>NetworkElementNameGen</finalName> - <plugins> - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../../TagVersion.groovy</source> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefireArgLine}</argLine> - <skipTests>${skip.unit.tests}</skipTests> - <excludes> - <exclude>**/IT*.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <executions> - <execution> - <id>integration-tests</id> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - <configuration> - <argLine>${failsafeArgLine}</argLine> - <skipTests>${skip.integration.tests}</skipTests> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - <plugin> - <groupId>com.github.kongchen</groupId> - <artifactId>swagger-maven-plugin</artifactId> - <version>3.1.3</version> - <configuration> - <apiSources> - <apiSource> - <locations>org.onap.ccsdk.apps.ms.neng.service.rs</locations> - <basePath>/web</basePath> - <info> - <title>${project.artifactId} Service</title> - <version>${project.version}</version> - </info> - <swaggerDirectory>${swagger.directory}</swaggerDirectory> - </apiSource> - </apiSources> - </configuration> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>exec-maven-plugin</artifactId> - <groupId>org.codehaus.mojo</groupId> - </plugin> - - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - <resources> <resource> <directory>src/main/resources</directory> @@ -556,5 +289,267 @@ </plugin> </plugins> </pluginManagement> + <plugins> + + <plugin> + <groupId>org.codehaus.groovy.maven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>execute</goal> + </goals> + <configuration> + <source>${basedir}/../../TagVersion.groovy</source> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefireArgLine}</argLine> + <skipTests>${skip.unit.tests}</skipTests> + <excludes> + <exclude>**/IT*.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <executions> + <execution> + <id>integration-tests</id> + <goals> + <goal>integration-test</goal> + <goal>verify</goal> + </goals> + <configuration> + <argLine>${failsafeArgLine}</argLine> + <skipTests>${skip.integration.tests}</skipTests> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + <plugin> + <groupId>com.github.kongchen</groupId> + <artifactId>swagger-maven-plugin</artifactId> + <version>3.1.3</version> + <configuration> + <apiSources> + <apiSource> + <locations>org.onap.ccsdk.apps.ms.neng.service.rs</locations> + <basePath>/web</basePath> + <info> + <title>${project.artifactId} Service</title> + <version>${project.version}</version> + </info> + <swaggerDirectory>${swagger.directory}</swaggerDirectory> + </apiSource> + </apiSources> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + </plugin> + + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>repackage</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </build> + + <profiles> + <profile> + <id>all-tests</id> + <properties> + <build.profile.id>all-tests</build.profile.id> + <skip.integration.tests>false</skip.integration.tests> + <skip.unit.tests>false</skip.unit.tests> + </properties> + </profile> + <profile> + <id>dev</id> + </profile> + <profile> + <id>integration-test</id> + <properties> + <build.profile.id>integration-test</build.profile.id> + <skip.integration.tests>false</skip.integration.tests> + <skip.unit.tests>true</skip.unit.tests> + </properties> + </profile> + + <profile> + <id>blackduck</id> + <activation> + <property> + <name>blackduck-scan</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>com.blackducksoftware.integration</groupId> + <artifactId>hub-maven-plugin</artifactId> + <version>1.4.0</version> + <inherited>false</inherited> + <configuration> + <hubProjectName>${project.name}</hubProjectName> + <outputDirectory>${project.basedir}</outputDirectory> + </configuration> + <executions> + <execution> + <id>create-bdio-file</id> + <phase>package</phase> + <goals> + <goal>createHubOutput</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <executions> + <execution> + <id>copy-dockerfile</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>src/main/docker</directory> + <includes> + <include>startService.sh</include> + <include>Dockerfile</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-app-jar</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>package</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage</outputDirectory> + <resources> + <resource> + <directory>${basedir}/target/</directory> + <includes> + <include>NetworkElementNameGen.jar</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-config</id> + <goals> + <goal>copy-resources</goal> + </goals> + <phase>validate</phase> + <configuration> + <outputDirectory>${basedir}/target/docker-stage/opt/etc/config</outputDirectory> + <resources> + <resource> + <directory>${basedir}/opt/etc/config</directory> + <includes> + <include>*</include> + </includes> + <filtering>true</filtering> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + + + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.28.0</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>${image.name}</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> + <tags> + <tag>${project.docker.latestminortag.version}</tag> + <tag>${project.docker.latestfulltag.version}</tag> + <tag>${project.docker.latesttagtimestamp.version}</tag> + </tags> + </build> + </image> + </images> + <verbose>true</verbose> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>${docker.push.phase}</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> </project> diff --git a/ms/neng/src/main/compose/docker-compose.yaml b/ms/neng/src/main/compose/docker-compose.yaml index 2a9f373c..63c5d230 100644 --- a/ms/neng/src/main/compose/docker-compose.yaml +++ b/ms/neng/src/main/compose/docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.1' services: nengdb: - image: mariadb:10.5 + image: mariadb:latest container_name: nengdb ports: - "${NENG_DB_PORT}:3306" |