diff options
| author |   Venkata Harish Kajur <vk250x@att.com> | 2020-06-19 13:57:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-06-19 13:57:30 +0000 |
| commit | 14374349e8d452c059daf0540ad411993ebde35d (patch) | |
| tree | fda896b74b6cdab152a0204d130ebb3801e48e21 /aai-schema-service/src/main | |
| parent | 3717cc5526b99bd95eb004f909c31c1642b7ccf5 (diff) | |
| parent | a8ce62a3bae5976982f6d1432723251a414e2878 (diff) | |
Merge "v20 support in schema-service without javafx"
Diffstat (limited to 'aai-schema-service/src/main')
4 files changed, 6 insertions, 4 deletions
diff --git a/aai-schema-service/src/main/assembly/descriptor.xml b/aai-schema-service/src/main/assembly/descriptor.xml index 2c33dd0..a4399da 100644 --- a/aai-schema-service/src/main/assembly/descriptor.xml +++ b/aai-schema-service/src/main/assembly/descriptor.xml @@ -13,6 +13,7 @@ <includes> <include>**/*</include> </includes> + <fileMode>755</fileMode> </fileSet> <fileSet> <directory>${project.basedir}/src/main/scripts</directory> @@ -20,6 +21,7 @@ <includes> <include>**/*</include> </includes> + <fileMode>777</fileMode> </fileSet> <fileSet> <directory>${project.build.directory}</directory> @@ -27,6 +29,7 @@ <includes> <include>${project.artifactId}-${project.version}.jar</include> </includes> + <fileMode>755</fileMode> </fileSet> </fileSets> </assembly> diff --git a/aai-schema-service/src/main/resources/application.properties b/aai-schema-service/src/main/resources/application.properties index ea8934f..c586bfd 100644 --- a/aai-schema-service/src/main/resources/application.properties +++ b/aai-schema-service/src/main/resources/application.properties @@ -49,7 +49,7 @@ schema.ingest.file=${server.local.startpath}/application.properties schema.uri.base.path=/aai/schema-service # Lists all of the versions in the schema -schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19 +schema.version.list=v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20 # Specifies from which version should the depth parameter to default to zero schema.version.depth.start=v10 # Specifies from which version should the related link be displayed in response payload @@ -62,4 +62,4 @@ schema.version.namespace.change.start=v12 # Specifies from which version should the client start seeing the edge label in payload schema.version.edge.label.start=v12 # Specifies the version that the application should default to -schema.version.api.default=v19 +schema.version.api.default=v20 diff --git a/aai-schema-service/src/main/scripts/common_functions.sh b/aai-schema-service/src/main/scripts/common_functions.sh index 7dfda25..dd235c2 100644 --- a/aai-schema-service/src/main/scripts/common_functions.sh +++ b/aai-schema-service/src/main/scripts/common_functions.sh @@ -36,7 +36,6 @@ check_user(){ # Sources the profile and sets the project home source_profile(){ - . /etc/profile.d/aai.sh PROJECT_HOME=/opt/app/aai-schema-service } diff --git a/aai-schema-service/src/main/scripts/getTool.sh b/aai-schema-service/src/main/scripts/getTool.sh index 9b8b26e..1241145 100644 --- a/aai-schema-service/src/main/scripts/getTool.sh +++ b/aai-schema-service/src/main/scripts/getTool.sh @@ -58,7 +58,7 @@ if [ "${userid}" != "aaiadmin" ]; then exit 1 fi -. /etc/profile.d/aai.sh + PROJECT_HOME=/opt/app/aai-schema-service prop_file=$PROJECT_HOME/resources/etc/appprops/aaiconfig.properties log_dir=$PROJECT_HOME/logs/misc |