aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-08-30 18:46:54 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-30 18:46:54 +0000
commitd7a98ca88b25989f45018f3411f2f0210e51df42 (patch)
tree3ba01d7795f5f70ea3b0437db6f859c865c08b49
parent53f0cf8bcadb39fbe01e673418bc02573a064f3c (diff)
parent801e0f67b5179cbe9e7baf053addbe2da218a0a7 (diff)
Merge "Change of versioning strategy"
-rw-r--r--pom.xml22
-rw-r--r--versions/pom.xml27
-rw-r--r--versions/src/main/resources/onap-versions/ruleset.xml33
3 files changed, 0 insertions, 82 deletions
diff --git a/pom.xml b/pom.xml
index d45dbd6..05bf820 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
<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>
- <versions.plugin.phase>none</versions.plugin.phase>
<!-- sitePath may be overridden in the inheriting POM if desired -->
<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
</properties>
@@ -108,23 +107,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- <version>2.4</version>
- <executions>
- <execution>
- <id>check-dependencies-version</id>
- <phase>${versions.plugin.phase}</phase>
- <goals>
- <goal>display-dependency-updates</goal>
- </goals>
- <configuration>
- <rulesUri>https://git.onap.org/oparent/plain/versions/src/main/resources/onap-versions/ruleset.xml</rulesUri>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -144,10 +126,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>versions-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
</project>
diff --git a/versions/pom.xml b/versions/pom.xml
deleted file mode 100644
index fb568f4..0000000
--- a/versions/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 AT&T Intellectual Property
-
- Licensed under the Apache License, Version 2.0 (the "License");
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- 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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>version</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>versions</artifactId>
- <name>oparent/versions</name>
-</project>
diff --git a/versions/src/main/resources/onap-versions/ruleset.xml b/versions/src/main/resources/onap-versions/ruleset.xml
deleted file mode 100644
index a846008..0000000
--- a/versions/src/main/resources/onap-versions/ruleset.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 AT&T Intellectual Property
-
- Licensed under the Apache License, Version 2.0 (the "License");
- 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
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<ruleset comparisonMethod="maven"
- xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
- <rules>
- <!-- The following rule is given as example of how to specify the only valid version of a
- component when display-dependency-updates is invoked.
- -->
- <!--
- <rule groupId="org.onap" artifactId="oparent" comparisonMethod="maven">
- <ignoreVersions>
- <ignoreVersion type="regex">^((?!1.0.0).)*$</ignoreVersion>
- </ignoreVersions>
- </rule>
- -->
- </rules>
-</ruleset>