diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-09-27 09:42:49 +0200 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-09-27 09:42:55 +0200 |
| commit | 55ea0201a8f6cd31127455d745b4839e4f8a3d62 (patch) | |
| tree | 9c366ce96894a66a54e312f17d04be3d47638e9b | |
| parent | 4252fa64fcfb5c9a3549c1affe49c11e62e89a4c (diff) | |
Resolve merge failure
Add additional config to pom.xml to allow merge build (mvn deploy)
to succeed.
Change-Id: I42400c367a78f87a02cf80365fe1c58f069b713f
Issue-ID: CCSDK-59
Signed-off-by: Dan Timoney <dtimoney@att.com>
| -rwxr-xr-x | .gitignore | 35 | ||||
| -rw-r--r-- | pom.xml | 97 |
2 files changed, 132 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..7c9cc13 --- /dev/null +++ b/.gitignore @@ -0,0 +1,35 @@ +#####standard .git ignore entries##### + +## IDE Specific Files ## +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +.checkstyle +maven-eclipse.xml +workspace + +## Compilation Files ## +*.class +**/target +target +target-ide +MANIFEST.MF + +## Misc Ignores (OS specific etc) ## +bin/ +dist +*~ +*.ipr +*.iml +*.iws +classes +out/ +.DS_STORE +.metadata + +# BlackDuck generated file +blackDuckHubProjectName.txt +blackDuckHubProjectVersionName.txt @@ -16,4 +16,101 @@ <version>1.0.0-SNAPSHOT</version> </parent> + <properties> + <maven.compiler.source>1.8</maven.compiler.source> + <maven.compiler.target>1.8</maven.compiler.target> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + <!-- sitePath may be overridden in the inheriting POM if desired --> + <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath> + </properties> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <url>${onap.nexus.url}/content/repositories/releases</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <url>${onap.nexus.url}/content/repositories/snapshots</url> + </snapshotRepository> + </distributionManagement> + <build> + <pluginManagement> + <plugins> + <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>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <!-- This version supports the "deployAtEnd" parameter --> + <version>2.8</version> + <configuration> + <skip/> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>3.6</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-webdav-jackrabbit</artifactId> + <version>2.10</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>3.0.0-M1</version> + <executions> + <execution> + <id>enforce-no-snapshots</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireReleaseDeps> + <failWhenParentIsSnapshot>false</failWhenParentIsSnapshot> + <onlyWhenRelease>true</onlyWhenRelease> + <level>WARN</level> + </requireReleaseDeps> + </rules> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </pluginManagement> + <plugins> + <plugin> + <groupId>org.sonatype.plugins</groupId> + <artifactId>nexus-staging-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + </plugin> + </plugins> + </build> </project> |