Skip to content

Commit

Permalink
Merge pull request #783 from jdaugherty/9.0.x
Browse files Browse the repository at this point in the history
Move views-json-templates from grails-views to gorm-mongodb
  • Loading branch information
jdaugherty authored Dec 21, 2024
2 parents c97a8c8 + cf9f740 commit d76913b
Show file tree
Hide file tree
Showing 50 changed files with 10,711 additions and 7 deletions.
14 changes: 8 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,9 @@ subprojects { Project subproject ->
apply plugin:"org.grails.plugins.views-json"
}

compileJava.options.release = 17

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
withJavadocJar()
withSourcesJar()
}
Expand Down Expand Up @@ -304,14 +303,17 @@ class PublishingConvention {
PublishingConvention(Project project) {
this.project = project

def name = project.name
String name = project.name
if(name.startsWith('grails') && name.endsWith('-plugin')) {
name = 'mongodb'
}
if(name.startsWith('rx') && name.endsWith('-plugin')) {
else if(name.startsWith('rx') && name.endsWith('-plugin')) {
name = 'rx-mongodb'
projectName = 'RxGORM for MongoDB'
}
}
else if(name == 'json-templates') {
projectName = 'JSON Views Templates'
}
projectArtifactId = name
}
}
Expand Down
50 changes: 50 additions & 0 deletions examples/gson-templates/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
plugins {
id 'application'
id 'groovy'
id 'org.grails.grails-gsp'
id 'org.grails.grails-web'
}

group = 'functional.tests'

dependencies {

implementation 'org.grails.plugins:views-json'
implementation 'org.grails.plugins:views-markup'

implementation 'org.grails:grails-core'
implementation 'org.grails:grails-logging'
implementation 'org.grails:grails-web-boot'

implementation 'org.grails:grails-plugin-databinding'
implementation 'org.grails:grails-plugin-i18n'
implementation 'org.grails:grails-plugin-interceptors'
implementation 'org.grails:grails-plugin-rest'
implementation 'org.grails:grails-plugin-services'
implementation 'org.grails:grails-plugin-url-mappings'
implementation 'org.grails:grails-plugin-validation'

implementation 'org.grails.plugins:gsp'
implementation 'org.grails.plugins:hibernate5'
implementation project(':grails-datastore-gorm-mongodb')

implementation 'org.springframework.boot:spring-boot-autoconfigure'
implementation 'org.springframework.boot:spring-boot-starter-logging'
implementation 'org.springframework.boot:spring-boot-starter-tomcat'

compileOnly 'jakarta.servlet:jakarta.servlet-api' // Provided by Tomcat

runtimeOnly project(':views-json-templates')
runtimeOnly 'com.h2database:h2'
runtimeOnly 'org.apache.tomcat:tomcat-jdbc'
runtimeOnly 'com.bertramlabs.plugins:asset-pipeline-grails'

testImplementation 'org.grails:views-json-testing-support'
testImplementation 'org.grails:grails-testing-support'

integrationTestImplementation 'com.fasterxml.jackson.core:jackson-databind'
integrationTestImplementation 'io.micronaut:micronaut-http-client:4.6.5'
integrationTestImplementation 'io.micronaut:micronaut-jackson-databind:4.6.5'
}

compileJava.options.release = 17
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// This is a manifest file that'll be compiled into application.js.
//
// Any JavaScript file within this directory can be referenced here using a relative path.
//
// You're free to add application-wide JavaScript to this file, but it's generally better
// to create separate JavaScript files as needed.
//
//= require jquery-2.1.3.js
//= require_tree .
//= require_self

if (typeof jQuery !== 'undefined') {
(function($) {
$('#spinner').ajaxStart(function() {
$(this).fadeIn();
}).ajaxStop(function() {
$(this).fadeOut();
});
})(jQuery);
}
Loading

0 comments on commit d76913b

Please sign in to comment.