diff options
| author |   HuabingZhao <zhao.huabing@zte.com.cn> | 2016-09-03 15:36:29 +0800 |
|---|---|---|
| committer | HuabingZhao <zhao.huabing@zte.com.cn> | 2016-09-03 15:39:45 +0800 |
| commit | f73744385206dadd8abcbb411055f43e7f356095 (patch) | |
| tree | 715bab4323be55ae362686cf39e46a997d23b2d5 | |
| parent | 28ba51464b33f4c0415d63cc019be4f53da8ff58 (diff) | |
Fix deploy issue
Issue-id: OCS-47
Change-Id: I59e6120c352dc71bab4769036006e98480fe91e8
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | winery/org.eclipse.winery.model.csar.toscametafile/pom.xml | 6 | ||||
| -rw-r--r-- | winery/org.eclipse.winery.model.selfservice/pom.xml | 6 | ||||
| -rw-r--r-- | winery/org.eclipse.winery.model.tosca/pom.xml | 6 | ||||
| -rw-r--r-- | winery/pom.xml | 27 |
5 files changed, 34 insertions, 13 deletions
@@ -60,9 +60,7 @@ <modules> <module>common-util</module> <module>rest-client</module> - <!-- <module>winery</module> - --> </modules> <dependencyManagement> diff --git a/winery/org.eclipse.winery.model.csar.toscametafile/pom.xml b/winery/org.eclipse.winery.model.csar.toscametafile/pom.xml index d3f4922..674dcf1 100644 --- a/winery/org.eclipse.winery.model.csar.toscametafile/pom.xml +++ b/winery/org.eclipse.winery.model.csar.toscametafile/pom.xml @@ -13,6 +13,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.winery</groupId> + <artifactId>winery</artifactId> + <version>0.1.37-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.winery</groupId> <artifactId>org.eclipse.winery.model.csar.toscametafile</artifactId> <version>0.0.4-SNAPSHOT</version> diff --git a/winery/org.eclipse.winery.model.selfservice/pom.xml b/winery/org.eclipse.winery.model.selfservice/pom.xml index 844cba9..6292c41 100644 --- a/winery/org.eclipse.winery.model.selfservice/pom.xml +++ b/winery/org.eclipse.winery.model.selfservice/pom.xml @@ -13,6 +13,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.winery</groupId> + <artifactId>winery</artifactId> + <version>0.1.37-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.winery</groupId> <artifactId>org.eclipse.winery.model.selfservice</artifactId> <version>0.1.20-SNAPSHOT</version> diff --git a/winery/org.eclipse.winery.model.tosca/pom.xml b/winery/org.eclipse.winery.model.tosca/pom.xml index fedd3b8..60ce723 100644 --- a/winery/org.eclipse.winery.model.tosca/pom.xml +++ b/winery/org.eclipse.winery.model.tosca/pom.xml @@ -13,6 +13,12 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse.winery</groupId> + <artifactId>winery</artifactId> + <version>0.1.37-SNAPSHOT</version> + </parent> + <groupId>org.eclipse.winery</groupId> <artifactId>org.eclipse.winery.model.tosca</artifactId> <version>0.1.21-SNAPSHOT</version> diff --git a/winery/pom.xml b/winery/pom.xml index 2a89813..9daf8d7 100644 --- a/winery/pom.xml +++ b/winery/pom.xml @@ -16,6 +16,13 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.openo.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath></relativePath> + </parent> + <groupId>org.eclipse.winery</groupId> <artifactId>winery</artifactId> <version>0.1.37-SNAPSHOT</version> @@ -53,17 +60,7 @@ </license> </licenses> - <distributionManagement> - <repository> - <id>open-o-releases</id> - <url>${nexusproxy}/repositories/releases</url> - </repository> - <snapshotRepository> - <id>open-o-snapshots</id> - <url>${nexusproxy}/repositories/snapshots</url> - </snapshotRepository> - </distributionManagement> - + <scm> <developerConnection>scm:git:http://git.eclipse.org/gitroot/winery/org.eclipse.winery.winery.git/</developerConnection> <tag>HEAD</tag> @@ -88,6 +85,14 @@ <artifactId>versions-maven-plugin</artifactId> <version>2.1</version> </plugin> + + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> + </build> </project> |