Skip to content

Commit

Permalink
versions updated to new version
Browse files Browse the repository at this point in the history
  • Loading branch information
verhas committed Jun 17, 2024
1 parent bea9ebc commit 0f535b8
Show file tree
Hide file tree
Showing 14 changed files with 80 additions and 18 deletions.
2 changes: 1 addition & 1 deletion README.jrf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is a Jamal reference file containing serialized base64 encoded macros
# Created: 2024-06-14 12:42:03 +0200
# Created: 2024-06-17 12:28:26 +0200
# id|openStr|closeStr|verbatim|tailParameter|pure|content|parameters
# TOC
VE9D|eyU=|JX0=|0|0|0|Ci4gPDxJbnN0YWxsYXRpb24+PgouIDw8R1M+PgouIDw8Q29uZmlndXJhdGlvbj4+Ci4gPDxGZWF0dXJlcz4+Ci4gPDxDb250cmlidXRpbmc+PgouIDw8RG9jdW1lbnRhdGlvbj4+Ci4gPDxMaWNlbnNlPj4KLiA8PENoYW5nZWxvZz4+Ci4gPDxSb2FkbWFwPj4KLiA8PFN1cHBvcnQ+PgouIDw8RkFRPj4KLiA8PE1haW50ZW5hbmNlPj4=|
4 changes: 2 additions & 2 deletions jamal-asciidoc/pom.jam
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
{dependency |org.asciidoctor|asciidoctorj|{ASCIIDOCTORJ_VERSION}|provided}
{dependency |org.mockito|mockito-core|{MOCKITO_VERSION}}
{dependency |io.github.markdown-asciidoc|markdown-to-asciidoc|{MARKDOWN_TO_ASCIIDOC}}
{@comment This dependency is needed for the markdown to asciidoc conversion.
{@comment JSOUP This dependency is needed for the markdown to asciidoc conversion.
It is not used directly and it is a transitive dependency of the markdown to asciidoc converter.
The version of the dependency is too old and has security issues.
Therefore, here we override the version to the latest one.
}
{dependency :org.jsoup:jsoup:1.15.3}
{dependency :org.jsoup:jsoup:{JSOUP_VERSION}}
}

{repositories{repository|jitpack|https://jitpack.io/}}
Expand Down
2 changes: 1 addition & 1 deletion jamal-asciidoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.15.3</version>
<version>1.17.2</version>
</dependency>
</dependencies>
<repositories>
Expand Down
2 changes: 1 addition & 1 deletion jamal-snippet/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3816,7 +3816,7 @@ will result in the output
.output
[source]
----
2024-06-14 12:42:03
2024-06-17 12:28:26
----


Expand Down
Binary file modified jamal-sql/demodb.mv.db
Binary file not shown.
33 changes: 31 additions & 2 deletions jamal-test/TEST_PLAYGROUND.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,36 @@

# 1
# 1 Sonett 18

Should I cmpr u 2 a smmr?s day?

U r more lvly & more mdrt.

Strng winds shke the dlcte buds of May,

& smmr doesn?t lst lng enuf.

Smtms the sun shns 2 ht,

& oftn its gld face is dmmd;

& evryting btful loses its bty vntually,

By chnce, or by ntr?s nvtble chnges;

But ur etrnl bty will nvr fade,

Nor lose psssn of the bty u have,

Nor will dth clm u 4 its own,

Bcz u will lv on in these etrnl lns.

As lng as ppl brthe or have eyes 2 see,

So lng will this pm lv,

& it will give life 2 u.

This is **th**e chapter 1.

# 2

Expand Down
35 changes: 32 additions & 3 deletions jamal-test/TEST_PLAYGROUND.md.jam
Original file line number Diff line number Diff line change
@@ -1,9 +1,38 @@
{@counter:define hierarchical id=chapter}
# {chapter}
# {chapter} Sonett 18

This is **th**e chapter {chapter last}.
Should I cmpr u 2 a smmr’s day?

# {chapter}
U r more lvly & more mdrt.

Strng winds shke the dlcte buds of May,

& smmr doesn’t lst lng enuf.

Smtms the sun shns 2 ht,

& oftn its gld face is dmmd;

& evryting btful loses its bty vntually,

By chnce, or by ntr’s nvtble chnges;

But ur etrnl bty will nvr fade,

Nor lose psssn of the bty u have,

Nor will dth clm u 4 its own,

Bcz u will lv on in these etrnl lns.

As lng as ppl brthe or have eyes 2 see,

So lng will this pm lv,

& it will give life {chapter} u.


# {chapter last}

This is the chapter {chapter last}.

Expand Down
Binary file modified jamal-word/src/test/resources/demoConverted.docx
Binary file not shown.
Binary file modified jamal-word/src/test/resources/includetestConverted.docx
Binary file not shown.
Binary file modified jamal-word/src/test/resources/pictureConverted.docx
Binary file not shown.
Binary file modified jamal-word/src/test/resources/sampleConverted.docx
Binary file not shown.
7 changes: 4 additions & 3 deletions version.jim
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ MAVEN_PLUGIN_API=4.0.0-beta-3 -- https://repo.maven.apache.org/mave
MAVEN_PLUGIN_ANNOTATIONS=3.13.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/
MAVEN_PLUGIN_PLUGIN_VERSION=3.13.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugin-plugin
SONATYPE_PLUGIN_VERSION=1.7.0 -- https://repo.maven.apache.org/maven2/org/sonatype/plugins/nexus-staging-maven-plugin
SUREFIRE_PLUGIN_VERSION=3.2.5 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin
SUREFIRE_PLUGIN_VERSION=3.3.0 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin
MAVEN_SOURCE_PLUGIN_VERSION=3.3.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-source-plugin
APPASSEMBLER_PLUGIN_VERSION=2.1.0 -- https://repo.maven.apache.org/maven2/org/codehaus/mojo/appassembler-maven-plugin
MAVEN_DEPENDENCY_PLUGIN_VERSION=3.6.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin
MAVEN_DEPENDENCY_PLUGIN_VERSION=3.7.0 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-dependency-plugin
KOTLIN_VERSION=1.7.10

-- test dependency
Expand All @@ -93,7 +93,7 @@ ASCIIDOCTORJ_VERSION=3.0.0-alpha.1 -- https://repo.maven.apache.org/mave
JSCRIPTBASIC_VERSION=3.0.0 -- https://repo.maven.apache.org/maven2/com/scriptbasic/jscriptbasic/
MARKDOWN_TO_ASCIIDOC=2.0.1 -- https://repo.maven.apache.org/maven2/io/github/markdown-asciidoc/markdown-to-asciidoc/
MAVEN_DOWNLOADER=1.1.0 -- https://repo.maven.apache.org/maven2/com/javax0/mavenDownload/mavenDownloader/
SOURCE_BUDDY=2.5.1 -- https://repo.maven.apache.org/maven2/com/javax0/sourcebuddy/SourceBuddy/
SOURCE_BUDDY=2.5.3 -- https://repo.maven.apache.org/maven2/com/javax0/sourcebuddy/SourceBuddy/
JAVA_LEX=1.0.2 -- https://repo.maven.apache.org/maven2/com/javax0/javaLex/javaLex/
REFI=1.0.1 -- https://repo.maven.apache.org/maven2/com/javax0/refi/
SLF4J=2.0.7 -- https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/
Expand All @@ -105,4 +105,5 @@ JSQLPARSER_VERSION=4.9 -- https://repo.maven.apache.org/mave
MAVEN_CORE_VERSION=4.0.0-beta-3 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-core
PLEXUS_COMPONENT_METADATA_VERSION=2.2.0 -- https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-metadata
COMMONS_COMPRESS_VERSION=1.26.2 -- https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress
JSOUP_VERSION=1.17.2 -- https://repo.maven.apache.org/maven2/org/jsoup/jsoup
}
10 changes: 6 additions & 4 deletions versions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ If all dependencies are up-to-date, then the output should not contain any `*[re
* `OK` `SONATYPE_PLUGIN_VERSION` `1.7.0`
* `OK` `SUREFIRE_PLUGIN_VERSION` `3.2.5`
* `OK` `SUREFIRE_PLUGIN_VERSION` `3.3.0`
* `OK` `MAVEN_SOURCE_PLUGIN_VERSION` `3.3.1`
* `OK` `APPASSEMBLER_PLUGIN_VERSION` `2.1.0`
* `OK` `MAVEN_DEPENDENCY_PLUGIN_VERSION` `3.6.1`
* `OK` `MAVEN_DEPENDENCY_PLUGIN_VERSION` `3.7.0`
* `OK` `JUPITER_VERSION` `5.11.0-M2`
Expand Down Expand Up @@ -83,7 +83,7 @@ When the new Asciidoctor version is released and used as an IntelliJ plugin we w
* `OK` `MAVEN_DOWNLOADER` `1.1.0`
* `*[red]#NO#*` `SOURCE_BUDDY` `2.5.1` `*[red]#upgrade to 2.5.3#*`
* `OK` `SOURCE_BUDDY` `2.5.3`
* `OK` `MAVEN_CORE_VERSION` `4.0.0-beta-3`
Expand All @@ -97,4 +97,6 @@ When the new Asciidoctor version is released and used as an IntelliJ plugin we w
* `OK` `H2_VERSION` `2.2.224`
* `OK` `JSQLPARSER_VERSION` `4.9`
* `OK` `JSQLPARSER_VERSION` `4.9`
* `OK` `JSOUP_VERSION` `1.17.2`
3 changes: 2 additions & 1 deletion versions.adoc.jam
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,5 @@ When the new Asciidoctor version is released and used as an IntelliJ plugin we w
〔CHECK :ASM_TREE_VERSION:org/ow2/asm/asm-tree〕
〔CHECK :MARKDOWN_TO_ASCIIDOC:io/github/markdown-asciidoc/markdown-to-asciidoc〕
〔CHECK :H2_VERSION:com/h2database/h2〕
〔CHECK :JSQLPARSER_VERSION:com/github/jsqlparser/jsqlparser〕
〔CHECK :JSQLPARSER_VERSION:com/github/jsqlparser/jsqlparser〕
〔CHECK :JSOUP_VERSION:org/jsoup/jsoup〕

0 comments on commit 0f535b8

Please sign in to comment.