summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2017-10-30 17:27:08 -0500
committerJorge Hernandez <jh1730@att.com>2017-10-30 17:56:48 -0500
commit7b245f01d7228037c6a564f3768b306eed621d29 (patch)
treeba9d9b0c02e6959d1868608bc6aea6d034b7321f
parentab484fb7048b331ec0dbc7c35771c91344cf144e (diff)
clean leftover items in parent pom pre-release
snapshot dependencies are not permitted it should an actual released version, or project.version if the plan is to release it at the same time. the maven version plugin was also left over from previous oparent work documenting accepted version of xml-apis. Change-Id: I8b76bd9befdf69674aafe7b14bfbcc7d2f938062 Issue-ID: POLICY-404 Signed-off-by: Jorge Hernandez <jh1730@att.com>
-rw-r--r--api-state-management/pom.xml2
-rw-r--r--feature-eelf/pom.xml2
-rw-r--r--feature-state-management/pom.xml2
-rw-r--r--pom.xml34
4 files changed, 9 insertions, 31 deletions
diff --git a/api-state-management/pom.xml b/api-state-management/pom.xml
index f5c1e21e..184a4f78 100644
--- a/api-state-management/pom.xml
+++ b/api-state-management/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-monitor</artifactId>
- <version>${common-modules.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/feature-eelf/pom.xml b/feature-eelf/pom.xml
index 17a9de9f..53dd79f6 100644
--- a/feature-eelf/pom.xml
+++ b/feature-eelf/pom.xml
@@ -105,7 +105,7 @@
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
- <version>${common-modules.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.drools-pdp</groupId>
diff --git a/feature-state-management/pom.xml b/feature-state-management/pom.xml
index db5afe6a..1341d0ca 100644
--- a/feature-state-management/pom.xml
+++ b/feature-state-management/pom.xml
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-monitor</artifactId>
- <version>${common-modules.version}</version>
+ <version>${project.version}</version>
</dependency>
<!-- Need to pull into assembly for IntegrityMonitor -->
<dependency>
diff --git a/pom.xml b/pom.xml
index 15ff07bc..d00a2850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,6 @@
<properties>
<project.source.version>1.8</project.source.version>
<project.target.version>1.8</project.target.version>
- <common-modules.version>1.1.0-SNAPSHOT</common-modules.version>
<dmaap.version>0.2.12</dmaap.version>
<cambria.version>0.0.1</cambria.version>
<jersey.version>2.25.1</jersey.version>
@@ -56,6 +55,7 @@
<hibernate.commons.annotations.version>5.0.1.Final</hibernate.commons.annotations.version>
<commons.io.version>2.5</commons.io.version>
<guava.version>23.0</guava.version>
+ <xml.apis.version>1.4.01</xml.apis.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>
@@ -204,25 +204,14 @@
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml.apis.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.oparent</groupId>
- <artifactId>version-check-maven-plugin</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -283,17 +272,6 @@
<artifactId>sonar-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.onap.oparent</groupId>
- <artifactId>version-check-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>version-check</id>
- <phase/>
- </execution>
- </executions>
- </plugin>
-
</plugins>
<pluginManagement>
<plugins>