Skip to content
GitLab
Commit 7863ba98 authored by sreeragksgh's avatar sreeragksgh
Browse files

merge changes

parent 3ef4b4c5
release-5.1.0-student-login-endpoint dependabot/maven/actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-notification/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/org.jboss.resteasy-resteasy-client-4.5.7.Final dependabot/maven/controller/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/actor-core/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/cassandra-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/notification-utils/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/notification-utils/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/core/platform-common/com.fasterxml.jackson.core-jackson-databind-2.12.7.1 dependabot/maven/core/platform-common/org.apache.kafka-kafka-clients-0.10.2.2 dependabot/maven/core/platform-common/org.jboss.resteasy-resteasy-client-3.14.0.Final dependabot/maven/core/sunbird-notification/com.fasterxml.jackson.core-jackson-databind-2.9.10.7 dependabot/maven/core/sunbird-notification/org.apache.httpcomponents-httpclient-4.5.13 dependabot/maven/junit-junit-4.13.1 helmchart master patch-1 patch-2 release-4.0.0 release-4.1.0 release-4.10.0 release-4.10.1 release-4.2.0 release-4.3.0 release-4.4.0 release-4.4.1 release-4.5.0 release-4.6.0 release-4.7.0 release-4.9.0 release-5.0.0 release-5.0.1 release-5.0.2 release-5.1.0 release-5.0.1_RC1 release-5.0.0_RC5 release-5.0.0_RC4 release-5.0.0_RC3 release-5.0.0_RC2 release-5.0.0_RC1 release-4.10.1_RC1 release-4.10.0_RC5 release-4.10.0_RC4 release-4.10.0_RC3 release-4.10.0_RC2 release-4.10.0_RC1 release-4.9.0_RC3 release-4.9.0_RC2 release-4.9.0_RC1 release-4.7.0_RC11 release-4.7.0_RC10 release-4.7.0_RC9 release-4.7.0_RC8 release-4.7.0_RC7 release-4.7.0_RC6 release-4.7.0_RC5 release-4.7.0_RC4 release-4.7.0_RC3 release-4.7.0_RC2 release-4.7.0_RC1 release-4.6.0_RC9 release-4.6.0_RC8 release-4.6.0_RC7 release-4.6.0_RC6 release-4.6.0_RC5 release-4.6.0_RC4 release-4.6.0_RC3 release-4.6.0_RC2 release-4.6.0_RC1 release-4.5.0_RC14 release-4.5.0_RC13 release-4.5.0_RC12 release-4.5.0_RC11 release-4.5.0_RC10 release-4.5.0_RC9 release-4.5.0_RC8 release-4.5.0_RC7 release-4.5.0_RC6 release-4.5.0_RC5 release-4.5.0_RC4 release-4.5.0_RC3 release-4.5.0_RC2 release-4.5.0_RC1 release-4.4.1_RC1 release-4.4.0_RC15 release-4.4.0_RC14 release-4.4.0_RC13 release-4.4.0_RC12 release-4.4.0_RC11 release-4.4.0_RC10 release-4.4.0_RC9 release-4.4.0_RC8 release-4.4.0_RC7 release-4.4.0_RC6 release-4.4.0_RC5 release-4.4.0_RC4 release-4.4.0_RC3 release-4.4.0_RC2 release-4.4.0_RC1 release-4.3.0_RC16 release-4.3.0_RC15 release-4.3.0_RC14 release-4.3.0_RC13 release-4.3.0_RC12 release-4.3.0_RC11 release-4.3.0_RC10 release-4.3.0_RC9 release-4.3.0_RC8 release-4.3.0_RC7 release-4.3.0_RC6 release-4.3.0_RC5 release-4.3.0_RC4 release-4.3.0_RC3 release-4.3.0_RC2 release-4.3.0_RC1 release-4.2.0_RC13 release-4.2.0_RC12 release-4.2.0_RC11 release-4.2.0_RC10 release-4.2.0_RC9 release-4.2.0_RC8 release-4.2.0_RC7 release-4.2.0_RC6 release-4.2.0_RC5 release-4.2.0_RC4 release-4.2.0_RC3 release-4.2.0_RC2 release-4.2.0_RC1 release-4.1.0_RC16 release-4.1.0_RC15 release-4.1.0_RC14 release-4.1.0_RC13 release-4.1.0_RC12 release-4.1.0_RC11 release-4.1.0_RC10 release-4.1.0_RC9 release-4.1.0_RC8 release-4.1.0_RC7 release-4.1.0_RC6 release-4.1.0_RC5 release-4.1.0_RC4 release-4.1.0_RC3 release-4.1.0_RC2 release-4.1.0_RC1 release-4.0.0_RC18 release-4.0.0_RC17 release-4.0.0_RC16 release-4.0.0_RC15 release-4.0.0_RC14 release-4.0.0_RC13 release-4.0.0_RC12 release-4.0.0_RC11 release-4.0.0_RC10 release-4.0.0_RC9 release-4.0.0_RC8 release-4.0.0_RC7 release-4.0.0_RC6 release-4.0.0_RC5 release-4.0.0_RC4 release-4.0.0_RC3 release-4.0.0_RC2 release-4.0.0_RC1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 2 deletions
+0 -2
actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java
+ 0
− 2
View file @ 7863ba98
......@@ -76,7 +76,6 @@ public final class JsonKey {
public static final String DATE_HISTOGRAM = "DATE_HISTOGRAM";
public static final String DEFAULT_CONSUMER_ID = "internal";
public static final String DEFAULT_ROOT_ORG_ID = "ORG_001";
public static final String ASSOCIATION_TYPE = "associationType";
public static final String SSO = "sso";
public static final String SELF_DECLARATION = "self_Declaration";
public static final String SYSTEM_UPLOAD = "system_Upload";
......@@ -138,7 +137,6 @@ public final class JsonKey {
public static final String INFO = "info";
public static final String INSERT = "insert";
public static final String IS_APPROVED = "isApproved";
public static final String IS_SSO = "isSSO";
public static final String IS_SELF_DECLARATION = "isSelfDeclaration";
public static final String IS_SYSTEM_UPLOAD = "isSystemUpload";
public static final String IS_AUTH_REQ = "isAuthReq";
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment