Skip to content

Commit

Permalink
dependency versions updated
Browse files Browse the repository at this point in the history
  • Loading branch information
verhas committed May 29, 2024
1 parent 09a82f9 commit a795e2b
Show file tree
Hide file tree
Showing 13 changed files with 19 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-05-29 12:19:49 +0200
# Created: 2024-05-29 18:43:48 +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=|
2 changes: 1 addition & 1 deletion documentation/macros/for.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -334,4 +334,4 @@ a) b) c) d)


Note that this alternative format can only be used for the values list and not for the variables.
The variables of the for loop should always be listed between `(` and `)` characters.
The variables of the for loop should always be listed between `(` and `)` characters.
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-05-29 12:19:49
2024-05-29 18:43:49
----


Expand Down
Binary file modified jamal-sql/demodb.mv.db
Binary file not shown.
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.
2 changes: 1 addition & 1 deletion jamal-xls/pom.jam
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{dependency|org.junit.jupiter|junit-jupiter-MODULE|{JUPITER_VERSION}|test}}
{dependency|org.apache.poi|poi|{APACHE_POI_VERSION}}
{dependency :org.apache.poi:poi-ooxml:{APACHE_POI_VERSION}}
{dependency :org.apache.commons:commons-compress:1.26.1}
{dependency :org.apache.commons:commons-compress:{COMMONS_COMPRESS_VERSION}}
}

{end project}
Expand Down
2 changes: 1 addition & 1 deletion jamal-xls/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.26.1</version>
<version>1.26.2</version>
</dependency>
</dependencies>
</project>
9 changes: 5 additions & 4 deletions version.jim
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ MAVEN_COMPILER_PLUGIN_VERSION=3.13.0 -- https://repo.maven.apache.org/mave
MAVEN_JAVADOC_PLUGIN_VERSION=3.6.3 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin
MAVEN_GPG_PLUGIN_VERSION=3.2.4 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-gpg-plugin/
MAVEN_ASSEMBLY_PLUGIN_VERSION=3.7.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-assembly-plugin/
MAVEN_PLUGIN_API=4.0.0-alpha-13 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/
MAVEN_PLUGIN_API=4.0.0-beta-3 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/
MAVEN_PLUGIN_ANNOTATIONS=3.13.0 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/
MAVEN_PLUGIN_PLUGIN_VERSION=3.13.0 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugin-plugin
SONATYPE_PLUGIN_VERSION=1.6.13 -- https://repo.maven.apache.org/maven2/org/sonatype/plugins/nexus-staging-maven-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
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
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.0 -- https://repo.maven.apache.org/maven2/com/javax0/sourcebuddy/SourceBuddy/
SOURCE_BUDDY=2.5.1 -- 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 @@ -102,6 +102,7 @@ ASM_TREE_VERSION=9.7 -- https://repo.maven.apache.org/mave
H2_VERSION=2.2.224 -- https://repo.maven.apache.org/maven2/com/h2database/h2/
JSQLPARSER_VERSION=4.9 -- https://repo.maven.apache.org/maven2/com/github/jsqlparser/jsqlparser/
-- dependencies needed for the Maven extension (not the plugin)
MAVEN_CORE_VERSION=4.0.0-alpha-13 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-core
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
}
14 changes: 7 additions & 7 deletions versions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ If all dependencies are up-to-date, then the output should not contain any `*[re
* `OK` `MAVEN_ASSEMBLY_PLUGIN_VERSION` `3.7.1`
* `OK` `MAVEN_PLUGIN_API` `4.0.0-alpha-13`
* `OK` `MAVEN_PLUGIN_API` `4.0.0-beta-3`
* `OK` `MAVEN_PLUGIN_ANNOTATIONS` `3.13.0`
* `OK` `MAVEN_PLUGIN_PLUGIN_VERSION` `3.13.0`
* `OK` `SONATYPE_PLUGIN_VERSION` `1.6.13`
* `OK` `SONATYPE_PLUGIN_VERSION` `1.7.0`
* `OK` `SUREFIRE_PLUGIN_VERSION` `3.2.5`
Expand Down Expand Up @@ -59,15 +59,15 @@ If all dependencies are up-to-date, then the output should not contain any `*[re
When upgrading the newer version, check that the dependency on
* `OK` `COMMONS_COMPRESS_VERSION` `1.26.1`
* `OK` `COMMONS_COMPRESS_VERSION` `1.26.2`
of the OOXML package is higher than 1.25.0
Version 1.25.0 has two vulnerabilities CVE-2024-26308 and CVE-2024-25710.
The OOXML library version 5.2.5 depends on the vulnerable version.
The version 1.26.1 of the compress library is explicitly added to the `jamal-xls` module as a dependency.
The version 1.26.2 of the compress library is explicitly added to the `jamal-xls` module as a dependency.
It may not be needed when the poi-ooxml library also updates its dependency.
It has to be checked when stepping up from 5.2.5 to a newer version.
====


Expand All @@ -83,9 +83,9 @@ When the new Asciidoctor version is released and used as an IntelliJ plugin we w
* `OK` `MAVEN_DOWNLOADER` `1.1.0`
* `OK` `SOURCE_BUDDY` `2.5.0`
* `OK` `SOURCE_BUDDY` `2.5.1`
* `OK` `MAVEN_CORE_VERSION` `4.0.0-alpha-13`
* `OK` `MAVEN_CORE_VERSION` `4.0.0-beta-3`
* `OK` `PLEXUS_COMPONENT_METADATA_VERSION` `2.2.0`
Expand Down
4 changes: 2 additions & 2 deletions versions.adoc.jam
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ endif〕〕
[NOTE]
====
When upgrading the newer version, check that the dependency on
〔@define COMMONS_COMPRESS_VERSION=1.26.1〕

〔CHECK :COMMONS_COMPRESS_VERSION:org/apache/commons/commons-compress〕

of the OOXML package is higher than 1.25.0
Expand All @@ -56,7 +56,7 @@ Version 1.25.0 has two vulnerabilities CVE-2024-26308 and CVE-2024-25710.
The OOXML library version 5.2.5 depends on the vulnerable version.
The version 〔COMMONS_COMPRESS_VERSION〕 of the compress library is explicitly added to the `jamal-xls` module as a dependency.
It may not be needed when the poi-ooxml library also updates its dependency.

It has to be checked when stepping up from 5.2.5 to a newer version.
====

〔CHECK :ASCIIDOCTORJ_VERSION:org/asciidoctor/asciidoctorj〕
Expand Down

0 comments on commit a795e2b

Please sign in to comment.