summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorC.T. Paterson <ctpaterson+onap@gmail.com>2018-09-13 15:38:41 -0400
committerC.T. Paterson <ctpaterson+onap@gmail.com>2018-09-13 15:39:38 -0400
commita1b35e204bc28b4120005faa1e165c96eb112d69 (patch)
treee068b3580da7510ca496e3ee56154037d3c71e8d
parent220e170103ae5711addcfd84f597fc06a5e3aaca (diff)
New maven plugin to respect naming convention
Change-Id: I613c5cb616457169840810893166a73ff13d7802 Issue-ID: AAI-1547 Signed-off-by: C.T. Paterson <ctpaterson+onap@gmail.com>
-rw-r--r--pom.xml21
-rw-r--r--project.clj11
2 files changed, 9 insertions, 23 deletions
diff --git a/pom.xml b/pom.xml
index 1309264..510c28b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,11 @@
<groupId>org.onap.aai</groupId>
<artifactId>chameleon</artifactId>
<packaging>jar</packaging>
- <version>1.3.0-SNAPSHOT.</version>
+ <version>1.3.0-SNAPSHOT</version>
<name>aai-chameleon</name>
<description/>
<scm>
- <tag>9e290f5c3a984d529133e19bd013e4329a3efaa2</tag>
+ <tag>220e170103ae5711addcfd84f597fc06a5e3aaca</tag>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -77,24 +77,13 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.4.1</version>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- <archive>
- <manifest>
- <mainClass>chameleon.server</mainClass>
- </manifest>
- </archive>
- </configuration>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.0</version>
<executions>
<execution>
- <id>assemble</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>shade</goal>
</goals>
</execution>
</executions>
diff --git a/project.clj b/project.clj
index 8d0661a..ec8ef18 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject org.onap.aai/chameleon "1.3.0-SNAPSHOT."
+(defproject org.onap.aai/chameleon "1.3.0-SNAPSHOT"
:name "chameleon"
:dependencies [[org.clojure/clojure "1.9.0"]
[org.clojure/core.async "0.4.474"]
@@ -64,13 +64,10 @@
{:executions ([:execution [:id "copy-dependencies"]
[:goals ([:goal "copy-dependencies"])]
[:phase "package"]])}]
- [org.apache.maven.plugins/maven-assembly-plugin "2.4.1"
- {:configuration ([:descriptorRefs [:descriptorRef "jar-with-dependencies"]]
- [:archive [:manifest
- [:mainClass "chameleon.server"]]])
- :executions ([:execution [:id "assemble"]
+ [org.apache.maven.plugins/maven-shade-plugin "3.2.0"
+ {:executions ([:execution
[:phase "package"]
- [:goals ([:goal "single"])]])}]
+ [:goals ([:goal "shade"])]])}]
[org.sonatype.plugins/nexus-staging-maven-plugin "1.6.7"
{:extensions true
:configuration ([:nexusUrl "https://nexus.onap.org"]