diff options
author | Lusheng Ji <lji@research.att.com> | 2018-03-21 16:42:36 -0400 |
---|---|---|
committer | Lusheng Ji <lji@research.att.com> | 2018-03-22 15:55:57 +0000 |
commit | 44fb17137fe5c0c2f080c560b4c89c002f4a355d (patch) | |
tree | 68d7ab2483b846cb20da820ffad0db2348e38f65 /pom.xml | |
parent | ec0cf09f662c44f2ac115166ce61020202ac3d26 (diff) |
Fix pom and remove build scripts
Making the following changes for the CICD integartion.
1. Remove the mvn-phase* scripts. These scripts are hooks for
building non-Java project. This appeasr to be a Java project.
Native mvn methods should be enough.
2. Changed artifact ID in pom. LF CICD syste requires group ID
and artifact ID matches with the repo path. Otherwise deploying
to Nexus will be blocked.
3. Removed duplicated (older version) Jetty servelet dependency
calling in pom.
Issue-ID: DCAEGEN2-206
Change-Id: I614b9b11419ae091a452ef23fda6a318347ae8e9
Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 66 |
1 files changed, 2 insertions, 64 deletions
@@ -9,7 +9,7 @@ <relativePath/> </parent> <groupId>org.onap.dcaegen2.services</groupId> - <artifactId>pnf-registration-handler</artifactId> + <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> <name>pnf-registration-handler</name> <description>pnf-registration-handler</description> @@ -62,11 +62,6 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> - <version>8.1.15.v20140411</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> <version>9.4.8.v20171121</version> </dependency> <dependency> @@ -184,30 +179,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> - <configuration> - <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable> - <environmentVariables> - <!-- make mvn properties as env for our script --> - <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID> - <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID> - <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION> - <MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY> - <MVN_RAWREPO_BASEURL_UPLOAD>${onap.nexus.rawrepo.baseurl.upload} - </MVN_RAWREPO_BASEURL_UPLOAD> - <MVN_RAWREPO_BASEURL_DOWNLOAD>${onap.nexus.rawrepo.baseurl.download} - </MVN_RAWREPO_BASEURL_DOWNLOAD> - <MVN_RAWREPO_SERVERID>${onap.nexus.rawrepo.serverid}</MVN_RAWREPO_SERVERID> - <MVN_DOCKERREGISTRY_DAILY>${onap.nexus.dockerregistry.daily} - </MVN_DOCKERREGISTRY_DAILY> - <MVN_DOCKERREGISTRY_RELEASE>${onap.nexus.dockerregistry.release} - </MVN_DOCKERREGISTRY_RELEASE> - </environmentVariables> - </configuration> - </plugin> </plugins> </pluginManagement> <plugins> @@ -215,39 +186,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.6.0</version> - <executions> - <execution> - <id>deploy script</id> - <phase>deploy</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>__</argument> - <argument>deploy</argument> - </arguments> - </configuration> - </execution> - <execution> - <id>install script</id> - <phase>install</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <arguments> - <argument>__</argument> - <argument>install</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> <reporting> @@ -270,4 +208,4 @@ </plugin> </plugins> </reporting> -</project>
\ No newline at end of file +</project> |