Bump versions

ndw · Apr 15, 2023 · c80540c · c80540c
1 parent 9cab6e5
commit c80540c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -64,17 +64,17 @@ dependencies {
   implementation (
     [group: 'org.jetbrains', name: 'annotations', version: '18.0.0'],
     [group: 'com.nwalsh', name: 'nwalsh-annotations', version: '1.0.0'],
-    [group: 'org.relaxng', name: 'jing', version: '20181222' ],
+    [group: 'org.relaxng', name: 'jing', version: '20220510' ],
     [group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'],
     [group: 'junit', name: 'junit', version: '4.13.2'],
     [group: 'net.java.dev.msv', name: 'msv-core', version: '2013.6.1'],
     [group: saxonGroup, name: saxonName, version: saxonVersion ],
-    [group: 'com.ibm.icu', name: 'icu4j', version: '49.1'],
+    [group: 'com.ibm.icu', name: 'icu4j', version: '72.1'],
     [group: 'nu.validator.htmlparser', name: 'htmlparser', version: '1.4'],
     [group: 'org.apache.ant', name: 'ant', version: '1.9.4'],
-    [group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'],
-    [group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.13'],
-    [group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.15'],
+    [group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'],
+    [group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.14'],
+    [group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.16'],
     [group: 'org.atteo.classindex', name: 'classindex', version: '3.3'],
     [group: 'org.ccil.cowan.tagsoup', name: 'tagsoup', version: '1.2.1'],
     [group: 'org.restlet.jee', name: 'org.restlet', version: '2.2.2'],
@@ -244,13 +244,13 @@ task copyToDist(dependsOn: [copyLib,copyNotices,copyReferenceDocs,copySchemas,
 jar.dependsOn copyToDist
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
+  archiveClassifier = 'javadoc'
   archiveVersion = relVersion
   from tasks.javadoc.destinationDir
 }
 
 task sourcesJar(type: Jar, dependsOn: ["copyReferenceDocs"]) {
-  classifier = 'sources'
+  archiveClassifier = 'sources'
   archiveVersion = relVersion
   from sourceSets.main.allSource
 }
@@ -296,7 +296,7 @@ task testSuiteMessages {
 task testSuite(dependsOn: [makeDist, testSuiteMessages], type: JavaExec) {
   classpath = configurations.reportruntime + sourceSets.main.output
 
-  main = 'com.xmlcalabash.drivers.RunTestReport'
+  mainClass = 'com.xmlcalabash.drivers.RunTestReport'
   maxHeapSize = "1024m"
   args('-D', '-a',
        testsRoot + '/tests/required/test-suite.xml',
@@ -320,23 +320,23 @@ task testSuiteClassPath {
 
 task htmlReport(dependsOn: testSuite, type: JavaExec) {
   classpath = configurations.reportruntime + sourceSets.main.output
-  main = 'net.sf.saxon.Transform'
+  mainClass = 'net.sf.saxon.Transform'
   args('-s:' + testsReport,
        '-xsl:resources/format-report.xsl',
        '-o:' + testsFormat)
 }
 
 task aDocReport(dependsOn: testSuite, type: JavaExec) {
   classpath = configurations.reportruntime + sourceSets.main.output
-  main = 'net.sf.saxon.Transform'
+  mainClass = 'net.sf.saxon.Transform'
   args('-s:' + testsReport,
        '-xsl:resources/asciidoc-report.xsl',
        '-o:' + testsADoc)
 }
 
 task aDocErrReport(dependsOn: testSuite, type: JavaExec) {
   classpath = configurations.reportruntime + sourceSets.main.output
-  main = 'net.sf.saxon.Transform'
+  mainClass = 'net.sf.saxon.Transform'
   args('-s:' + testsReport,
        '-xsl:resources/asciidoc-report.xsl',
        '-o:' + testsFailADoc,
@@ -368,7 +368,7 @@ task makeIZPackShell(dependsOn: copyVERSION) {
 task setupIZPack(dependsOn: [makeDist, makeIZPackShell], type: JavaExec) {
   classpath = configurations.reportruntime + sourceSets.main.output
 
-  main = 'net.sf.saxon.Transform'
+  mainClass = 'net.sf.saxon.Transform'
   args('-s:src/main/izpack/install.xml',
        '-xsl:resources/izpack-filter.xsl',
        '-o:build/install.xml',

diff --git a/gradle.properties b/gradle.properties
@@ -1,15 +1,15 @@
-relVersion=1.5.3
+relVersion=1.5.4
 docsVersion=1.2.0
 builtBy=Norman Walsh
 
 group = "com.xmlcalabash"
 
-saxonBranch=110
+saxonBranch=120
 saxonGroup=net.sf.saxon
 saxonName=Saxon-HE
-saxonVersion=11.4
+saxonVersion=12.1
 
-xmlresolverVersion=4.6.0
+xmlresolverVersion=5.1.2
 
 docsBaseURI=https://ndw.github.io/xmlcalabash1-docs/download/
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists