Merge pull request #1069 from Sunbird-Knowlg/release-6.0.0

Merge Release 6.0.0 into 6.1.0
Sunbird-Knowlg · May 6, 2024 · 4e35580 · 4e35580
2 parents dc9d4b0 + 30d111a
commit 4e35580
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/content-service/Jenkinsfile b/build/content-service/Jenkinsfile
@@ -34,7 +34,7 @@ node('build-slave') {
 
                 stage('Package') {
                     dir('content-api') {
-                        sh 'mvn play2:dist -pl content-service'
+                        sh 'mvn play2:dist -pl content-service -DCLOUD_STORE_GROUP_ID=' + cloud_store_group_id + ' -DCLOUD_STORE_ARTIFACT_ID=' + cloud_store_artifact_id + ' -DCLOUD_STORE_VERSION=' + cloud_store_version
                     }
                     sh('chmod 777 build/build.sh')
                     sh("build/build.sh ${build_tag} ${"content-service"} ${env.NODE_NAME} ${hub_org}")

diff --git a/content-api/content-actors/src/main/scala/org/sunbird/content/dial/DIALManager.scala b/content-api/content-actors/src/main/scala/org/sunbird/content/dial/DIALManager.scala
@@ -307,7 +307,7 @@ object DIALManager {
 	}
 
 	def reserve(request: Request, channelId: String, contentId: String, rootNode: Node, contentMetadata: util.Map[String, AnyRef])(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
-		validateContentStatus(contentMetadata)
+		//validateContentStatus(contentMetadata)
 
 		val reservedDialCodes = if (contentMetadata.containsKey(DIALConstants.RESERVED_DIALCODES)) ScalaJsonUtils.deserialize[Map[String, Integer]](contentMetadata.get(DIALConstants.RESERVED_DIALCODES).asInstanceOf[String]) else Map.empty[String, Integer]
 		val updateDialCodes = getUpdateDIALCodes(reservedDialCodes, request, channelId, contentId)