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

Update dependencies #38

Merged
merged 3 commits into from
Jan 14, 2025
Merged

Update dependencies #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5799911
Update dependencies
Gavrilov-Ivan Dec 26, 2024
bfcce35
Update gradle
Gavrilov-Ivan Jan 14, 2025
09d0cab
Update app-component.xml
Gavrilov-Ivan Jan 14, 2025
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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ dependencies {

}

def hsql = 'org.hsqldb:hsqldb:2.4.1'
def hsql = 'org.hsqldb:hsqldb:2.5.2'

configure([globalModule, coreModule, webModule]) {
apply(plugin: 'java')
Expand All @@ -119,7 +119,7 @@ configure([globalModule, coreModule, webModule]) {
}

dependencies {
compile('org.jsoup:jsoup:1.11.3')
compile('org.jsoup:jsoup:1.18.2')
testCompile('junit:junit:4.12')
testCompile('org.spockframework:spock-core:1.1-groovy-2.4')
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion modules/global/src/com/haulmont/addon/emailtemplates/app-component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<app-component xmlns="http://schemas.haulmont.com/cuba/app-component.xsd"
dependsOn="com.haulmont.reports, com.haulmont.addon.grapesjs">
dependsOn="com.haulmont.reports, com.haulmont.cuba, com.haulmont.addon.grapesjs">
<module blocks="*"
name="global">
<artifact appJar="true"
Expand Down