aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Lund <lund@research.att.com>2017-02-15 23:32:36 +0000
committerCarsten Lund <lund@research.att.com>2017-02-16 19:06:16 +0000
commitaa30ad6eef091a11e2faeca003ecd1c0f93a586b (patch)
treef2c1b7e882af74c8f5c0ce2e62906176b13e0669
parentb82c3e96a97c346abdd26fa6a0fe9f657c6a2899 (diff)
Updates to POMs for handling LF setup.
Change-Id: I0ee4fbadcbe47564fbde0a1747fb87483ac3697a Signed-off-by: Carsten Lund <lund@research.att.com>
-rw-r--r--ncomp-maven-base/pom.xml2
-rw-r--r--ncomp-maven-xcore/LICENSE.txt4
-rw-r--r--ncomp-maven-xcore/pom.xml128
3 files changed, 69 insertions, 65 deletions
diff --git a/ncomp-maven-base/pom.xml b/ncomp-maven-base/pom.xml
index 6f07bb8..96e0c65 100644
--- a/ncomp-maven-base/pom.xml
+++ b/ncomp-maven-base/pom.xml
@@ -10,6 +10,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
+ <openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
+ <openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
</properties>
diff --git a/ncomp-maven-xcore/LICENSE.txt b/ncomp-maven-xcore/LICENSE.txt
index 30471b5..5f1249d 100644
--- a/ncomp-maven-xcore/LICENSE.txt
+++ b/ncomp-maven-xcore/LICENSE.txt
@@ -9,7 +9,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,5 +18,5 @@
* limitations under the License.
* ============LICENSE_END============================================
*/
-
+
ECOMP and OpenECOMP are trademarks and service marks of AT&T Intellectual Property.
diff --git a/ncomp-maven-xcore/pom.xml b/ncomp-maven-xcore/pom.xml
index f187c50..919a206 100644
--- a/ncomp-maven-xcore/pom.xml
+++ b/ncomp-maven-xcore/pom.xml
@@ -7,12 +7,14 @@
<packaging>pom</packaging>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.target>1.7</maven.compiler.target>
- <maven.compiler.source>1.7</maven.compiler.source>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <openecomp.nexus.releases>https://nexus.openecomp.org/content/repositories/releases/</openecomp.nexus.releases>
+ <openecomp.nexus.snapshots>https://nexus.openecomp.org/content/repositories/snapshots/</openecomp.nexus.snapshots>
</properties>
-
+
<pluginRepositories>
<!-- Black Duck plugin dependencies -->
<pluginRepository>
@@ -27,7 +29,7 @@
<url>http://maven.restlet.com</url>
</pluginRepository>
</pluginRepositories>
-<build>
+ <build>
<sourceDirectory>src/main/xcore-gen</sourceDirectory>
<resources>
<resource>
@@ -35,7 +37,7 @@
</resource>
</resources>
<plugins>
- <!-- blackduck maven plugin -->
+ <!-- blackduck maven plugin -->
<plugin>
<groupId>com.blackducksoftware.integration</groupId>
<artifactId>hub-maven-plugin</artifactId>
@@ -55,20 +57,20 @@
</execution>
</executions>
</plugin>
- <!-- site maven 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>
-
+ <!-- site maven 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>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
@@ -86,11 +88,11 @@
<artifactId>org.eclipse.emf.ecore</artifactId>
<version>2.11.0-v20150123-0347</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.emf</groupId>
- <artifactId>org.eclipse.emf.common</artifactId>
- <version>2.11.0-v20150123-0347</version>
- </dependency>
+ <dependency>
+ <groupId>org.eclipse.emf</groupId>
+ <artifactId>org.eclipse.emf.common</artifactId>
+ <version>2.11.0-v20150123-0347</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.lib</artifactId>
@@ -108,44 +110,44 @@
</dependency>
</dependencies>
-
- <distributionManagement>
- <repository>
- <id>osecomp-nexus-releases</id>
- <name>OSECOMP Release Repository</name>
- <url>${openecomp.nexus.releases}</url>
- </repository>
- <snapshotRepository>
- <id>osecomp-nexus-snapshots</id>
- <name>OSECOMP Snapshot Repository</name>
- <url>${openecomp.nexus.snapshots}</url>
- </snapshotRepository>
- <site>
- <id>dcae-javadoc</id>
- <url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
- </site>
- </distributionManagement>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.4</version>
- <configuration>
- <failOnError>false</failOnError>
- <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>org.umlgraph</groupId>
- <artifactId>umlgraph</artifactId>
- <version>5.6</version>
- </docletArtifact>
- <additionalparam>-views</additionalparam>
- <useStandardDocletOptions>true</useStandardDocletOptions>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+
+ <distributionManagement>
+ <repository>
+ <id>osecomp-nexus-releases</id>
+ <name>OSECOMP Release Repository</name>
+ <url>${openecomp.nexus.releases}</url>
+ </repository>
+ <snapshotRepository>
+ <id>osecomp-nexus-snapshots</id>
+ <name>OSECOMP Snapshot Repository</name>
+ <url>${openecomp.nexus.snapshots}</url>
+ </snapshotRepository>
+ <site>
+ <id>dcae-javadoc</id>
+ <url>${site.urlroot}/${project.artifactId}/${project.version}/</url>
+ </site>
+ </distributionManagement>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <configuration>
+ <failOnError>false</failOnError>
+ <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+ <docletArtifact>
+ <groupId>org.umlgraph</groupId>
+ <artifactId>umlgraph</artifactId>
+ <version>5.6</version>
+ </docletArtifact>
+ <additionalparam>-views</additionalparam>
+ <useStandardDocletOptions>true</useStandardDocletOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>