From eb8165185bc1f8a9888d95c88b7a5975da803dcd Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Sat, 29 Aug 2020 10:47:39 +0200 Subject: Remove Scala again. At this time, Scala support is not worth very much, and as Scala 3 is not here yet the compiler slows down the build significantly. This change may be reverted in the future. Change-Id: Ie172489284f324e8c2313919b293fdf98754c2f6 --- pom.xml | 77 ---------------------- .../eu/mulk/mulkcms2/cms/about/AboutResource.java | 22 +++++++ .../eu/mulk/mulkcms2/cms/about/AboutResource.scala | 18 ----- 3 files changed, 22 insertions(+), 95 deletions(-) create mode 100644 src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.java delete mode 100644 src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.scala diff --git a/pom.xml b/pom.xml index 037c7c3..5d99fd7 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,6 @@ 11 11 - 2.13.3 - UTF-8 UTF-8 @@ -23,9 +21,7 @@ 4.2 1.7.0.Final 3.1.0 - 2.6.3 2.0.3 - 4.4.0 quarkus-bom @@ -127,30 +123,10 @@ - - org.scala-lang - scala-library - ${scala.version} - - - org.scala-lang - scala-reflect - ${scala.version} - - - org.scala-lang - scala-compiler - ${scala.version} - - io.quarkus quarkus-agroal - - io.quarkus - quarkus-scala - io.quarkus quarkus-elytron-security-properties-file @@ -372,13 +348,6 @@ - - - - ${scalafmt.version} - ${basedir}/.scalafmt.conf - - @@ -422,52 +391,6 @@ - - net.alchim31.maven - scala-maven-plugin - ${scala-plugin.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - add-source - testCompile - - - - - - ${scala.version} - false - - - -Xsource:3 - - - - - -Xlint:deprecation - -proc:none - - - - - diff --git a/src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.java b/src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.java new file mode 100644 index 0000000..a1da033 --- /dev/null +++ b/src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.java @@ -0,0 +1,22 @@ +package eu.mulk.mulkcms2.cms.about; + +import io.quarkus.qute.Template; +import io.quarkus.qute.TemplateInstance; +import io.quarkus.qute.api.ResourcePath; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; + +@Path("/about") +public class AboutResource { + + @ResourcePath("benki/about/index.html") + Template index; + + @GET + @Produces(MediaType.TEXT_HTML) + public TemplateInstance getIndex() { + return index.instance(); + } +} diff --git a/src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.scala b/src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.scala deleted file mode 100644 index f7b3261..0000000 --- a/src/main/scala/eu/mulk/mulkcms2/cms/about/AboutResource.scala +++ /dev/null @@ -1,18 +0,0 @@ -package eu.mulk.mulkcms2.cms.about - -import io.quarkus.qute.{Template, TemplateInstance} -import io.quarkus.qute.api.ResourcePath -import javax.ws.rs.{GET, Path, Produces} -import javax.ws.rs.core.MediaType - -@Path("/about") -class AboutResource { - - @ResourcePath("benki/about/index.html") - var index: Template = _ - - @GET - @Produces(Array(MediaType.TEXT_HTML)) - def getIndex: TemplateInstance = - index.instance() -} -- cgit v1.2.3