diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 81 |
1 files changed, 34 insertions, 47 deletions
@@ -25,12 +25,12 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>1.1.0</version> + <version>2.0.0</version> </parent> <groupId>org.onap.aai.aai-common</groupId> <artifactId>aai-common</artifactId> - <version>1.4.4-SNAPSHOT</version> + <version>1.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>aai-aai-common</name> <description>Contains all of the common code for resources and traversal repos</description> @@ -44,6 +44,15 @@ <module>aai-utils</module> </modules> + <profiles> + <profile> + <id>docker</id> + <modules> + <module>aai-common-docker</module> + </modules> + </profile> + </profiles> + <properties> <aai.generate.schema>true</aai.generate.schema> <sitePath>/content/sites/site/org/onap/aai/aai-common/${project.artifactId}/${project.version}</sitePath> @@ -61,34 +70,34 @@ Using https://code.revelc.net/formatter-maven-plugin/ for Eclipse formatter Using https://github.com/diffplug/spotless/tree/master/plugin-maven for import order Use in combination to rewrite code and imports, then checkstyle - + mvn formatter:format spotless:apply process-sources --> <plugin> - <groupId>net.revelc.code.formatter</groupId> - <artifactId>formatter-maven-plugin</artifactId> - <version>2.8.1</version> - <configuration> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <version>2.8.1</version> + <configuration> <configFile>${project.parent.basedir}/onap-java-formatter.xml</configFile> - </configuration> - <!-- https://code.revelc.net/formatter-maven-plugin/ - use mvn formatter:format to rewrite source files - use mvn formatter:validate to validate source files --> - </plugin> + </configuration> + <!-- https://code.revelc.net/formatter-maven-plugin/ + use mvn formatter:format to rewrite source files + use mvn formatter:validate to validate source files --> + </plugin> <plugin> - <groupId>com.diffplug.spotless</groupId> - <artifactId>spotless-maven-plugin</artifactId> - <version>1.18.0</version> - <configuration> - <java> - <importOrder> - <order>com,java,javax,org</order> - </importOrder> - </java> - </configuration> - <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven - use mvn spotless:apply to rewrite source files - use mvn spotless:check to validate source files --> + <groupId>com.diffplug.spotless</groupId> + <artifactId>spotless-maven-plugin</artifactId> + <version>1.18.0</version> + <configuration> + <java> + <importOrder> + <order>com,java,javax,org</order> + </importOrder> + </java> + </configuration> + <!-- https://github.com/diffplug/spotless/tree/master/plugin-maven + use mvn spotless:apply to rewrite source files + use mvn spotless:check to validate source files --> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -116,23 +125,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <version>2.8.2</version> - <executions> - <execution> - <id>default-deploy</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.sonatype.plugins</groupId> - <artifactId>nexus-staging-maven-plugin</artifactId> - <version>1.6.7</version> - <extensions>true</extensions> - <configuration> - <nexusUrl>${onap.nexus.url}</nexusUrl> - <stagingProfileId>176c31dfe190a</stagingProfileId> - <serverId>ecomp-staging</serverId> - </configuration> </plugin> <plugin> <groupId>com.mycila</groupId> @@ -257,11 +249,6 @@ <url>${onap.nexus.url}/content/repositories/releases/</url> </repository> <repository> - <id>ecomp-staging</id> - <name>ECOMP Staging Repository</name> - <url>${onap.nexus.url}/content/repositories/staging/</url> - </repository> - <repository> <id>ecomp-snapshots</id> <name>ECOMP Snapshot Repository</name> <url>${onap.nexus.url}/content/repositories/snapshots/</url> |