Merge branch 'develop' into master

bloomreach-forge · Jan 12, 2024 · d2ac10a · d2ac10a
2 parents dd0c08e + 4d5ae19
commit d2ac10a
Show file tree

Hide file tree

Showing 46 changed files with 119 additions and 87 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Bloomreach Forge Embargo Plugin
-Copyright 2015-2022 Bloomreach B.V. (http://www.bloomreach.com)
+Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
 
 This product includes software developed by:
 Bloomreach B.V., Amsterdam, The Netherlands (http://www.bloomreach.com/);

diff --git a/cms/pom.xml b/cms/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+  Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.bloomreach.forge.embargo</groupId>
     <artifactId>embargo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>Bloomreach Embargo Plugin CMS</name>

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/EmbargoWorkflowPlugin.html b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/EmbargoWorkflowPlugin.html
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+  Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/EmbargoWorkflowPlugin.java b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/EmbargoWorkflowPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -240,7 +241,12 @@ protected Component getIcon(final String id) {
 
     private void addSetEmbargoOption() {
         final IModel<String> nameModel = new StringResourceModel("set-embargo-label", this, null);
-        if (EmbargoUtils.isAdminUser(getJcrSession(), getJcrSession().getUserID())) {
+
+        final boolean isAdminUser = EmbargoUtils.isAdminUser(getJcrSession(), getJcrSession().getUserID());
+        final boolean multiSelectEnabled = getPluginConfig().getAsBoolean("multiSelectEnabled", false);
+        final String[] currentUserEmbargoEnabledGroups = EmbargoUtils.getCurrentUserEmbargoEnabledGroups(getJcrSession(), getJcrSession().getUserID());
+
+        if ( isAdminUser || (multiSelectEnabled && currentUserEmbargoEnabledGroups.length > 1)) {
 
             add(new StdWorkflow<EmbargoWorkflow>("set", nameModel, getPluginContext(), (WorkflowDescriptorModel)getDefaultModel()) {
                 final ArrayList<String> selectedEmbargoGroups = new ArrayList<>();
@@ -252,7 +258,7 @@ protected IDialogService.Dialog createRequestDialog() {
                     return new SetEmbargoDialog(
                             this,
                             selectedEmbargoGroupsModel,
-                            EmbargoUtils.getAllEmbargoEnabledGroups(getJcrSession()));
+                            isAdminUser? EmbargoUtils.getAllEmbargoEnabledGroups(getJcrSession()) : List.of(currentUserEmbargoEnabledGroups));
                 }
 
                 @Override

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/ScheduleDialog.html b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/ScheduleDialog.html
@@ -1,5 +1,5 @@
 <!--
-  * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+  * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
   *
   * Licensed under the Apache License, Version 2.0 (the  "License");
   * you may not use this file except in compliance with the License.

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/ScheduleDialog.java b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/ScheduleDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/SetEmbargoDialog.css b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/SetEmbargoDialog.css
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/SetEmbargoDialog.html b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/SetEmbargoDialog.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+    Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/SetEmbargoDialog.java b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/SetEmbargoDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...hippo/forge/embargo/frontend/plugins/cms/browse/list/EmbargoListColumnProviderPlugin.java b/...hippo/forge/embargo/frontend/plugins/cms/browse/list/EmbargoListColumnProviderPlugin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...e/embargo/frontend/plugins/cms/browse/list/comparators/EmbargoDocumentViewComparator.java b/...e/embargo/frontend/plugins/cms/browse/list/comparators/EmbargoDocumentViewComparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...po/forge/embargo/frontend/plugins/cms/browse/list/resolvers/EmbargoAttributeRenderer.java b/...po/forge/embargo/frontend/plugins/cms/browse/list/resolvers/EmbargoAttributeRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...nehippo/forge/embargo/frontend/plugins/cms/browse/list/resolvers/EmbargoDocumentView.java b/...nehippo/forge/embargo/frontend/plugins/cms/browse/list/resolvers/EmbargoDocumentView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/cms/browse/list/style.css b/cms/src/main/java/org/onehippo/forge/embargo/frontend/plugins/cms/browse/list/style.css
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/demo/cms-dependencies/pom.xml b/demo/cms-dependencies/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>demo-cms-dependencies</artifactId>
   <packaging>pom</packaging>

diff --git a/demo/cms/pom.xml b/demo/cms/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>demo-cms</artifactId>
   <packaging>war</packaging>

diff --git a/demo/essentials/pom.xml b/demo/essentials/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>demo-essentials</artifactId>
   <packaging>war</packaging>

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -5,14 +5,14 @@
   <parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-release</artifactId>
-    <version>15.0.0</version>
+    <version>15.4.0</version>
   </parent>
 
   <name>demo</name>
   <description>demo</description>
   <groupId>org.example</groupId>
   <artifactId>demo</artifactId>
-  <version>7.0.0</version>
+  <version>7.0.1</version>
   <packaging>pom</packaging>
 
   <!-- 
@@ -63,7 +63,7 @@
     <!--***START temporary override of versions*** -->
     <!-- ***END temporary override of versions*** -->
     <bloomreach.forge.embargo.version>${project.version}</bloomreach.forge.embargo.version>
-    <essentials.version>15.0.0</essentials.version>
+    <essentials.version>15.4.0</essentials.version>
     <jsp-api.version>2.2</jsp-api.version>
     <taglibs.version>1.2.5</taglibs.version>
 

diff --git a/demo/repository-data/application/pom.xml b/demo/repository-data/application/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-repository-data</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>demo Repository Data For Application</name>

diff --git a/demo/repository-data/development/pom.xml b/demo/repository-data/development/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-repository-data</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>demo Repository Data For Development</name>

diff --git a/demo/repository-data/pom.xml b/demo/repository-data/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>demo Repository Data</name>

diff --git a/demo/repository-data/site-development/pom.xml b/demo/repository-data/site-development/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-repository-data</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>demo Repository Data For Site Development</name>

diff --git a/demo/repository-data/site/pom.xml b/demo/repository-data/site/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-repository-data</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>demo Repository Data For Site</name>

diff --git a/demo/repository-data/webfiles/pom.xml b/demo/repository-data/webfiles/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-repository-data</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>demo Repository Data Web Files</name>

diff --git a/demo/site/components/pom.xml b/demo/site/components/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-site</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>demo-components</artifactId>
   <packaging>jar</packaging>

diff --git a/demo/site/pom.xml b/demo/site/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>demo-site</artifactId>
   <packaging>pom</packaging>

diff --git a/demo/site/webapp/pom.xml b/demo/site/webapp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.example</groupId>
     <artifactId>demo-site</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
   <artifactId>demo-webapp</artifactId>
   <packaging>war</packaging>
@@ -26,7 +26,7 @@
     <dependency>
       <groupId>org.example</groupId>
       <artifactId>demo-components</artifactId>
-      <version>7.0.0</version>
+      <version>7.0.1</version>
     </dependency>
     <dependency>
       <groupId>org.onehippo.cms7.hst.toolkit-resources.addon</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2015-2022 Bloomreach B.V. (http://www.bloomreach.com)
+  Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,21 +20,20 @@
   <parent>
     <groupId>org.onehippo.cms7</groupId>
     <artifactId>hippo-cms7-release</artifactId>
-    <version>15.0.0</version>
+    <version>15.4.0</version>
   </parent>
 
   <name>Bloomreach Embargo Plugin</name>
   <groupId>org.bloomreach.forge.embargo</groupId>
   <artifactId>embargo</artifactId>
-  <version>7.0.0</version>
+  <version>7.0.1</version>
   <packaging>pom</packaging>
   <url>https://github.com/bloomreach-forge/embargo</url>
 
   <properties>
     <junit.version>4.13.1</junit.version>
 
-    <maven.plugin.site.version>3.7</maven.plugin.site.version>
-    <maven.plugin.jxr.version>3.0.0</maven.plugin.jxr.version>
+    <maven.plugin.jxr.version>3.3.2</maven.plugin.jxr.version>
  </properties>
 
   <developers>
@@ -76,21 +75,16 @@
     <repository>
       <name>Hippo Maven 2 Repository</name>
       <id>hippo-maven2-forge</id>
-      <url>https://maven.onehippo.com/content/repositories/forge-releases/</url>
+      <url>https://maven.bloomreach.com/content/repositories/forge-releases/</url>
      <uniqueVersion>false</uniqueVersion>
     </repository>
   </distributionManagement>
 
   <issueManagement>
-    <system>Hippo JIRA</system>
-    <url>https://issues.onehippo.com/projects/HIPFORGE</url>
+    <system>JIRA</system>
+    <url>https://issues.onehippo.com/projects/FORGE</url>
   </issueManagement>
 
-  <ciManagement>
-    <system>Travic CI</system>
-    <url>https://travis-ci.org/bloomreach-forge/embargo</url>
-  </ciManagement>
-
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -164,12 +158,12 @@
     <repository>
       <id>hippo-maven2</id>
       <name>Hippo Maven 2</name>
-      <url>http://maven.onehippo.com/maven2</url>
+      <url>https://maven.bloomreach.com/maven2</url>
     </repository>
     <repository>
       <id>hippo-maven2-forge</id>
       <name>Hippo Maven 2 Forge Repositories</name>
-      <url>http://maven.onehippo.com/maven2-forge</url>
+      <url>https://maven.bloomreach.com/maven2-forge</url>
     </repository>
   </repositories>
 
@@ -179,7 +173,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>${maven.plugin.site.version}</version>
       </plugin>
     </plugins>
   </build>
@@ -190,10 +183,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <source>1.8</source>
-          <links>
-            <link>http://download.oracle.com/javase/6/docs/api</link>
-          </links>
+          <source>11</source>
         </configuration>
       </plugin>
       <plugin>

diff --git a/repository/pom.xml b/repository/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2013-2022 Hippo B.V. (http://www.onehippo.com)
+  Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.bloomreach.forge.embargo</groupId>
     <artifactId>embargo</artifactId>
-    <version>7.0.0</version>
+    <version>7.0.1</version>
   </parent>
 
   <name>Bloomreach Embargo Plugin Repository</name>

diff --git a/repository/src/main/java/org/onehippo/forge/embargo/repository/EmbargoConstants.java b/repository/src/main/java/org/onehippo/forge/embargo/repository/EmbargoConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Bloomreach B.V. (http://www.bloomreach.com)
+ * Copyright 2024 Bloomreach B.V. (http://www.bloomreach.com)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.