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

vunerability upgrade PR #917

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+180 −22
Open

vunerability upgrade PR #917

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
05b6b99
did vunerability upgrade
junaidwarsivd Nov 2, 2022
53d84fe
Merge branch 'master' into vunerability-upgrades
dubdabasoduba Nov 4, 2022
8a918da
Merge branch 'master' into vunerability-upgrades
dubdabasoduba Nov 4, 2022
2487a63
jeasy rules updated
junaidwarsivd Nov 8, 2022
f137da7
Merge branch 'vunerability-upgrades' of https://github.com/opensrp/op…
junaidwarsivd Nov 11, 2022
787a4ae
Fix MVEL rules not working with jeasy-mvel 4.1.0
ekigamba Nov 22, 2022
bf1c172
uptadated the facts population in rulesEnginehelper
junaidwarsivd Dec 23, 2022
1ed864a
fixed the AncRulesEngineFactory and AncRulesEngineHelper for the not …
junaidwarsivd Dec 28, 2022
5c0a8c7
fixed the AncRulesEngineFactory and AncRulesEngineHelper for the not …
junaidwarsivd Dec 28, 2022
0e3bc05
updated the vunerability changes
junaidwarsivd Jan 6, 2023
4518bad
removed dependencies that were already included in native forms
junaidwarsivd Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions opensrp-anc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,13 @@ dependencies {
exclude group: 'com.android.support', module: 'cardview-v7'
exclude group: 'com.android.support', module: 'support-v4'
}
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
implementation 'junit:junit:4.12'
implementation 'androidx.test:core:1.4.0'
annotationProcessor 'com.jakewharton:butterknife:10.2.3'
implementation 'net.zetetic:android-database-sqlcipher:4.4.0@aar'
implementation 'commons-validator:commons-validator:1.7'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'org.greenrobot:eventbus:3.2.0'
annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.2.0'
implementation 'com.google.guava:guava:30.0-jre'
Expand All @@ -251,11 +251,11 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.27'
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.31'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'org.jeasy:easy-rules-core:3.3.0'
implementation 'org.jeasy:easy-rules-mvel:3.3.0'
implementation("com.itextpdf:itext7-core:7.1.12")
implementation 'org.jeasy:easy-rules-core:3.4.0'
implementation 'org.jeasy:easy-rules-mvel:3.4.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bonfaceshisakha pointed out that this needs to be version 4.0.0

implementation("com.itextpdf:itext7-core:7.2.4")
implementation 'org.jacoco:org.jacoco.agent:0.7.9:runtime'
testImplementation 'org.jacoco:org.jacoco.agent:0.7.9:runtime'
implementation 'com.android.volley:volley:1.2.1'
Expand Down
4 changes: 2 additions & 2 deletions opensrp-anc/src/main/java/org/smartregister/anc/library/util/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import com.itextpdf.kernel.pdf.PdfWriter;
import com.itextpdf.layout.Document;
import com.itextpdf.layout.element.Paragraph;
import com.itextpdf.layout.property.HorizontalAlignment;
import com.itextpdf.layout.property.TextAlignment;
import com.itextpdf.layout.properties.HorizontalAlignment;
import com.itextpdf.layout.properties.TextAlignment;
import com.vijay.jsonwizard.activities.JsonFormActivity;
import com.vijay.jsonwizard.constants.JsonFormConstants;
import com.vijay.jsonwizard.rules.RuleConstant;
Expand Down
12 changes: 6 additions & 6 deletions reference-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jacoco {
// This variables are used by the version code & name generators
ext.versionMajor = 1
ext.versionMinor = 6
ext.versionPatch = 15
ext.versionPatch = 16
ext.versionClassifier = null
ext.isSnapshot = false
ext.minimumSdkVersion = androidMinSdkVersion
Expand Down Expand Up @@ -281,11 +281,11 @@ dependencies {
exclude group: 'com.android.support', module: 'cardview-v7'
exclude group: 'com.android.support', module: 'support-v4'
}
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.9'
implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
annotationProcessor 'com.jakewharton:butterknife:10.2.3'
implementation 'net.zetetic:android-database-sqlcipher:4.4.0@aar'
implementation 'commons-validator:commons-validator:1.7'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'org.greenrobot:eventbus:3.2.0'
annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.2.0'
implementation 'com.google.guava:guava:30.0-jre'
Expand All @@ -301,10 +301,10 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.27'
implementation group: 'org.yaml', name: 'snakeyaml', version: '1.31'
implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'org.jeasy:easy-rules-core:3.3.0'
implementation 'org.jeasy:easy-rules-mvel:3.3.0'
implementation 'org.jeasy:easy-rules-core:3.4.0'
implementation 'org.jeasy:easy-rules-mvel:3.4.0'
implementation 'com.flurry.android:analytics:11.6.0@aar'
implementation 'com.flurry.android:analytics:11.6.0@aar'
implementation 'androidx.multidex:multidex:2.0.1'
Expand Down