Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Release 5.5.0 into Release-5.6.0 #982

Merged
merged 15 commits into from
Sep 7, 2023
Merged

Merge Release 5.5.0 into Release-5.6.0 #982

merged 15 commits into from
Sep 7, 2023

Conversation

pallakartheekreddy
Copy link
Collaborator

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

Please choose appropriate options.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes in the below checkboxes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Ran Test A
  • Ran Test B

Test Configuration:

  • Software versions: Java 11, scala-2.11, play-2.7.2
  • Hardware versions: 2 CPU/ 4GB RAM

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

aimansharief and others added 14 commits August 1, 2023 16:46
@aimansharief
KN : CSP Changes
2b36e07
@aimansharief
KN : CSP Changes - Circle ci changes
8c60a4a
@aimansharief
KN : CSP Changes - Circle ci changes
7a7a39c
@aimansharief
Update HttpUrlUtilTest.java
f69d678
@pallakartheekreddy
Issue #KN-920 fix: Jenkins Build changes
3584e19
@pallakartheekreddy
Issue #KN-920 fix: Jenkins Build changes
ecd7b20
@pallakartheekreddy
Issue #KN-920 fix: Jenkins Build changes
c18f8bc
@pallakartheekreddy
Issue #KN-920 fix: Jenkins Build changes
17ddf4f
@pallakartheekreddy
Issue #KN-920 fix: Jenkins Build changes
cf0e398
@pallakartheekreddy
Issue #KN-920 fix: Jenkins Build changes
bfd634c
@pallakartheekreddy
Issue #KN-920 fix: removed console logs
4474343
@maheshkumargangula
Merge pull request Sunbird-Knowlg#973 from aimansharief/release-5.5.0
87c66a4 
Issue #KN-920 fix: CSP Changes
@pallakartheekreddy
OCI changes: Added formaturl for content service (Sunbird-Knowlg#979)
551878a 
* OCI changes Added formaturl for content service

* ignore test case

* CircleCi issue fix

* CircleCi issue fix
@pallakartheekreddy
Merge branch 'release-5.6.0' into release-5.5.0
58c3c02
@pallakartheekreddy pallakartheekreddy changed the title Release 5.5.0 Merge Release 5.5.0 into rlease-5.6.0 Sep 7, 2023
@pallakartheekreddy pallakartheekreddy changed the title Merge Release 5.5.0 into rlease-5.6.0 Merge Release 5.5.0 into Release-5.6.0 Sep 7, 2023
@sonarcloud
Copy link

sonarcloud bot commented Sep 7, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (14.0.2) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@maheshkumargangula maheshkumargangula merged commit 01d389c into Sunbird-Knowlg:release-5.6.0 Sep 7, 2023
1 of 2 checks passed
maheshkumargangula added a commit that referenced this pull request Sep 7, 2023
@pallakartheekreddy @aimansharief @maheshkumargangula
merge Release 5.6.0 into 5.7.0 (#983)
ac60bd2 
* Issue KN-10 fix: category cache issue fix

* Issue KN-10 fix: kafka version updated

* Merge Release 5.5.0 into Release-5.6.0 (#982)

* KN : CSP Changes

* KN : CSP Changes - Circle ci changes

* KN : CSP Changes - Circle ci changes

* Update HttpUrlUtilTest.java

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: removed console logs

* OCI changes: Added formaturl for content service (#979)

* OCI changes Added formaturl for content service

* ignore test case

* CircleCi issue fix

* CircleCi issue fix

* Update StorageServiceTest.scala

---------

Co-authored-by: Aiman Sharief <[email protected]>
Co-authored-by: Mahesh Kumar Gangula <[email protected]>

---------

Co-authored-by: Aiman Sharief <[email protected]>
Co-authored-by: Mahesh Kumar Gangula <[email protected]>
maheshkumargangula added a commit that referenced this pull request Sep 8, 2023
@pallakartheekreddy @vinukumar-vs
@AmiableAnil @gouravmore @maheshkumargangula @anilguptatarento @Jayaprakash8887 @krgauraw @surendrasinghs @aimansharief @shourya-solanki
Issue KN-000 merge: Merge Release 5.6.0 into Master (#984)
0fe1a8e 
* Issue #IQ-45 feat: CSP changes

* Issue #KN-585 feat: Single click local installation of knowledge platform

* Issue #KN-603 fix: CSP changes

* Issue #KN-603 fix: remove gcloud hard dependency

* Issue #KN-15 fix:Postman search-service API positive test cases -

* feat (doc): local setup using kubernetes.

Setup of DBs and Taxonomy-Service.

* Issue #KN-15 fix:Postman search-service API Negative test cases

* feat (doc): local setup using kubernetes.

* Issue #KN-439 feat: Handles domain agnostic for Neo4J.

* Issue #KN-439 feat: Handles domain agnostic for Neo4J.

* Issue #KN-439 feat: Handles domain agnostic for Neo4J.

* Issue #KN-439 test: Added the config for unit test.

* Issue #KN-439 feat: Fixed the replacement issue.

* Issue #KN-439 feat: Handles domain agnostic for Cassandra.

* Issue #KN-439 feat: Handles domain agnostic for Cassandra.

* Issue #KN-579 feat: Properties update

* Issue #KN-579 feat: Properties update

* Issue #KN-439 fix: Fixed update scenario where response is return with metadata without reading it again.

* Issue #KN-439 test: Fixed update scenario where response is return with metadata without reading it again.

* Issue #KN-439 merge: csp-migration to release-5.2.0 (#900)

* Issue #KN-439 fix: Fixed saveExternalRelativePath issue for ArrayList
* Issue #KN-439 feat: Added the variable for relative_path_prefix
Co-authored-by: anilgupta <[email protected]>
Co-authored-by: vinukumar-vs <[email protected]>

* Issue #KN-427 feat: Test case update

* Issue #KN-427 feat: Test case update

* Issue #KN-439 feat: Fixed ClassCast issue.

* Issue #KN-439 feat: Fixed the NullPointer issue

* Issue #IQ-193 fix: updated code for cname

* Issue #IQ-193 fix: updated code

* Issue #IQ-193 feat: added test cases

* Issue #KN-439 chore: added the migrationVersion in asset, content and collection schema.json

* Issue #KN-439 chore: Added the more fields in metadata list

* Issue #KN-667 fix:  Search-service: Search API - Part 2

* Issue #CO-173 debug: Adding debug statements

* Issue #CO-173 debug: Adding debug statements

* Issue #CO-173 debug: Adding debug statements

* Issue #CO-173 debug: Adding debug statements

* Issue #CO-173 fix: Schema validation fix

* Issue #CO-173 fix: Schema validation fix

* Issue #CO-173 fix: Schema validation fix

* Issue #KN- fix: relational metadata backward compatibility fix

* Issue #KN-730 fix: QR Code and QRRequired inconsistency debug

* Issue #KN-751 fix: Content and collection image publish issue

* Issue #KN-754 feat: Postman DOCS publishing.

* Issue #KN-754 fix: Sunbird License API collection name updated

* Issue KN-767 feat (doc): content service local setup using kubernetes

* Issue KN-767 feat (doc): content service local setup using kubernetes

* Issue KN-767 feat (doc): content service local setup using kubernetes

* Issue KN-767 fix: content service config map updated

* Corrected the typo in line 20

Refer to https://github.com/orgs/Sunbird-inQuiry/discussions/62

* feat : Updated scala version to 2.12

* Issue KN-767 feat: Added Terraform scripts and Helmcharts for one click installation

* Issue KN-767 feat: Removed the unused helmcharts

* Issue KN-767 feat: Updated Readme file .

* Issue KN-767 feat: Updated Readme file .

* Issue KN-767 feat: Removed Unused files .

* Issue KN-767 feat: Added gitignore.

* Issue KN-767 feat: Added Helm chart and terraform file for content-service and added few changes to taxonomy-service.

* Issue KN-767 feat: Added Helm chart and terraform file for search-service

* Issue KN-767 feat: Added Helm chart and terraform file for learning-service ,added configmaps and updated changes in the helmcharts.

* Issue KN-767 feat:Added changes in Neo4j to connect with logstash

* Delete terraform.tfstate

* Delete terraform.tfstate.backup

* Issue KN-767 feat:Added learning service terraform script

* Issue #KN-767 fix: knowlg one click installation for azure added

* Issue #KN-767 fix: dial services helm charts added

* Issue #KN-767 fix: Updated README.md  file

* Issue #KN-767 fix:Added Flink Helm Chart and Terraform script

* Issue #KN-767 fix: knowlg one click installation for flink jobs in azure added

* Revert "Merge branch 'Sunbird-Knowlg:master' into KN-848"

This reverts commit 9c7c619, reversing
changes made to 59e42ec.

* Delete schema.json

* Issue KN-848 fix: Removed the deprecated import and added the alternative

* Issue #KN-767 fix: search service config updated

* Issue #KN-10 feat: Added create framework API

* Issue #KN-10 fix: Updated youtubeurl

* Delete StorageService.scala

* Revert "Delete StorageService.scala"

This reverts commit f633e69.

* Updated Cloud-store-sdk version

* Update YouTubeUrlUtilTest.java

* Update YouTubeURLManagerImplTest.java

* Updated YoutubeUrls

* Issue #KN-10 feat: Added framework cache for read framework

* Issue #KN-10 feat: Updated create framework API

* Undo logger changes

* Update DataNode.scala

* Update DataNode , DefinitionNode

* Updated Youtube URLs

* Update schema

* Issue #KN-10 feat: Added update framework API

* Issue #KN-10 feat: retire framework API added

* Issue #KN-10 feat: Added copy framework API

* Issue #KN-10 fix: create framework API fixes

* Issue #KN-10 feat: Added update and retire framework APIs

* Issue #KN-10 feat: Added update and retire framework APIsIssue #KN-10 feat: Added Publish framework APIs

* Issue #KN-10 feat: framework publish and read API changes

* feat: refactoring jacoco version update

* Issue #KN-10 feat: category, categoryInstance and term APIs Added

* Issue #KN-848 fix: updated scala version and test dependencies

* Issue #KN-848 fix: updated jsonschemavalidator

* Issue #KN-848 fix: updated schema path

* Issue #KN-848 fix: updated schema path

* Issue #KN-848 fix: updated schema path

* Issue #KN-10 feat:Added TestCases for Master Category

* feat: handle in-relationship metadata to set the index

For FrameworkCategory create it uses in relation with Framework. This is not handled properly to set the index value... This commit has the required changes.

* Issue #KN-10 feat:Bug fix in Create Category API

* Issue #KN-10 feat:Added TestCases for CategoryInstance ,Framework Term

* Issue KN-10 fix: get node inRelations data issue fix

* KN-10 fix: index value populating in relation metadata

* Issue IQ-436 feat: code changes for question & questionset v2 api's

* Issue #IQ-436 fix: fixed HttpUrlUtilTest tests

* KN-10 fix: index value populating in relation metadata for term api

* Issue KN-10 fix: Validate translations and bug fix in category

* Issue #IQ-436 fix: updated code to handle NullPointerException

* Issue #IQ-436 fix: fixed build issue

* Issue #IQ-436 fix: fixed build issue

* Issue #KN-848 fix: updated test cases

* Issue #IQ-436 feat: added test cases

* Issue #IQ-436 fix: updated test cases

* Issue #IQ-436 fix: updated test case

* Issue KN-848 feat: taxonomy service migration to SBT.

* Issue #IQ436 feat: updated code for test

* Issue #KN-848 fix: updated test cases

* Issue KN-10 fix: Added Master Category Validation in Category Instance Create API

* Issue KN-10 fix: Added Test Cases

* Issue KN-10 fix: framework read initial commit

* Issue KN-10 fix: read and publish API changes

* Issue KN-10 fix: read framework hierarchy fix

* Issue KN-10 fix: Test Cases for Framework

* Issue KN-10 feat: category terms set in redis on publish

* Issue KN-10 fix: framework copy API changes

* Issue KN-10 fix: master category required schema properties added

* Issue KN-10 fix: Test Cases for Framework

* Issue KN-10 fix: category instance validation issue fix

* Issue #KN-848 fix: updated test cases

* Issue KN-10 fix: framework copy API validation issue fix

* Issue #KN-848 fix: updated application.conf

* Issue #KN-848 fix: updated application.conf and error message

* Issue KN-10 fix: removed commented code

* Issue #KN-848 fix: removed imports

* Issue KN-10 fix: removed println statements

* Issue #KN-848 fix: removed imports

* Issue #KN-848 fix: dummy commit

* Issue #KN-848 fix: test commit

* Issue #KN-848 fix:  updated test

* fix: added connection exception scenario.

* fix: remove Matchers trait from BaseSpec

* fix: upgrade plowermock

* Issue KN-10 fix: DataSubGraph moved to correct folder

* Issue KN-10 fix: test cases issue fixed

* Issue KN-10 test: unit testes added for read & publish apis

* Issue KN-10 fix: Jackson dependency exclusion

* Issue #KN-10 fix: relation index issue fix

* Issue #KN-10 fix: logs added

* Issue #KN-10 fix: index issue fix for categoryInstance

Currently, Framework getting from cache. While creating categoryInstance disabling the cache and getting node from DB

* Issue #KN-10 fix: disable Cache true & false conditions handled

* Issue #KN-10 fix: framework response sort issue fixed

* Issue KN-10 fix: copy framework cache issue fix

* Issue KN-10 fix: framework name issue fix

* Issue KN-10 fix: DIAL code reserve issue fix

* Issue KN-10 fix: DIAL code reserve issue fix

* Issue KN-10 fix: DIAL code reserve issue fix

* Issue KN-10 fix: category cache issue fix

* Issue KN-10 fix: kafka version updated

* Merge Release 5.5.0 into Release-5.6.0 (#982)

* KN : CSP Changes

* KN : CSP Changes - Circle ci changes

* KN : CSP Changes - Circle ci changes

* Update HttpUrlUtilTest.java

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: Jenkins Build changes

* Issue #KN-920 fix: removed console logs

* OCI changes: Added formaturl for content service (#979)

* OCI changes Added formaturl for content service

* ignore test case

* CircleCi issue fix

* CircleCi issue fix

* Update StorageServiceTest.scala

---------

Co-authored-by: Aiman Sharief <[email protected]>
Co-authored-by: Mahesh Kumar Gangula <[email protected]>

---------

Co-authored-by: vinukumar-vs <[email protected]>
Co-authored-by: Anil Gupta <[email protected]>
Co-authored-by: vinukumar-vs <[email protected]>
Co-authored-by: Gourav More <[email protected]>
Co-authored-by: Mahesh Kumar Gangula <[email protected]>
Co-authored-by: anilgupta <[email protected]>
Co-authored-by: Jayaprakash8887 <[email protected]>
Co-authored-by: Jayaprakash8887 <[email protected]>
Co-authored-by: Kumar Gauraw <[email protected]>
Co-authored-by: Surendrasingh Sucharia <[email protected]>
Co-authored-by: aimansharief <[email protected]>
Co-authored-by: Aiman Sharief <[email protected]>
Co-authored-by: shourya-solanki <[email protected]>
Co-authored-by: Mahesh Kumar Gangula <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maheshkumargangula maheshkumargangula maheshkumargangula approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pallakartheekreddy @maheshkumargangula @aimansharief