-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/gh-actions
- Loading branch information
Showing
33 changed files
with
401 additions
and
278 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| name: Java CI | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - upgrade/grails4 | ||
| pull_request: | ||
| branches: | ||
| - master | ||
| - upgrade/grails4 | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: read # to fetch code (actions/checkout) | ||
|
|
||
| jobs: | ||
| build: | ||
| permissions: | ||
| contents: read # to fetch code (actions/checkout) | ||
| checks: write # to publish result as PR check (scacap/action-surefire-report) | ||
|
|
||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| java: ['8'] | ||
| env: | ||
| WORKSPACE: ${{ github.workspace }} | ||
| GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8 | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - name: Set up JDK | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'adopt' | ||
| java-version: ${{ matrix.java }} | ||
| - name: Run Tests | ||
| if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' | ||
| id: tests | ||
| uses: gradle/gradle-build-action@v2 | ||
| with: | ||
| arguments: check | ||
| - name: Run Build | ||
| if: github.event_name == 'push' | ||
| id: build | ||
| uses: gradle/gradle-build-action@v2 | ||
| with: | ||
| arguments: build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,178 @@ | ||
| buildscript { | ||
| repositories { | ||
| mavenLocal() | ||
| maven { url "https://repo.grails.org/grails/core" } | ||
| } | ||
| dependencies { | ||
| classpath "org.grails:grails-gradle-plugin:$grailsVersion" | ||
| classpath 'io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1' | ||
| } | ||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| maven { url "https://repo.grails.org/grails/core" } | ||
| } | ||
| dependencies { | ||
| classpath "org.grails:grails-gradle-plugin:$grailsVersion" | ||
| classpath 'io.github.groovylang.groovydoc:groovydoc-gradle-plugin:1.0.1' | ||
| classpath "io.github.gradle-nexus:publish-plugin:1.1.0" | ||
| } | ||
| } | ||
| plugins { | ||
| id 'org.asciidoctor.jvm.convert' version '3.2.0' | ||
| } | ||
|
|
||
| version project.projectVersion | ||
| group "org.grails.plugins" | ||
|
|
||
| apply plugin:"eclipse" | ||
| apply plugin:"idea" | ||
| apply plugin: "org.grails.grails-plugin" | ||
| apply plugin: "org.grails.grails-gsp" | ||
| apply plugin: "org.grails.grails-plugin-publish" | ||
|
|
||
| ext { | ||
| commonBuild = 'https://raw.githubusercontent.com/grails/grails-common-build/1549696f8d1a6bce3d84db9c4c1bfde61eddf175' | ||
| group 'org.grails.plugins' | ||
|
|
||
| } | ||
| apply plugin: 'org.grails.grails-plugin' | ||
| apply plugin: 'org.grails.grails-gsp' | ||
| apply plugin: "org.grails.grails-doc" | ||
| apply plugin: 'maven-publish' | ||
| apply plugin: 'signing' | ||
| apply plugin: "io.github.gradle-nexus.publish-plugin" | ||
|
|
||
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
|
|
||
| repositories { | ||
| mavenLocal() | ||
| mavenCentral() | ||
| maven { url "https://repo.grails.org/grails/core" } | ||
| mavenLocal() | ||
| mavenCentral() | ||
| maven { url "https://repo.grails.org/grails/core" } | ||
| } | ||
|
|
||
| dependencies { | ||
| provided 'org.springframework.boot:spring-boot-starter-logging' | ||
| provided "org.springframework.boot:spring-boot-starter-actuator" | ||
| provided "org.springframework.boot:spring-boot-autoconfigure" | ||
| provided "org.springframework.boot:spring-boot-starter-tomcat" | ||
| provided 'org.springframework.boot:spring-boot-starter-logging' | ||
| provided "org.springframework.boot:spring-boot-starter-actuator" | ||
| provided "org.springframework.boot:spring-boot-autoconfigure" | ||
| provided "org.springframework.boot:spring-boot-starter-tomcat" | ||
|
|
||
| provided "org.grails:grails-web-boot" | ||
| provided "org.grails:grails-web-boot" | ||
| provided "org.grails:grails-dependencies" | ||
| provided "javax.servlet:javax.servlet-api:$servletApiVersion" | ||
|
|
||
| compile "org.grails:scaffolding-core:$scaffoldingVersion" | ||
|
|
||
| testCompile "org.grails:grails-web-testing-support:2.0.0.RC1" | ||
| testCompile "org.grails:grails-gorm-testing-support:2.0.0.RC1" | ||
| compile "org.grails:scaffolding-core" | ||
|
|
||
| testCompile "org.grails:grails-web-testing-support" | ||
| testCompile "org.grails:grails-gorm-testing-support" | ||
|
|
||
| console "org.grails:grails-console" | ||
|
|
||
| testCompile 'org.javassist:javassist:3.29.0-GA' | ||
| testCompile "org.codehaus.groovy:groovy-dateutil" | ||
| testCompile "cglib:cglib-nodep:2.2.2" | ||
| testCompile("org.jodd:jodd-wot:$joddWotVersion") { | ||
| exclude module: 'slf4j-api' | ||
| exclude module: 'asm' | ||
| } | ||
| } | ||
|
|
||
| tasks.withType(GroovyCompile) { | ||
| configure(groovyOptions) { | ||
| forkOptions.jvmArgs = ['-Xmx1024m'] | ||
| } | ||
| } | ||
|
|
||
| console "org.grails:grails-console" | ||
| publishing { | ||
| publications { | ||
| maven(MavenPublication) { | ||
| groupId = project.group | ||
| artifactId = 'jms' | ||
| version = project.version | ||
|
|
||
| testCompile 'javassist:javassist:3.12.0.GA' | ||
| testCompile "org.codehaus.groovy:groovy-dateutil:$groovyVersion" | ||
| testCompile "cglib:cglib-nodep:$cglibNodepVersion" | ||
| testCompile("org.jodd:jodd-wot:$joddWotVersion") { | ||
| exclude module: 'slf4j-api' | ||
| exclude module: 'asm' | ||
| } | ||
| from components.java | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
|
|
||
| pom { | ||
| name = 'Jms' | ||
| description = 'JMS integration for Grails' | ||
| url = 'https://github.com/gpc/jms' | ||
| licenses { | ||
| license { | ||
| name = 'The Apache License, Version 2.0' | ||
| url = 'https://www.apache.org/licenses/LICENSE-2.0.txt' | ||
| } | ||
| } | ||
| developers { | ||
| developer { | ||
| id = 'brownj' | ||
| name = 'Jeff Scott Brown' | ||
| email = 'brownj@objectcomputing.com' | ||
| } | ||
| developer { | ||
| id = 'sbglasius' | ||
| name = 'Søren Berg Glasius' | ||
| email = 'soeren+gpc@glasius.dk' | ||
| } | ||
| } | ||
| scm { | ||
| connection = 'scm:git:git://github.com/gpc/jms.git' | ||
| developerConnection = 'scm:git:https://github.com/gpc/jms.git' | ||
| url = 'https://github.com/gpc/jms' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| grailsPublish { | ||
| userOrg = "grails" | ||
| githubSlug = project.githubSlug | ||
| license { | ||
| name = 'Apache-2.0' | ||
| } | ||
| title = project.title | ||
| desc = project.projectDesc | ||
|
|
||
| developers = [ | ||
| graemerocher: "Graeme Rocher", | ||
| robfletcher: "Rob Fletcher", | ||
| sbglasius: "Søren Berg Glasius" | ||
| ] | ||
| ext."signing.keyId" = project.findProperty('signing.keyId') ?: System.getenv('SIGNING_KEY_ID') | ||
| ext."signing.password" = project.findProperty('signing.password') ?: System.getenv('SIGNING_PASSPHRASE') | ||
| ext."signing.secretKeyRingFile" = project.findProperty('signing.secretKeyRingFile') ?: (System.getenv('SIGNING_PASSPHRASE') ?: "${System.getProperty('user.home')}/.gnupg/secring.gpg") | ||
|
|
||
| ext.isReleaseVersion = !version.endsWith("SNAPSHOT") | ||
|
|
||
| afterEvaluate { | ||
| signing { | ||
| required { isReleaseVersion } | ||
| sign publishing.publications.maven | ||
| } | ||
| } | ||
|
|
||
| apply from: "${commonBuild}/common-docs.gradle" | ||
| tasks.withType(Sign) { | ||
| onlyIf { isReleaseVersion } | ||
| } | ||
|
|
||
| nexusPublishing { | ||
| repositories { | ||
| sonatype { | ||
| def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.findProperty('sonatypeOss2Username') ?: '' | ||
| def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.findProperty("sonatypeOss2Password") ?: '' | ||
| def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.findProperty("sonatypeOssStagingProfileIdJms") ?: '' | ||
|
|
||
| nexusUrl = uri("https://s01.oss.sonatype.org/service/local/") | ||
| snapshotRepositoryUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") | ||
| username = ossUser | ||
| password = ossPass | ||
| stagingProfileId = ossStagingProfileId | ||
| } | ||
| } | ||
| } | ||
|
|
||
| asciidoctor { | ||
| resources { | ||
| from('src/docs/images') | ||
| into "./images" | ||
| } | ||
| sources { | ||
| include 'index.adoc' | ||
| } | ||
| attributes 'experimental': 'true', | ||
| 'compat-mode': 'true', | ||
| 'toc': 'left', | ||
| 'icons': 'font', | ||
| 'version': project.version, | ||
| 'sourcedir': 'src/main/groovy' | ||
| baseDirFollowsSourceDir() | ||
| outputDir = "${buildDir}/asciidoc" | ||
| } | ||
|
|
||
| task apiDocs(type: Copy) { | ||
| from groovydoc.outputs.files | ||
| into file("${buildDir}/asciidoc/api") | ||
| } | ||
|
|
||
| asciidoctor.dependsOn(apiDocs) | ||
|
|
||
| task snapshotVersion { | ||
| doLast { | ||
| if (!project.version.endsWith('-SNAPSHOT')) { | ||
| ant.propertyfile(file: "gradle.properties") { | ||
| entry(key: "version", value: "${project.version}-SNAPSHOT") | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
src/main/docs/guide/index.adoc → src/docs/asciidoc/index.adoc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.