Skip to content

Commit

Permalink
DocBook 5.2 OASIS Standard drafts and infrastructure updates
Browse files Browse the repository at this point in the history
  • Loading branch information
ndw committed Feb 15, 2024
1 parent 9e239f6 commit b98aa65
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ task docbook_javaConfig() {
jver = br.readLine()
}
}
def expect = "{'4.5', '5.0', '5.1', '5.2', '${dbver}'};".replace('\'', '"')
def expect = "{'4.5', '5.0', '5.1', '${dbver}'};".replace('\'', '"')
if (jver != expect) {
throw new GradleException("Check VERSIONS in DocBook.java; ${expect} != ${jver}")
}
Expand Down Expand Up @@ -646,14 +646,14 @@ task docbook_javadoc(type: Javadoc) {

task docbook_javadocJar(type: Jar, dependsOn: ["docbook_javadoc"]) {
archiveBaseName = "docbook-${dbver}"
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from docbook_javadoc.destinationDir
}
assemble.dependsOn docbook_javadocJar

task docbook_sourcesJar(type: Jar) {
archiveBaseName = "docbook-${dbver}"
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.docbook.allSource
}
assemble.dependsOn docbook_sourcesJar
Expand All @@ -673,9 +673,9 @@ task publishers_javaConfig() {
jver = br.readLine()
}
}
def expect = "{'1.0', '5.2', '${dbver}'};".replace('\'', '"')
def expect = "{'1.0', '${dbver}'};".replace('\'', '"')
if (jver != expect) {
throw new GradleException("Check VERSIONS in DocBook.java; ${expect} != ${jver}")
throw new GradleException("Check VERSIONS in Publishers.java; ${expect} != ${jver}")
}
}

Expand Down Expand Up @@ -746,14 +746,14 @@ task publishers_javadoc(type: Javadoc) {

task publishers_javadocJar(type: Jar, dependsOn: ["publishers_javadoc"]) {
archiveBaseName = "publishers-${dbver}"
classifier = 'javadoc'
archiveClassifier = 'javadoc'
from publishers_javadoc.destinationDir
}
assemble.dependsOn publishers_javadocJar

task publishers_sourcesJar(type: Jar) {
archiveBaseName = "publishers-${dbver}"
classifier = 'sources'
archiveClassifier = 'sources'
from sourceSets.publishers.allSource
}
assemble.dependsOn publishers_sourcesJar
Expand Down
14 changes: 5 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4096m -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.workers.max=3

systemProp.javax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl

saxonVersion = 11.5
resolverVersion = 4.6.4
dbver = 5.2CR5
saxonVersion = 12.4
resolverVersion = 5.2.3
dbver = 5.2
xslTNGversion = 1.11.1

oasisDocBookVersion=5.2
oasisDocBookRelease=csd01
oasisDocBookRelease=os

oasisPublishersVersion=5.2
oasisPublishersRelease=csd01
oasisPublishersRelease=os
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion src/docbook/java/org/docbook/schemas/docbook/DocBook.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// some tests to make sure the testing version is correct.

public final class DocBook {
public static final String[] VERSIONS = {"4.5", "5.0", "5.1", "5.2", "5.2CR5"};
public static final String[] VERSIONS = {"4.5", "5.0", "5.1", "5.2"};

public static final String DOCBOOK_CATALOG_PATH = "/org/docbook/schemas/docbook/catalog.xml";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// some tests to make sure the testing version is correct.

public final class Publishers {
public static final String[] VERSIONS = {"1.0", "5.2", "5.2CR5"};
public static final String[] VERSIONS = {"1.0", "5.2"};

public static final String PUBLISHERS_CATALOG_PATH = "/org/docbook/schemas/publishers/catalog.xml";

Expand Down

0 comments on commit b98aa65

Please sign in to comment.