You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by ja...@apache.org on 2026/08/28 15:18:25 UTC
(grails-core) branch merge/7.2.x-into-8.0.x created (now 5fe7bf95a9)
This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a change to branch merge/7.2.x-into-8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
at 5fe7bf95a9 Merge branch '7.2.x' into 8.0.x
This branch includes the following new commits:
new 5fe7bf95a9 Merge branch '7.2.x' into 8.0.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(grails-core) 01/01: Merge branch '7.2.x' into 8.0.x
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesfredley pushed a commit to branch merge/7.2.x-into-8.0.x
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 5fe7bf95a9fdf1b78a3db1051fe421dd9ac355e4
Merge: 057ffcd812 c29a028071
Author: James Fredley <ja...@users.noreply.github.com>
AuthorDate: Fri Aug 28 11:18:16 2026 -0400
Merge branch '7.2.x' into 8.0.x
.github/workflows/forge-deploy-aws.yml | 330 ++++++++++++++++++
gradle/rat-root-config.gradle | 1 +
grails-forge/README.md | 174 +---------
grails-forge/docs/aws-elastic-beanstalk.md | 210 ++++++++++++
.../grails/forge/api/GrailsForgeConfiguration.java | 3 +-
.../forge/api/ApplicationControllerSpec.groovy | 23 ++
.../aws/.platform/nginx/conf.d/proxy.conf | 19 ++
grails-forge/grails-forge-web-netty/aws/Procfile | 1 +
grails-forge/grails-forge-web-netty/aws/start.sh | 31 ++
grails-forge/grails-forge-web-netty/build.gradle | 32 ++
grails-forge/infrastructure/README.md | 96 ++++++
grails-forge/infrastructure/dns.yaml | 146 ++++++++
grails-forge/infrastructure/environment.yaml | 291 ++++++++++++++++
grails-forge/infrastructure/shared.yaml | 376 +++++++++++++++++++++
14 files changed, 1563 insertions(+), 170 deletions(-)
diff --cc gradle/rat-root-config.gradle
index 1fc0ef6d40,377235a351..7a63cbd755
--- a/gradle/rat-root-config.gradle
+++ b/gradle/rat-root-config.gradle
@@@ -83,48 -69,7 +83,49 @@@ tasks.named('rat')
'grails-common/src/main/groovy/org/apache/grails/common/compiler/asm/ClassReader.java', // See license file, BSD licensed
'grails-common/src/main/groovy/org/apache/grails/common/compiler/asm/Context.java', // See license file, BSD licensed
'grails-common/src/main/groovy/org/apache/grails/common/compiler/asm/TypePath.java', // See license file, BSD licensed
+ // Forked from liquibase-hibernate v4.27.0, Apache 2.0 licensed third-party code - see META-INF/NOTICE
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/customfactory/CustomMetadataFactory.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/HibernateClassicDatabase.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/HibernateDatabase.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/HibernateEjb3Database.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/HibernateGenericDialect.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/HibernateSpringBeanDatabase.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/HibernateSpringPackageDatabase.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/JpaPersistenceDatabase.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/connection/HibernateConnection.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/connection/HibernateConnectionMetadata.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/connection/HibernateDriver.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/extension/ExtendedSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/extension/TableGeneratorSnapshotGenerator.java',
+ // Renamed/derivative third-party files (originally from liquibase-hibernate v4.27.0)
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/NoOpConnectionProvider.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/database/NoOpMultiTenantConnectionProvider.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedColumnChangeGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedForeignKeyChangeGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/diff/HibernateChangedPrimaryKeyChangeGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/diff/HibernateMissingSequenceChangeGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/diff/HibernateUnexpectedIndexChangeGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateCatalogSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateForeignKeySnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateIndexSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernatePrimaryKeySnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSchemaSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateSequenceSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateTableSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateUniqueConstraintSnapshotGenerator.java',
+ 'grails-data-hibernate7/dbmigration-core/src/main/java/liquibase/ext/hibernate/snapshot/HibernateViewSnapshotGenerator.java',
+ // Third-party test fixtures from liquibase-hibernate v4.27.0
+ 'grails-data-hibernate7/dbmigration-core/src/testFixtures/java/com/example/customconfig/**',
+ 'grails-data-hibernate7/dbmigration-core/src/testFixtures/java/com/example/ejb3/**',
+ 'grails-data-hibernate7/dbmigration-core/src/testFixtures/java/com/example/pojo/**',
+ 'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/ext/hibernate/HibernateIntegrationTest.java',
+ 'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/ext/hibernate/SpringPackageScanningIntegrationTest.java',
+ 'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/ext/hibernate/database/**',
+ 'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/ext/hibernate/snapshot/HibernateColumnSnapshotGeneratorTest.java',
+ 'grails-data-hibernate7/dbmigration-core/src/test/java/liquibase/harness/**',
+ 'grails-forge/grails-forge-web-netty/aws/Procfile', // Elastic Beanstalk Procfile cannot contain comments
'grails-forge/**/src/main/resources/**', // src/main/resources are included in generated application and should not include a license
'grails-forge/**/src/test/resources/**', // src/test/resources are used in tests against files included in generated application and should not include a license
'grails-gradle/**/build/**', // grails-gradle does not have a build package name so exclude any build directories
diff --cc grails-forge/grails-forge-web-netty/build.gradle
index e752ed0c4e,f9d99bdadb..cc484cf356
--- a/grails-forge/grails-forge-web-netty/build.gradle
+++ b/grails-forge/grails-forge-web-netty/build.gradle
@@@ -121,5 -73,34 +123,35 @@@ tasks.named('dockerBuild')
images = [findProperty('dockerImageName') ?: 'grailsforge']
}
+ TaskProvider<ShadowJar> shadowJarTask = tasks.named('shadowJar', ShadowJar)
+ shadowJarTask.configure {
+ reproducibleFileOrder = true
+ preserveFileTimestamps = false
+ }
+
+ TaskProvider<Zip> awsElasticBeanstalk = tasks.register('awsElasticBeanstalk', Zip) {
+ dependsOn(shadowJarTask)
+ archiveFileName.set('grails-forge-web-netty-aws.zip')
+ destinationDirectory.set(layout.buildDirectory.dir('distributions'))
+ reproducibleFileOrder = true
+ preserveFileTimestamps = false
+
+ from(shadowJarTask.flatMap { it.archiveFile }) {
+ rename { 'app.jar' }
+ }
+ from(layout.projectDirectory.dir('aws')) {
+ includeEmptyDirs = false
+ filesMatching('start.sh') {
+ filePermissions {
+ unix(0755)
+ }
+ }
+ }
+ }
+
+ tasks.named('assemble') {
+ dependsOn(awsElasticBeanstalk)
+ }
+
+apply from: rootProject.layout.projectDirectory.file('gradle/groovy-version-pin.gradle')
apply from: rootProject.layout.projectDirectory.file('gradle/code-style-config.gradle')