diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index b14c716b6..29627b559 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -15,11 +15,11 @@ jobs: fetch-tags: true fetch-depth: 0 - - name: Setup Java 11 + - name: Setup Java 8 uses: actions/setup-java@v4 with: distribution: temurin - java-version: 11 + java-version: 8 - name: Cache Coursier cache uses: coursier/cache-action@v6 diff --git a/build.sbt b/build.sbt index 476eb9c1c..f54a162b5 100644 --- a/build.sbt +++ b/build.sbt @@ -369,15 +369,16 @@ lazy val docs = project "extref.github.base_url" -> s"https://github.com/apache/pekko-connectors/tree/${if (isSnapshot.value) "main" else "v" + version.value}/%s", "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s", - "scaladoc.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/${Dependencies.PekkoBinaryVersion}", - "javadoc.pekko.base_url" -> s"https://pekko.apache.org/japi/pekko/${Dependencies.PekkoBinaryVersion}/", - "javadoc.pekko.link_style" -> "direct", + "scaladoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/api/pekko/${Dependencies.PekkoBinaryVersion}", + "javadoc.org.apache.pekko.base_url" -> s"https://pekko.apache.org/japi/pekko/${Dependencies.PekkoBinaryVersion}/", + "javadoc.org.apache.pekko.link_style" -> "direct", "extref.pekko-http.base_url" -> s"https://pekko.apache.org/docs/pekko-http/${Dependencies.PekkoHttpBinaryVersion}/%s", - "scaladoc.pekko.http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.PekkoHttpBinaryVersion}/", - "javadoc.pekko.http.base_url" -> s"https://pekko.apache.org/japi/pekko-http/${Dependencies.PekkoHttpBinaryVersion}/", + "scaladoc.org.apache.pekko.http.base_url" -> s"https://pekko.apache.org/api/pekko-http/${Dependencies.PekkoHttpBinaryVersion}/", + "javadoc.org.apache.pekko.http.base_url" -> s"https://pekko.apache.org/japi/pekko-http/${Dependencies.PekkoHttpBinaryVersion}/", // Pekko gRPC "pekko-grpc.version" -> Dependencies.PekkoGrpcBinaryVersion, "extref.pekko-grpc.base_url" -> s"https://pekko.apache.org/docs/pekko-grpc/${Dependencies.PekkoGrpcBinaryVersion}/%s", + "scaladoc.org.apache.pekko.gprc.base_url" -> s"https://pekko.apache.org/api/pekko-grpc/${Dependencies.PekkoGrpcBinaryVersion}/", // Couchbase "couchbase.version" -> Dependencies.CouchbaseVersion, "extref.couchbase.base_url" -> s"https://docs.couchbase.com/java-sdk/${Dependencies.CouchbaseVersionForDocs}/%s", diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cac410391..c6452edd9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -403,7 +403,7 @@ object Dependencies { "com.orientechnologies" % "orientdb-object" % "3.2.30")) val PravegaVersion = "0.13.0" - val PravegaVersionForDocs = s"v$PravegaVersion" + val PravegaVersionForDocs = "latest" val Pravega = { Seq( diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf index 7d33880bb..eb64306c5 100644 --- a/scripts/link-validator.conf +++ b/scripts/link-validator.conf @@ -32,14 +32,51 @@ site-link-validator { "https://mvnrepository.com/artifact/" # Errors in Scaladoc from Google Common header `X-Upload-Content-Type` "https://doc.akka.io/api/akka-http/10.2.9/akka/http/impl/util/" + # Broken license report links + "http://glassfish.java.net/public/CDDL+GPL_1_1.html" + "https://glassfish.java.net/public/CDDL+GPL_1_1.html" + "http://jackson.codehaus.org" + "http://java.net/projects/jms-spec/pages/Home" + "http://jaxb.java.net/" + "http://jetty.mortbay.org" + "http://jta-spec.java.net" + "http://propensive.com/" + "http://servlet-spec.java.net" + "http://websocket-spec.java.net" + "https://jaxb.dev.java.net/" + "https://jsr311.dev.java.net" + "http://lmax-exchange.github.com/disruptor" ] non-https-whitelist = [ + # license report "http://logback.qos.ch/" "http://www.slf4j.org/" "http://reactivemongo.org" "http://www.thedevpiece.com/" - # genereated by @apidoc + "http://aopalliance.sourceforge.net" + "http://asm.ow2.io/" + "http://avro.apache.org" + "http://beanvalidation.org" + "http://checkerframework.org" + "http://code.google.com/p/" + "http://commons.apache.org/" + "http://geode.apache.org" + "http://couchbase.com" + "http://creativecommons.org/publicdomain/zero/1.0/" + "http://ehcache.org" + "http://fastutil.di.unimi.it/" + "http://findbugs.sourceforge.net/" + "http://github.com/FasterXML/" + "http://github.com/airlift/aircompressor" + "http://github.com/google/" + "http://github.com/jnr/" + "http://github.com/julianhyde/eigenbase-properties" + "http://github.com/sbt/junit-interface/" + "http://github.com/square/javapoet/" + "http://glassfish.java.net/public/CDDL+GPL_1_1.html" + "http://hamcrest.org/JavaHamcrest/" + # generated by @apidoc "http://pravega.io/" "http://www.scala-lang.org/api/2.13.13/scala/concurrent/Future.html" "http://www.scala-lang.org/api/2.13.13/scala/util/Try.html"