diff options
| -rw-r--r-- | distribution/pom.xml | 467 | ||||
| -rw-r--r-- | pom.xml | 115 | ||||
| -rw-r--r-- | usecaseui-portal/pom.xml | 206 |
3 files changed, 308 insertions, 480 deletions
diff --git a/distribution/pom.xml b/distribution/pom.xml index 2d1f452f..a41f6ca5 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -16,290 +16,217 @@ --> <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"> <modelVersion>4.0.0</modelVersion> - <parent> <groupId>org.onap.usecase-ui</groupId> - <artifactId>usecase-ui</artifactId> - <version>2.0.1</version> + <artifactId>usecase-ui-parent</artifactId> + <version>2.0.1-SNAPSHOT</version> </parent> - <artifactId>distribution</artifactId> + <artifactId>usecase-ui-distribution</artifactId> <packaging>pom</packaging> - <name>usecase-ui/distribution</name> + <name>usecase-ui-distribution</name> + <description>distribution for usecase-ui portal</description> <properties> - <packagename>usecase-ui</packagename> - <version.logback>1.1.2</version.logback> - <version.slf4j>1.7.6</version.slf4j> - <linux64id>linux64</linux64id> - <win64id>win64</win64id> - <linux64outputdir>target/assembly/${linux64id}</linux64outputdir> - <win64outputdir>target/assembly/${win64id}</win64outputdir> - <version.output>target/version</version.output> <usecaseui.version>2.0.1</usecaseui.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> + <linux64outputdir>target/assembly/linux64</linux64outputdir> + <dockeroutput>target/version/${usecaseui.version}</dockeroutput> </properties> <build> - <finalName>usecse-ui</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>unpack-tomcat-to-temporary-dir</id> - <phase>generate-resources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>org.apache.tomcat</groupId> - <artifactId>tomcat</artifactId> - <type>zip</type> - <outputDirectory>target/tomcat</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-resources-portal-linux</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${linux64outputdir}/tomcat/webapps/</outputDirectory> - <resources> - <resource> - <directory>../usecaseui-portal/</directory> - <filtering>false</filtering> - <includes> - <include>usecase-ui.war</include> - </includes> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - <execution> - <id>copy-resources-${linux64id}</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${linux64outputdir}</outputDirectory> - <resources> - <resource> - <directory>src/main/assembly/</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.bat</exclude> - </excludes> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - <execution> - <id>copy-tomcat-resources-${linux64id}</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${linux64outputdir}/tomcat</outputDirectory> - <resources> - <resource> - <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.bat</exclude> - </excludes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-resources-portal-win</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${win64outputdir}/tomcat/webapps/</outputDirectory> - <resources> - <resource> - <directory>../usecaseui-portal/</directory> - <filtering>false</filtering> - <includes> - <include>usecase-ui.war</include> - </includes> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - <execution> - <id>copy-resources-${win64id}</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${win64outputdir}</outputDirectory> - <resources> - <resource> - <directory>src/main/assembly/</directory> - <filtering>false</filtering> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - </excludes> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - <execution> - <id>copy-tomcat-resources-${win64id}</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${win64outputdir}/tomcat</outputDirectory> - <resources> - <resource> - <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - </excludes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-dockerfile</id> - <phase>process-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${version.output}</outputDirectory> - <resources> - <resource> - <directory>src/main/assembly/</directory> - <filtering>false</filtering> - <includes> - <include>Dockerfile</include> - </includes> - </resource> - </resources> - <overwrite>true</overwrite> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>distribution</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target name="distribution"> - <tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip"> - <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755"> - <exclude name="**/*.sh"/> - </tarfileset> - <tarfileset dir="target/assembly/linux64" filemode="0755" dirmode="0755"> - <include name="**/*.sh"/> - </tarfileset> - </tar> - <attachartifact file="${version.output}/${packagename}-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/> - <zip destfile="${version.output}/${packagename}-${project.version}-win64.zip" update="true"> - <zipfileset dir="target/assembly/win64" includes="**"/> - </zip> - <attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> + <finalName>usecse-ui</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>unpack-tomcat-to-temporary-dir</id> + <phase>generate-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.tomcat</groupId> + <artifactId>tomcat</artifactId> + <type>zip</type> + <outputDirectory>target/tomcat</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-resources-portal-linux</id> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${linux64outputdir}/tomcat/webapps/</outputDirectory> + <resources> + <resource> + <directory>../usecaseui-portal/</directory> + <filtering>false</filtering> + <includes> + <include>usecase-ui.war</include> + </includes> + </resource> + </resources> + <overwrite>true</overwrite> + </configuration> + </execution> + <execution> + <id>copy-resources-linux64</id> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${linux64outputdir}</outputDirectory> + <resources> + <resource> + <directory>src/main/assembly/</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/*.bat</exclude> + </excludes> + </resource> + </resources> + <overwrite>true</overwrite> + </configuration> + </execution> + <execution> + <id>copy-tomcat-resources-linux64</id> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${linux64outputdir}/tomcat</outputDirectory> + <resources> + <resource> + <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory> + <includes> + <include>**/*</include> + </includes> + <excludes> + <exclude>**/*.bat</exclude> + </excludes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-dockerfile</id> + <phase>process-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${dockeroutput}</outputDirectory> + <resources> + <resource> + <directory>src/main/assembly/</directory> + <filtering>false</filtering> + <includes> + <include>Dockerfile</include> + </includes> + </resource> + </resources> + <overwrite>true</overwrite> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>distribution</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target name="distribution"> + <tar destfile="${dockeroutput}/usecase-ui-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip"> + <tarfileset dir="${linux64outputdir}" filemode="0644" dirmode="0755"> + <exclude name="**/*.sh"/> + </tarfileset> + <tarfileset dir="${linux64outputdir}" filemode="0755" dirmode="0755"> + <include name="**/*.sh"/> + </tarfileset> + </tar> + <attachartifact file="${dockeroutput}/usecase-ui-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>onap/usecase-ui</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/${version.output}</dockerFileDir> - <dockerFile>${basedir}/target/version/Dockerfile</dockerFile> - <tags> - <tag>${usecaseui.version}-SNAPSHOT-latest</tag> - <tag>${usecaseui.version}-STAGING-latest</tag> - <tag>${usecaseui.version}-STAGING-${maven.build.timestamp}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - <execution> - <id>push-images</id> - <phase>deploy</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> + <profile> + <id>docker</id> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>0.16.5</version> + <inherited>false</inherited> + <configuration> + <images> + <image> + <name>onap/usecase-ui</name> + <build> + <cleanup>try</cleanup> + <dockerFileDir>${basedir}/${dockeroutput}</dockerFileDir> + <dockerFile>${basedir}/${dockeroutput}/Dockerfile</dockerFile> + <tags> + <tag>${usecaseui.version}-SNAPSHOT-latest</tag> + <tag>${usecaseui.version}-STAGING-latest</tag> + <tag>${usecaseui.version}-STAGING-${maven.build.timestamp}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <executions> + <execution> + <id>generate-images</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>push-images</id> + <phase>deploy</phase> + <goals> + <goal>build</goal> + <goal>push</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> - </project> @@ -16,7 +16,6 @@ --> <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.oparent</groupId> <artifactId>oparent</artifactId> @@ -25,23 +24,25 @@ </parent> <groupId>org.onap.usecase-ui</groupId> - <artifactId>usecase-ui</artifactId> - <version>2.0.1</version> + <artifactId>usecase-ui-parent</artifactId> + <version>2.0.1-SNAPSHOT</version> <packaging>pom</packaging> - <name>usecase-ui</name> + <name>usecase-ui-parent</name> + <description>parent project for usecase-ui</description> <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <sonar.projectVersion>${project.version}</sonar.projectVersion> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> <nexusproxy>https://nexus.onap.org</nexusproxy> - <releaseNexusPath>content/repositories/releases/</releaseNexusPath> <snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath> - <publicNexusPath>content/repositories/public/</publicNexusPath> + <releaseNexusPath>content/repositories/releases/</releaseNexusPath> <siteNexusPath>content/sites/site/${project.groupId}/${project.artifactId}/${project.version}/</siteNexusPath> <tomcat.version>9.0.19</tomcat.version> </properties> - <distributionManagement> + <!--distributionManagement> <repository> <id>onap-releases</id> <url>${nexusproxy}/${releaseNexusPath}</url> @@ -54,59 +55,7 @@ <id>onap-site</id> <url>dav:${nexusproxy}${siteNexusPath}</url> </site> - </distributionManagement> - - <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml - files among developers. Use values (not properties) so oparent can be resolved. --> - <repositories> - <repository> - <id>onap-public</id> - <url>${nexusproxy}/${publicNexusPath}</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>onap-releases</id> - <url>${nexusproxy}/${releaseNexusPath}</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - <repository> - <id>onap-snapshots</id> - <url>${nexusproxy}/${snapshotNexusPath}</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> - - <!-- Specify the repositories here to avoid coordination of ~/.m2/settings.xml - files among all developers. --> - <pluginRepositories> - <pluginRepository> - <id>onap-plugin-public</id> - <url>${nexusproxy}/${publicNexusPath}</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>onap-plugin-release</id> - <url>${nexusproxy}/${releaseNexusPath}</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </pluginRepository> - <pluginRepository> - <id>onap-plugin-snapshots</id> - <url>${nexusproxy}/${snapshotNexusPath}</url> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - </pluginRepositories> + </distributionManagement--> <modules> <!-- @@ -128,50 +77,4 @@ </dependency> </dependencies> </dependencyManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.8</version> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${nexusproxy}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <version>2.8</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/usecaseui-portal/pom.xml b/usecaseui-portal/pom.xml index 2841cd49..d8c9b241 100644 --- a/usecaseui-portal/pom.xml +++ b/usecaseui-portal/pom.xml @@ -16,111 +16,109 @@ --> <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.usecase-ui</groupId> + <artifactId>usecase-ui-parent</artifactId> + <version>2.0.1-SNAPSHOT</version> + </parent> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.onap.usecase-ui</groupId> - <artifactId>usecase-ui</artifactId> - <version>2.0.1</version> - </parent> + <artifactId>usecase-ui-portal</artifactId> + <packaging>pom</packaging> + <name>usecase-ui-portal</name> + <description>source code for usecase-ui portal</description> - <artifactId>usecaseui-portal</artifactId> - <packaging>pom</packaging> - <name>usecase-ui</name> + <build> + <plugins> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.1.0</version> + <executions> + <execution> + <id>clean dist folder</id> + <phase>clean</phase> + <goals> + <goal>clean</goal> + </goals> + <configuration> + <filesets> + <fileset> + <directory>${project.basedir}/dist</directory> + </fileset> + </filesets> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.6</version> + <configuration> + <installDirectory>${project.basedir}</installDirectory> + </configuration> + <executions> + <execution> + <id>install node and npm</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <configuration> + <nodeVersion>v8.11.4</nodeVersion> + <npmVersion>5.6.0</npmVersion> + </configuration> + </execution> + <execution> + <id>npm set progress off</id> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>set progress=false</arguments> + </configuration> + </execution> + <execution> + <id>npm install</id> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>install</arguments> + </configuration> + </execution> + <execution> + <id>npm run src build</id> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>run build</arguments> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> - <build> - <plugins> - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>3.1.0</version> - <executions> - <execution> - <id>clean dist folder</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${project.basedir}/dist</directory> - </fileset> - </filesets> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.github.eirslett</groupId> - <artifactId>frontend-maven-plugin</artifactId> - <version>1.6</version> - <configuration> - <installDirectory>${project.basedir}</installDirectory> - </configuration> - <executions> - <execution> - <id>install node and npm</id> - <goals> - <goal>install-node-and-npm</goal> - </goals> - <configuration> - <nodeVersion>v8.11.4</nodeVersion> - <npmVersion>5.6.0</npmVersion> - </configuration> - </execution> - - <execution> - <id>npm set progress off</id> - <goals> - <goal>npm</goal> - </goals> - <configuration> - <arguments>set progress=false</arguments> - </configuration> - </execution> - - <execution> - <id>npm install</id> - <goals> - <goal>npm</goal> - </goals> - <configuration> - <arguments>install</arguments> - </configuration> - </execution> - - <execution> - <id>npm run src build</id> - <goals> - <goal>npm</goal> - </goals> - <configuration> - <arguments>run build</arguments> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>distribution</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <target name="distribution"> - <zip destfile="./usecase-ui.war" update="true"> - <zipfileset dir="./usecase-ui" includes="**"/> - </zip> - <attachartifact file="./usecase-ui.war" classifier="win64" type="zip"/> - </target> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <execution> + <id>distribution</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target name="distribution"> + <zip destfile="./usecase-ui.war" update="true"> + <zipfileset dir="./usecase-ui" includes="**"/> + </zip> + <attachartifact file="./usecase-ui.war" classifier="win64" type="zip"/> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> |