summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Forsyth <jf2512@att.com>2019-06-26 18:41:27 -0400
committerJimmy Forsyth <jf2512@att.com>2019-06-26 19:05:18 -0400
commitfad060963cdfea8363eaeba4b8e7d4dc12e8ed22 (patch)
treeb5c9c098063bd56207a3bffa374eae19fc034f2a
parent36c924ba8bb967ab1a5df720cc58981361d7a265 (diff)
Prepare for global-jjb
Issue-ID: AAI-2467 Signed-off-by: Jimmy Forsyth <jf2512@att.com> Change-Id: I156b2a6bb35e240aef97c3dec5d1a042c187ea32
-rw-r--r--aai-annotations/pom.xml8
-rw-r--r--aai-queries/pom.xml8
-rw-r--r--aai-schema-gen/pom.xml47
-rw-r--r--aai-schema-service/pom.xml22
-rw-r--r--aai-schema/pom.xml4
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd14
-rw-r--r--pom.xml21
-rw-r--r--version.properties2
8 files changed, 60 insertions, 66 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index 8a87b23..e1f3b18 100644
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>aai-annotations</artifactId>
<name>aai-annotations</name>
<packaging>jar</packaging>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
</properties>
@@ -55,10 +55,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- </plugin>
</plugins>
</build>
diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml
index d257f7b..dcc2620 100644
--- a/aai-queries/pom.xml
+++ b/aai-queries/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>aai-queries</artifactId>
<name>aai-queries</name>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
@@ -148,10 +148,6 @@
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
</plugin>
diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml
index 109ad57..9653426 100644
--- a/aai-schema-gen/pom.xml
+++ b/aai-schema-gen/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>aai-schema-gen</artifactId>
<name>aai-schema-gen</name>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
@@ -50,6 +50,7 @@
<schema.version.edge.label.start>v12</schema.version.edge.label.start>
<schema.version.api.default>v16</schema.version.api.default>
<schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
+ <springframework.version>4.3.18.RELEASE</springframework.version>
<!-- End of Default ONAP Schema Properties -->
</properties>
<profiles>
@@ -70,6 +71,7 @@
<schema.version.api.default>v15</schema.version.api.default>
<schema.version.list>v10,v11,v12,v13,v14,v15,v16</schema.version.list>
<gendoc.version>v16</gendoc.version>
+ <springframework.version>4.3.18.RELEASE</springframework.version>
</properties>
</profile>
<!-- End of ONAP profile -->
@@ -599,6 +601,43 @@
</build>
</profile>
</profiles>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${springframework.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -673,10 +712,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- </plugin>
</plugins>
<resources>
<resource>
diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml
index 0f00b3a..3e84d0c 100644
--- a/aai-schema-service/pom.xml
+++ b/aai-schema-service/pom.xml
@@ -25,11 +25,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>aai-schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
<properties>
<java.version>1.8</java.version>
@@ -736,24 +736,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <executions>
- <execution>
- <id>default-deploy</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
</plugin>
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index bdc457f..5686d89 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
</parent>
<artifactId>aai-schema</artifactId>
<name>aai-schema</name>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
index d557026..991c5cf 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd
@@ -4025,7 +4025,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource,model-invariant-id,model-version-id",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -5119,7 +5119,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -8750,7 +8750,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network",requiredProps="connectivity-id",uriTemplate="/network/connectivities/connectivity/{connectivity-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status,model-invariant-id,model-version-id",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network",requiredProps="connectivity-id",uriTemplate="/network/connectivities/connectivity/{connectivity-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9204,7 +9204,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network",requiredProps="site-resource-id",uriTemplate="/network/site-resources/site-resource/{site-resource-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status,model-invariant-id,model-version-id",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network",requiredProps="site-resource-id",uriTemplate="/network/site-resources/site-resource/{site-resource-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9312,7 +9312,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network",requiredProps="sdwan-vpn-id",uriTemplate="/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status,model-invariant-id,model-version-id",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network",requiredProps="sdwan-vpn-id",uriTemplate="/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9420,7 +9420,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network",requiredProps="device-id",uriTemplate="/network/devices/device/{device-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status,model-invariant-id,model-version-id",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network",requiredProps="device-id",uriTemplate="/network/devices/device/{device-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9563,7 +9563,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network",requiredProps="wan-port-config-id",uriTemplate="/network/wan-port-configs/wan-port-config/{wan-port-config-id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status,model-invariant-id,model-version-id",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network",requiredProps="wan-port-config-id",uriTemplate="/network/wan-port-configs/wan-port-config/{wan-port-config-id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/pom.xml b/pom.xml
index 4bf84a0..bd7ff0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,11 +26,11 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.1.0</version>
+ <version>2.0.0</version>
</parent>
<groupId>org.onap.aai.schema-service</groupId>
<artifactId>schema-service</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.1-SNAPSHOT</version>
<name>aai-schema-service</name>
<packaging>pom</packaging>
<modules>
@@ -97,23 +97,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <executions>
- <execution>
- <id>default-deploy</id>
- <phase>none</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>${nexusproxy}</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
</plugin>
<plugin>
<groupId>com.mycila</groupId>
diff --git a/version.properties b/version.properties
index 95479a0..307e94f 100644
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major_version=1
minor_version=5
-patch_version=0
+patch_version=1
base_version=${major_version}.${minor_version}.${patch_version}
# Release must be completed with GIT information # in Jenkins