diff options
| author |   HuabingZhao <zhao.huabing@zte.com.cn> | 2016-09-18 06:53:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@open-o.org> | 2016-09-18 06:53:30 +0000 |
| commit | fcac34d12ac374fb63926f354d19172eff430e40 (patch) | |
| tree | d16e84ce18814095244a4d3ab4ec9ce0bda38aa1 | |
| parent | ef35b7c9189bcefa774c4cded86d260d222dc6d5 (diff) | |
| parent | 05ce09b9c8d365af554ea993ad0a7d5a696c053c (diff) | |
Merge "Fix build errors in autorelease full clean build"
| -rw-r--r-- | common-util/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 5 | ||||
| -rw-r--r-- | rest-client/pom.xml | 3 | ||||
| -rw-r--r-- | winery/pom.xml | 8 |
4 files changed, 8 insertions, 12 deletions
diff --git a/common-util/pom.xml b/common-util/pom.xml index e1a8185..2749380 100644 --- a/common-util/pom.xml +++ b/common-util/pom.xml @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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"> +<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.common-services.common-utilities</groupId> @@ -141,4 +140,3 @@ </project> - @@ -14,15 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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"> +<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.openo.oparent</groupId> <artifactId>oparent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath></relativePath> + <relativePath>../oparent</relativePath> </parent> <groupId>org.openo.common-services.common-utilities</groupId> diff --git a/rest-client/pom.xml b/rest-client/pom.xml index cdfa3cc..d43d4e4 100644 --- a/rest-client/pom.xml +++ b/rest-client/pom.xml @@ -14,8 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<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"> +<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.common-services.common-utilities</groupId> diff --git a/winery/pom.xml b/winery/pom.xml index 91ad3c5..3080c10 100644 --- a/winery/pom.xml +++ b/winery/pom.xml @@ -17,10 +17,10 @@ <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> + <groupId>org.openo.oparent</groupId> + <artifactId>oparent</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../oparent</relativePath> </parent> <groupId>org.eclipse.winery</groupId> |