Skip to content

Commit f6d9304

Browse files
authored
Merge pull request #14940 from jdaugherty/7.0.x
remove: pdf publishing due to licensing issues & no longer using inside of Grails documentation
2 parents 022f1b7 + e194e5c commit f6d9304

File tree

322 files changed

+0
-317167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+0
-317167
lines changed

dependencies.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ ext {
2929
'byte-buddy.version' : '1.17.6',
3030
'commons-text.version' : '1.13.1',
3131
'directory-watcher.version' : '0.19.1',
32-
'flying-saucer-pdf-openpdf.version' : '9.4.0',
3332
'gradle-nexus-publish-plugin.version': '2.0.0',
3433
'gradle-spock.version' : '2.3-groovy-3.0',
3534
'grails-gdoc-engine.version' : '1.0.1',
@@ -38,7 +37,6 @@ ext {
3837
'jline.version' : '2.14.6',
3938
'jna.version' : '5.17.0',
4039
'jquery.version' : '3.7.1',
41-
'jsoup.version' : '1.21.1',
4240
'objenesis.version' : '3.4',
4341
'gradle-spock.version' : '2.3-groovy-3.0',
4442
'gradle-nexus-publish-plugin.version': '2.0.0',
@@ -62,14 +60,12 @@ ext {
6260
'byte-buddy' : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
6361
'commons-text' : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
6462
'directory-watcher' : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
65-
'flying-saucer-pdf-openpdf' : "org.xhtmlrenderer:flying-saucer-pdf-openpdf:${gradleBomDependencyVersions['flying-saucer-pdf-openpdf.version']}",
6663
'gradle-nexus-publish-plugin': "io.github.gradle-nexus:publish-plugin:${gradleBomDependencyVersions['gradle-nexus-publish-plugin.version']}",
6764
'grails-gdoc-engine' : "org.grails:grails-gdoc-engine:${gradleBomDependencyVersions['grails-gdoc-engine.version']}",
6865
'jansi' : "org.fusesource.jansi:jansi:${gradleBomDependencyVersions['jansi.version']}",
6966
'javaparser-core' : "com.github.javaparser:javaparser-core:${gradleBomDependencyVersions['javaparser-core.version']}",
7067
'jline' : "jline:jline:${gradleBomDependencyVersions['jline.version']}",
7168
'jna' : "net.java.dev.jna:jna:${gradleBomDependencyVersions['jna.version']}",
72-
'jsoup' : "org.jsoup:jsoup:${gradleBomDependencyVersions['jsoup.version']}",
7369
'objenesis' : "org.objenesis:objenesis:${gradleBomDependencyVersions['objenesis.version']}",
7470
'spring-boot-cli' : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
7571
'spring-boot-gradle' : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",

grails-doc/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ combinedGroovydoc.configure { Groovydoc gdoc ->
9797
gdoc.outputs.dir(gdoc.destinationDir)
9898
}
9999

100-
// use jsoup in PdfBuilder for cleaning input html
101-
System.setProperty('grails.docs.clean.html', 'true')
102-
// creates single.html.before.xml and single.html.after.xml files for debugging pdf input when enabled
103-
//System.setProperty('grails.docs.debug.pdf','true')
104-
105100
String getVersion(String artifact) {
106101
String version = configurations.runtimeClasspath
107102
.resolvedConfiguration

grails-gradle/docs-core/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,9 @@ dependencies {
4848
api 'org.yaml:snakeyaml'
4949

5050
api 'org.asciidoctor:asciidoctorj'
51-
implementation 'org.xhtmlrenderer:flying-saucer-pdf-openpdf'
5251
implementation 'org.springframework.boot:spring-boot-gradle-plugin'
5352

5453
runtimeOnly 'org.slf4j:slf4j-api'
55-
56-
api 'org.jsoup:jsoup'
5754
testImplementation('org.spockframework:spock-core') {
5855
transitive = false
5956
}

grails-gradle/docs-core/src/main/groovy/grails/doc/PdfBuilder.groovy

Lines changed: 0 additions & 165 deletions
This file was deleted.

grails-gradle/docs-core/src/main/groovy/grails/doc/PdfPublisher.groovy

Lines changed: 0 additions & 35 deletions
This file was deleted.

grails-gradle/docs-core/src/main/groovy/grails/doc/gradle/PublishPdf.groovy

Lines changed: 0 additions & 76 deletions
This file was deleted.

grails-gradle/docs-core/src/test/groovy/grails/doc/PdfBuilderSpec.groovy

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)