diff options
| author |   Michael Lando <ml636r@att.com> | 2018-08-13 13:27:52 +0300 |
|---|---|---|
| committer |   Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2018-08-15 04:57:48 +0000 |
| commit | dc856bba284798fa8f1484abf8fc8140008ececb (patch) | |
| tree | d2c04a049fe2b5f1420cd02a545bce1109c46134 /catalog-ui | |
| parent | 57f4bfa334d91b445e1999a5504fda4f43d0a1e4 (diff) | |
maven improvements and clean up
update plugging to latest available versions,
remove un needed files from source control
clean up commented sections.
disable verbose for docker plug in.
add logback file for tests to disable out put by default.
update logging calls to new api.
disable logging on debug level.
update docker run to include simulator on demand
Change-Id: Icc0fb7add6dd4fe65f5f3d8dd309fd8dae2681fc
Issue-ID: SDC-1639
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-ui')
| -rw-r--r-- | catalog-ui/npm-debug.log.2241131429 | 0 | ||||
| -rw-r--r-- | catalog-ui/npm-debug.log.3178739070 | 0 | ||||
| -rw-r--r-- | catalog-ui/pom.xml | 183 |
3 files changed, 3 insertions, 180 deletions
diff --git a/catalog-ui/npm-debug.log.2241131429 b/catalog-ui/npm-debug.log.2241131429 deleted file mode 100644 index e69de29bb2..0000000000 --- a/catalog-ui/npm-debug.log.2241131429 +++ /dev/null diff --git a/catalog-ui/npm-debug.log.3178739070 b/catalog-ui/npm-debug.log.3178739070 deleted file mode 100644 index e69de29bb2..0000000000 --- a/catalog-ui/npm-debug.log.3178739070 +++ /dev/null diff --git a/catalog-ui/pom.xml b/catalog-ui/pom.xml index c7add36a13..14b3267209 100644 --- a/catalog-ui/pom.xml +++ b/catalog-ui/pom.xml @@ -17,13 +17,9 @@ <build> <plugins> - - <!-- ============================================= --> - <!-- Clean webapps folder --> - <!-- ============================================= --> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.6.1</version> <executions> <execution> <id>clean.fe.webapp.folder</id> @@ -49,30 +45,13 @@ </filesets> </configuration> </execution> - <!-- <execution> - <id>clean.dist.folder</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - <configuration> - <filesets> - <fileset> - <directory>${basedir}/node_modules</directory> - </fileset> - <fileset> - <directory>${basedir}/dist</directory> - </fileset> - </filesets> - </configuration> - </execution> --> </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> <executions> <execution> <id>copy-resources</id> @@ -95,8 +74,6 @@ <plugin> <groupId>com.github.eirslett</groupId> <artifactId>frontend-maven-plugin</artifactId> - <version>1.4</version> - <configuration> <installDirectory>${project.parent.basedir}</installDirectory> </configuration> @@ -131,7 +108,7 @@ </goals> <!-- Optional configuration which provides for running any npm command --> <configuration> - <arguments>install</arguments> + <arguments>install --registry ${npm.registry}</arguments> </configuration> </execution> @@ -149,159 +126,5 @@ </plugins> </build> - - - - <profiles> - <profile> - <id>CI</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>copy-resources</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - - <configuration> - <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/dist</directory> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - - - - <!-- ============================================= --> - <!-- Build the UI module node code --> - <!-- ============================================= --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.4.0</version> - <executions> - - <!-- Set execution permissions for the build script --> - <execution> - <id>set.script.permissions</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - - <configuration> - <workingDirectory>${project.basedir}</workingDirectory> - <executable>/bin/chmod</executable> - <arguments> - <argument>755</argument> - <argument>./build_catalog_ui.sh</argument> - </arguments> - </configuration> - </execution> - - <!-- Run the build script --> - <execution> - <id>execute grant build</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - - <configuration> - <workingDirectory>${project.basedir}</workingDirectory> - <executable>./build_catalog_ui.sh</executable> - </configuration> - </execution> - - <!-- Undo checkout the build script --> - <execution> - <id>undo.checkout.script</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - - <configuration> - <workingDirectory>${project.basedir}</workingDirectory> - <executable>/usr/bin/git</executable> - <arguments> - <argument>checkout</argument> - <argument>--</argument> - <argument>./build_catalog_ui.sh</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - - <profile> - <id>not-minified</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - - <build> - <plugins> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.7</version> - <executions> - <execution> - <id>copy-resources</id> - <phase>package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${project.parent.basedir}/catalog-fe/src/main/webapp</outputDirectory> - <resources> - <resource> - <directory>${project.basedir}/app</directory> - <includes> - <include>languages/**</include> - <include>scripts/**</include> - <include>styles/**</include> - <include>third-party/**</include> - <include>index.html</include> - <include>robots.txt</include> - <include>favicon.png</include> - </includes> - <filtering>false</filtering> - </resource> - <resource> - <directory>${project.basedir}</directory> - <includes> - <include>bower_components/**</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> |