You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2023/02/24 10:38:39 UTC

[jackrabbit-filevault] branch JCRVLT-688 updated: JCRVLT-688: use generator version info

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch JCRVLT-688
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


The following commit(s) were added to refs/heads/JCRVLT-688 by this push:
     new 8da5b850 JCRVLT-688: use generator version info
8da5b850 is described below

commit 8da5b8506afed98b0b400e124c9e735a894fb82b
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Feb 24 11:38:25 2023 +0100

    JCRVLT-688: use generator version info
---
 .../main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java   | 2 +-
 .../jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
index bd8be258..7d3c01f6 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/AbstractExporter.java
@@ -201,7 +201,7 @@ public abstract class AbstractExporter implements AutoCloseable {
             // update properties
             setProperty(MetaInf.CREATED, Calendar.getInstance());
             setProperty(MetaInf.CREATED_BY, mgr.getUserId());
-            setProperty(MetaInf.GENERATOR, "foobar");
+            setProperty(MetaInf.GENERATOR, getVersion("org.apache.jackrabbit.vault", this.getClass()));
             setProperty(MetaInf.PACKAGE_FORMAT_VERSION, String.valueOf(MetaInf.FORMAT_VERSION_2));
 
             // get filter and translate if necessary
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
index 8c8009db..ce1be4ed 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/packaging/impl/JcrPackageDefinitionImpl.java
@@ -750,7 +750,6 @@ public class JcrPackageDefinitionImpl implements JcrPackageDefinition {
         setProperty(props, VaultPackage.NAME_LAST_WRAPPED_BY, get(PN_LAST_WRAPPED_BY));
         setProperty(props, VaultPackage.NAME_CREATED, getCalendar(PN_CREATED));
         setProperty(props, VaultPackage.NAME_CREATED_BY, get(PN_CREATED_BY));
-        setProperty(props, VaultPackage.NAME_GENERATOR, "qux");
         setProperty(props, VaultPackage.NAME_DEPENDENCIES, Dependency.toString(getDependencies()));
         setProperty(props, VaultPackage.NAME_AC_HANDLING, get(PN_AC_HANDLING));
         setProperty(props, VaultPackage.NAME_CND_PATTERN, get(PN_CND_PATTERN));