diff --git a/complete/build.gradle b/complete/build.gradle index 3781abc..c805c55 100644 --- a/complete/build.gradle +++ b/complete/build.gradle @@ -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" } } @@ -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" diff --git a/complete/gradle.properties b/complete/gradle.properties index 3cf2f5c..33e8590 100644 --- a/complete/gradle.properties +++ b/complete/gradle.properties @@ -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 diff --git a/complete/gradle/wrapper/gradle-wrapper.properties b/complete/gradle/wrapper/gradle-wrapper.properties index 549d844..ffed3a2 100644 --- a/complete/gradle/wrapper/gradle-wrapper.properties +++ b/complete/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/complete/grails-wrapper.jar b/complete/grails-wrapper.jar index bc85146..2cb6777 100644 Binary files a/complete/grails-wrapper.jar and b/complete/grails-wrapper.jar differ diff --git a/initial/build.gradle b/initial/build.gradle index 5cac0ee..7326cf7 100644 --- a/initial/build.gradle +++ b/initial/build.gradle @@ -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" } } @@ -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" diff --git a/initial/gradle.properties b/initial/gradle.properties index 3cf2f5c..33e8590 100644 --- a/initial/gradle.properties +++ b/initial/gradle.properties @@ -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 diff --git a/initial/grails-wrapper.jar b/initial/grails-wrapper.jar index bc85146..2cb6777 100644 Binary files a/initial/grails-wrapper.jar and b/initial/grails-wrapper.jar differ diff --git a/src/main/docs/guide/databaseConsole.adoc b/src/main/docs/guide/databaseConsole.adoc index b9be7c6..44791c4 100644 --- a/src/main/docs/guide/databaseConsole.adoc +++ b/src/main/docs/guide/databaseConsole.adoc @@ -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] diff --git a/src/main/docs/guide/grailsApplicationForge.adoc b/src/main/docs/guide/grailsApplicationForge.adoc index 7229e0d..428ed00 100644 --- a/src/main/docs/guide/grailsApplicationForge.adoc +++ b/src/main/docs/guide/grailsApplicationForge.adoc @@ -1 +1 @@ -include::{commondir}/common-grailsApplicationForge.adoc[] +include::{commondir}/common-grailsApplicationForge5.adoc[] diff --git a/src/main/docs/guide/installing.adoc b/src/main/docs/guide/installing.adoc index 56c243e..2a5dd85 100644 --- a/src/main/docs/guide/installing.adoc +++ b/src/main/docs/guide/installing.adoc @@ -1 +1 @@ -include::{commondir}/common-installingGrails.adoc[] +include::{commondir}/common-installingGrails5.adoc[] diff --git a/src/main/docs/guide/mysqlAsDatasource.adoc b/src/main/docs/guide/mysqlAsDatasource.adoc index eb3fe75..bf110b9 100644 --- a/src/main/docs/guide/mysqlAsDatasource.adoc +++ b/src/main/docs/guide/mysqlAsDatasource.adoc @@ -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