You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2024/04/09 17:25:51 UTC
(jspwiki) branch master updated (f46c00b63 -> b5b328374)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from f46c00b63 2.12.2-git-11
new d09539131 Dependency updates
new 203ab122d publish SBOMs
new fc1409682 Update tomcat binaries
new c1375efd7 BasicAttachmentProvider doesn't throw an Exception if attachment metadata files are not correctly formed
new b5b328374 2.12.2-git-12
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 18 +++++++
LICENSE | 38 +++++++-------
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../wiki/providers/BasicAttachmentProvider.java | 2 +
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35467 -> 35452 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49610 -> 49609 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3800076 -> 3807777 bytes
pom.xml | 58 ++++++++++++++++-----
8 files changed, 84 insertions(+), 34 deletions(-)
(jspwiki) 04/05: BasicAttachmentProvider doesn't throw an Exception if attachment metadata files are not correctly formed
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c1375efd7c9f279deda144b5664561eaea51427e
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Apr 9 15:45:34 2024 +0200
BasicAttachmentProvider doesn't throw an Exception if attachment metadata files are not correctly formed
---
.../main/java/org/apache/wiki/providers/BasicAttachmentProvider.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
index 3dba732a7..86c3cf320 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/BasicAttachmentProvider.java
@@ -255,6 +255,8 @@ public class BasicAttachmentProvider implements AttachmentProvider {
if( propertyFile.exists() ) {
try( final InputStream in = Files.newInputStream( propertyFile.toPath() ) ) {
props.load( in );
+ } catch( final IOException ioe ) {
+ LOG.error( ioe.getMessage() );
}
}
(jspwiki) 02/05: publish SBOMs
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 203ab122d240a65499b669ed51339a3e526defcb
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Apr 9 15:44:08 2024 +0200
publish SBOMs
---
pom.xml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/pom.xml b/pom.xml
index b5909c18b..6899f2ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,6 +107,7 @@
<plugin.cargo.version>1.10.11</plugin.cargo.version>
<plugin.clirr.version>2.8</plugin.clirr.version>
<plugin.cobertura.version>2.7</plugin.cobertura.version>
+ <plugin.cyclonedx.version>2.8.0</plugin.cyclonedx.version>
<plugin.sonar.version>3.10.0.2594</plugin.sonar.version>
<plugin.sonar-report.version>0.1</plugin.sonar-report.version>
<plugin.eclipse-lifecycle-mapping.version>1.0.0</plugin.eclipse-lifecycle-mapping.version>
@@ -478,6 +479,29 @@
<groupId>net.nicoulaj.maven.plugins</groupId>
<artifactId>checksum-maven-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-sbom</id>
+ <goals>
+ <goal>makeAggregateBom</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <externalReferences>
+ <externalReference>
+ <type>vulnerability-assertion</type>
+ <url>https://jspwiki.apache.org/cyclonedx/vdr.xml</url>
+ </externalReference>
+ </externalReferences>
+ <outputFormat>xml</outputFormat>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement> <!-- defines what configuration is going to be used if, and only if, the plugin is used -->
@@ -825,6 +849,12 @@
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>${plugin.cyclonedx.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
(jspwiki) 05/05: 2.12.2-git-12
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit b5b32837416ad6f9655b342f6ba13e1709825bf1
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Apr 9 15:46:28 2024 +0200
2.12.2-git-12
---
ChangeLog.md | 18 ++++++++++
LICENSE | 38 +++++++++++-----------
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
3 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index eed4cd10e..81bd61fe3 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,24 @@ specific language governing permissions and limitations
under the License.
-->
+**2024-04-09 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.2-git-12_
+
+* `BasicAttachmentProvider` doesn't throw an Exception if attachment metadata files are not correctly formed, aligning behaviour with metadata files not being present. This ensures plugin relying on this functionality, like f.ex RecentChanges, keep working if this condition is met.
+
+* Publish SBOMs artifacts as part of the build.
+
+* Dependency updates
+ * Commons IO to 2.16.1
+ * JUnit to 5.10.2
+ * Log4J2 to 2.23.0
+ * Lucene to 9.10.0
+ * Mockito to 5.11.0
+ * Tika to 2.9.2
+ * Tomcat to 9.0.87
+ * Maven plugins: assembly to 3.7.1, compiler to 3.13.0, jxr to 3.3.2, remote-resources to 3.2.0, source to 3.3.1, surefire to 3.2.5, jdk-doclet to 2.1.2
+
**2023-12-04 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.2-git-11_
diff --git a/LICENSE b/LICENSE
index 02453c3c5..aa2de99ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -216,7 +216,7 @@ commons-codec-1.3.jar LICENSE
commons-collections-4.4.jar LICENSE
commons-fileupload-1.5.jar LICENSE
commons-httpclient-3.1.jar LICENSE
-commons-io-2.15.0.jar LICENSE
+commons-io-2.16.1.jar LICENSE
commons-lang-3.14.0.jar LICENSE
commons-logging-1.0.4.jar LICENSE
commons-text-1.11.0.jar LICENSE
@@ -253,18 +253,18 @@ jdom2-2.0.6.jar ./jspwiki-war/src/main/config/doc/LI
jmespath-java-1.12.565 LICENSE
joda-time-2.8.1 LICENSE
jstl-1.2.jar LICENSE
-log4j-1.2-api-2.20.0.jar LICENSE
-log4j-api-2.20.0.jar LICENSE
-log4j-core-2.20.0.jar LICENSE
-log4j-slf4j-impl-2.20.0 LICENSE
-lucene-analyzers-common-9.9.0.jar LICENSE
-lucene-backward-codecs-9.9.0.jar LICENSE
-lucene-core-9.9.0.jar LICENSE
-lucene-highlighter-9.9.0.jar LICENSE
-lucene-memory-9.9.0.jar LICENSE
-lucene-queries-9.9.0.jar LICENSE
-lucene-queryparser-9.9.0.jar LICENSE
-lucene-sandbox-9.9.0.jar LICENSE
+log4j-1.2-api-2.23.0.jar LICENSE
+log4j-api-2.23.0.jar LICENSE
+log4j-core-2.23.0.jar LICENSE
+log4j-slf4j-impl-2.23.0 LICENSE
+lucene-analyzers-common-9.10.0.jar LICENSE
+lucene-backward-codecs-9.10.0.jar LICENSE
+lucene-core-9.10.0.jar LICENSE
+lucene-highlighter-9.10.0.jar LICENSE
+lucene-memory-9.10.0.jar LICENSE
+lucene-queries-9.10.0.jar LICENSE
+lucene-queryparser-9.10.0.jar LICENSE
+lucene-sandbox-9.10.0.jar LICENSE
mail-1.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.cddl
nekohtml-2.0.2.jar (codelibs fork) LICENSE
org.suigeneris.jrcs.diff-0.4.2 LICENSE
@@ -272,8 +272,8 @@ oro-2.0.8.jar LICENSE
sandler-0.5.jar ./jspwiki-war/src/main/config/doc/LICENSE.sandler
slf4-api-1.7.36.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
xercesImpl-2.10.0.jar LICENSE
-tika-core-2.9.1.jar LICENSE
-tika-parsers-2.9.1.jar LICENSE
+tika-core-2.9.2.jar LICENSE
+tika-parsers-2.9.2.jar LICENSE
xml-apis-1.4.01 LICENSE
xmlrpc-2.0.1.jar LICENSE
xpp3-1.1.3.4-RC3 ./jspwiki-war/src/main/config/doc/LICENSE.cc-cod
@@ -287,8 +287,8 @@ hsqldb-2.7.2.jar ./jspwiki-war/src/main/config/doc/LI
sqltool-2.7.2.jar ./jspwiki-war/src/main/config/doc/LICENSE.hsqldb
jamm-0.4.0.jar LICENSE
jetty-all-9.4.53.v20231009.jar LICENSE
-junit-5.10.1 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
-mockito-core-5.8.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
+junit-5.10.2 ./jspwiki-war/src/main/config/doc/LICENSE.cpl
+mockito-core-5.11.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
selenide-6.19.0.jar ./jspwiki-war/src/main/config/doc/LICENSE.mit
stripes-1.7.0-async.jar LICENSE
yuicompressor-2.4.7.jar ./jspwiki-war/src/main/config/doc/LICENSE.yui
@@ -305,7 +305,7 @@ SlimBox ./jspwiki-war/src/main/config/doc/LI
RESOURCES LICENSE FILE
=============================================================================================================
-Apache Tomcat 9.0.83 LICENSE
+Apache Tomcat 9.0.87 LICENSE
Font Awesome (CSS & LESS files) ./jspwiki-war/src/main/config/doc/LICENSE.mit
Font Awesome (Fonts) ./jspwiki-war/src/main/config/doc/LICENSE.ofl
SilkIconSet ./jspwiki-war/src/main/config/doc/LICENSE.SilkIconSet
@@ -313,4 +313,4 @@ SilkIconSet ./jspwiki-war/src/main/config/doc/LI
OTHER
=============================================================================================================
While not bundled by default, Apache Tika extracts content from a lot of different file formats using several
-OSS libraries, which can be consulted at https://tika.apache.org/2.9.1/formats.html
\ No newline at end of file
+OSS libraries, which can be consulted at https://tika.apache.org/2.9.2/formats.html
\ No newline at end of file
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index b3699e53a..1c6bef6af 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "11";
+ public static final String BUILD = "12";
/**
* This is the generic version string you should use when printing out the version. It is of
(jspwiki) 03/05: Update tomcat binaries
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit fc1409682b7e123e20b74312e05e175cc0a8fe99
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Apr 9 15:44:39 2024 +0200
Update tomcat binaries
---
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35467 -> 35452 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 49610 -> 49609 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3800076 -> 3807777 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index 22efd7e56..cf04ee1ee 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index 0d835b140..10ee7d850 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index f38d34f82..ba3704578 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ
(jspwiki) 01/05: Dependency updates
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit d09539131830b1a357faae4dd1d73ff353ae36da
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Tue Apr 9 15:40:54 2024 +0200
Dependency updates
* Commons IO to 2.16.1
* JUnit to 5.10.2
* Log4J2 to 2.23.0
* Lucene to 9.10.0
* Mockito to 5.11.0
* Tika to 2.9.2
* Tomcat to 9.0.87
* Maven plugins: assembly to 3.7.1, compiler to 3.13.0, jxr to 3.3.2, remote-resources to 3.2.0, source to 3.3.1, surefire to 3.2.5, jdk-doclet to 2.1.2
closes #329
closes #328
closes #327
closes #326
---
pom.xml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index 485a5debf..b5909c18b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2023-08-07T19:55:12Z</project.build.outputTimestamp> <!-- will be changed by release plugin during releases -->
<jdk.version>11</jdk.version>
- <jdk.javadoc.doclet.version>2.1.1</jdk.javadoc.doclet.version>
+ <jdk.javadoc.doclet.version>2.1.2</jdk.javadoc.doclet.version>
<maven.version>3.5</maven.version>
<akismet-java.version>1.02</akismet-java.version>
@@ -50,7 +50,7 @@
<commons-collections.version>4.4</commons-collections.version>
<commons-fileupload.version>1.5</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
- <commons-io.version>2.15.0</commons-io.version>
+ <commons-io.version>2.16.1</commons-io.version>
<commons-lang.version>3.14.0</commons-lang.version>
<commons-text.version>1.11.0</commons-text.version>
<ehcache.version>2.10.9.2</ehcache.version>
@@ -67,37 +67,37 @@
<jdom2.version>2.0.6</jdom2.version>
<jetty.version>9.4.53.v20231009</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
- <junit.version>5.10.1</junit.version>
- <log4j2.version>2.20.0</log4j2.version>
- <lucene.version>9.9.0</lucene.version>
- <mockito.version>5.8.0</mockito.version>
+ <junit.version>5.10.2</junit.version>
+ <log4j2.version>2.23.0</log4j2.version>
+ <lucene.version>9.10.0</lucene.version>
+ <mockito.version>5.11.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
<selenide.version>6.19.0</selenide.version>
<slf4j.version>1.7.36</slf4j.version>
<stripes.version>1.7.0-async-beta</stripes.version>
- <tika.version>2.9.1</tika.version>
- <tomcat.version>9.0.83</tomcat.version>
+ <tika.version>2.9.2</tika.version>
+ <tomcat.version>9.0.87</tomcat.version>
<wro4j.version>1.8.0</wro4j.version>
<xmlrpc.version>2.0.1</xmlrpc.version>
<plugin.antrun.version>3.1.0</plugin.antrun.version>
- <plugin.assembly.version>3.6.0</plugin.assembly.version>
+ <plugin.assembly.version>3.7.1</plugin.assembly.version>
<plugin.clean.version>3.3.2</plugin.clean.version>
- <plugin.compiler.version>3.11.0</plugin.compiler.version>
+ <plugin.compiler.version>3.13.0</plugin.compiler.version>
<plugin.dependency.version>3.6.1</plugin.dependency.version>
<plugin.enforcer.version>3.4.1</plugin.enforcer.version>
<plugin.install.version>3.1.1</plugin.install.version>
<plugin.jar.version>3.3.0</plugin.jar.version>
<plugin.javadoc.version>3.6.3</plugin.javadoc.version>
- <plugin.jxr.version>3.3.1</plugin.jxr.version>
+ <plugin.jxr.version>3.3.2</plugin.jxr.version>
<plugin.project-info-reports.version>3.5.0</plugin.project-info-reports.version>
<plugin.release.version>3.0.1</plugin.release.version>
- <plugin.remote-resources.version>3.1.0</plugin.remote-resources.version>
+ <plugin.remote-resources.version>3.2.0</plugin.remote-resources.version>
<plugin.resources.version>3.3.1</plugin.resources.version>
- <plugin.source.version>3.3.0</plugin.source.version>
- <plugin.surefire.version>3.2.2</plugin.surefire.version>
+ <plugin.source.version>3.3.1</plugin.source.version>
+ <plugin.surefire.version>3.2.5</plugin.surefire.version>
<plugin.surefire.junit5-tree-reporter.version>1.2.1</plugin.surefire.junit5-tree-reporter.version>
<plugin.war.version>3.4.0</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>