diff --git a/documentation/FILE_NAMES.adoc b/documentation/FILE_NAMES.adoc index 414f09a12..f75ff6879 100644 --- a/documentation/FILE_NAMES.adoc +++ b/documentation/FILE_NAMES.adoc @@ -190,3 +190,6 @@ Jamal can read files from JAR files. In this case the prefix has to be `jar:file:` and the file name has to be the name of the JAR file followed by the name of the file inside the JAR file following a `!` character. For more information read the link:../jamal-jar-input/README.adoc[documentation] of the module implementing the `jar:file:` prefix. + + + diff --git a/jamal-kotlin-testsupport/pom.jam b/jamal-kotlin-testsupport/pom.jam index 4157fb0dd..66a69e5a7 100644 --- a/jamal-kotlin-testsupport/pom.jam +++ b/jamal-kotlin-testsupport/pom.jam @@ -40,6 +40,7 @@ 〕 〕 〕 + 〔@include ../plugins.jim〕 〕 〕 〔end project〕 \ No newline at end of file diff --git a/jamal-kotlin-testsupport/pom.xml b/jamal-kotlin-testsupport/pom.xml index 427c9b970..861034d1e 100644 --- a/jamal-kotlin-testsupport/pom.xml +++ b/jamal-kotlin-testsupport/pom.xml @@ -71,6 +71,22 @@ + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + \ No newline at end of file diff --git a/jamal-kotlin-testsupport/src/main/kotlin/javax0/jamal/kotlin/testsupport/TestSupport.kt b/jamal-kotlin-testsupport/src/main/kotlin/javax0/jamal/kotlin/testsupport/TestSupport.kt index 75724a95d..1c47ec76a 100644 --- a/jamal-kotlin-testsupport/src/main/kotlin/javax0/jamal/kotlin/testsupport/TestSupport.kt +++ b/jamal-kotlin-testsupport/src/main/kotlin/javax0/jamal/kotlin/testsupport/TestSupport.kt @@ -1,4 +1,4 @@ -package javax0.jamal.kotlin +package javax0.jamal.kotlin.testsupport import javax0.jamal.api.Processor import javax0.jamal.builtins.Macro diff --git a/jamal-kotlin/pom.jam b/jamal-kotlin/pom.jam index 029e3bb38..b5182977f 100644 --- a/jamal-kotlin/pom.jam +++ b/jamal-kotlin/pom.jam @@ -40,6 +40,7 @@ 〕 〕 〕 + 〔@include ../plugins.jim〕 〕 〕 〔end project〕 \ No newline at end of file diff --git a/jamal-kotlin/pom.xml b/jamal-kotlin/pom.xml index 14a94fed5..9c5b67178 100644 --- a/jamal-kotlin/pom.xml +++ b/jamal-kotlin/pom.xml @@ -77,6 +77,22 @@ + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + \ No newline at end of file diff --git a/jamal-kotlin/src/main/java/com/javax0/jamal/kotlin/Kotlin.java b/jamal-kotlin/src/main/java/com/javax0/jamal/kotlin/Kotlin.java new file mode 100644 index 000000000..3930bec11 --- /dev/null +++ b/jamal-kotlin/src/main/java/com/javax0/jamal/kotlin/Kotlin.java @@ -0,0 +1,4 @@ +package com.javax0.jamal.kotlin; + +public class Kotlin { +} diff --git a/jamal-kotlin/src/test/kotlin/javax0/jamal/kotlin/TestHelloKotlin.kt b/jamal-kotlin/src/test/kotlin/javax0/jamal/kotlin/TestHelloKotlin.kt index 61fdf69d2..10628b457 100644 --- a/jamal-kotlin/src/test/kotlin/javax0/jamal/kotlin/TestHelloKotlin.kt +++ b/jamal-kotlin/src/test/kotlin/javax0/jamal/kotlin/TestHelloKotlin.kt @@ -1,5 +1,7 @@ package javax0.jamal.kotlin +import javax0.jamal.kotlin.testsupport.Position +import javax0.jamal.kotlin.testsupport.testTheInput import org.junit.jupiter.api.Test class TestHelloKotlin { diff --git a/jamal-snippet/README.adoc b/jamal-snippet/README.adoc index 31196054b..f85bc5b36 100644 --- a/jamal-snippet/README.adoc +++ b/jamal-snippet/README.adoc @@ -3428,7 +3428,7 @@ will result in the output [source] ---- -2023-08-18 11:36:41 +2023-08-18 12:17:21 ---- diff --git a/jamal-word/src/test/resources/demoConverted.docx b/jamal-word/src/test/resources/demoConverted.docx index a1619c97c..29991e5df 100644 Binary files a/jamal-word/src/test/resources/demoConverted.docx and b/jamal-word/src/test/resources/demoConverted.docx differ diff --git a/jamal-word/src/test/resources/includetestConverted.docx b/jamal-word/src/test/resources/includetestConverted.docx index 8d0ce6227..721e5c386 100644 Binary files a/jamal-word/src/test/resources/includetestConverted.docx and b/jamal-word/src/test/resources/includetestConverted.docx differ diff --git a/jamal-word/src/test/resources/pictureConverted.docx b/jamal-word/src/test/resources/pictureConverted.docx index 3cae63d79..f985737b2 100644 Binary files a/jamal-word/src/test/resources/pictureConverted.docx and b/jamal-word/src/test/resources/pictureConverted.docx differ diff --git a/jamal-word/src/test/resources/sampleConverted.docx b/jamal-word/src/test/resources/sampleConverted.docx index d3034494c..0c8f5d1ee 100644 Binary files a/jamal-word/src/test/resources/sampleConverted.docx and b/jamal-word/src/test/resources/sampleConverted.docx differ