Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions complete/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.3.4"
classpath "org.grails.plugins:hibernate5:7.1.0"
classpath "org.grails.plugins:hibernate5:7.2.2"
}
}

Expand Down Expand Up @@ -56,18 +56,18 @@ dependencies {
implementation "org.grails.plugins:scaffolding"
implementation "org.grails.plugins:events"
implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core:5.5.7.Final"
implementation "org.hibernate:hibernate-core:5.6.5.Final"
implementation "org.grails.plugins:gsp"
console "org.grails:grails-console"
profile "org.grails.profiles:web"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b05"
runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
runtimeOnly "com.bertramlabs.plugins:asset-pipeline-grails:3.3.4"
testImplementation "io.micronaut:micronaut-inject-groovy"
//uncomment to use MySQL
//runtimeOnly 'mysql:mysql-connector-java:5.1.40'
//runtimeOnly 'mysql:mysql-connector-java:8.0.28'
testImplementation "org.grails:grails-gorm-testing-support"
testImplementation "org.grails.plugins:geb"
testImplementation "org.grails:grails-web-testing-support"
Expand Down
7 changes: 4 additions & 3 deletions complete/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
grailsVersion=5.0.1
grailsGradlePluginVersion=5.0.0
gormVersion=7.1.0
grailsVersion=5.1.5
grailsGradlePluginVersion=5.1.3
gormVersion=7.2.1
groovyVersion=3.0.7
logback.version=1.2.7
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
2 changes: 1 addition & 1 deletion complete/gradle/wrapper/gradle-wrapper.properties
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-6.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file modified complete/grails-wrapper.jar
Binary file not shown.
6 changes: 3 additions & 3 deletions initial/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
dependencies {
classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:3.3.4"
classpath "org.grails.plugins:hibernate5:7.1.0"
classpath "org.grails.plugins:hibernate5:7.2.2"
}
}

Expand Down Expand Up @@ -55,11 +55,11 @@ dependencies {
implementation "org.grails.plugins:scaffolding"
implementation "org.grails.plugins:events"
implementation "org.grails.plugins:hibernate5"
implementation "org.hibernate:hibernate-core:5.5.7.Final"
implementation "org.hibernate:hibernate-core:5.6.5.Final"
implementation "org.grails.plugins:gsp"
console "org.grails:grails-console"
profile "org.grails.profiles:web"
runtimeOnly "org.glassfish.web:el-impl:2.1.2-b05"
runtimeOnly "org.glassfish.web:el-impl:2.2.1-b05"
runtimeOnly "com.h2database:h2"
runtimeOnly "org.apache.tomcat:tomcat-jdbc"
runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
Expand Down
7 changes: 4 additions & 3 deletions initial/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
grailsVersion=5.0.1
grailsGradlePluginVersion=5.0.0
gormVersion=7.1.0
grailsVersion=5.1.5
grailsGradlePluginVersion=5.1.3
gormVersion=7.2.1
groovyVersion=3.0.7
logback.version=1.2.7
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1024M
Binary file modified initial/grails-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/main/docs/guide/databaseConsole.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
If you run the app again, you should see the same page as before. However, you can login to the DB Console and view your new database table.

Browse to `http://localhost:8080/dbconsole` and login. The default username is `sa`, without a password. The default JDBC URL is: `jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE`
Browse to `http://localhost:8080/h2-console` and login. The default username is `sa`, without a password. The default JDBC URL is: `jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE`

image::dbconsole.png[DB Console]

Expand Down
2 changes: 1 addition & 1 deletion src/main/docs/guide/grailsApplicationForge.adoc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include::{commondir}/common-grailsApplicationForge.adoc[]
include::{commondir}/common-grailsApplicationForge5.adoc[]
2 changes: 1 addition & 1 deletion src/main/docs/guide/installing.adoc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include::{commondir}/common-installingGrails.adoc[]
include::{commondir}/common-installingGrails5.adoc[]
2 changes: 1 addition & 1 deletion src/main/docs/guide/mysqlAsDatasource.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Edit `build.gradle`
dependencies {
//...

runtime 'mysql:mysql-connector-java:5.1.40' <1>
runtime 'mysql:mysql-connector-java:8.0.28' <1>
----
<1> Add the MySQL JDBC driver as a dependency

Expand Down