Merge remote-tracking branch 'upstream/master'

dspace-api/src/main/java/org/dspace/browse/ItemCounter.java

@@ -49,7 +49,7 @@ public class ItemCounter
     protected ConfigurationService configurationService;
 	
     /**
-     * Construct a new item counter which will use the give DSpace Context
+     * Construct a new item counter which will use the given DSpace Context
      * 
      * @param context current context
      * @throws ItemCountException if count error

dspace-api/src/main/java/org/dspace/submit/lookup/PubmedService.java

@@ -76,7 +76,7 @@ public class PubmedService
         if (StringUtils.isNotBlank(title))
         {
             query.append("((").append(title).append("[TI]) OR (");
-            // [TI] non funziona sempre, titolo di capitoli di libro
+            // [TI] does not always work, book chapter title
             query.append("(").append(title).append("[book]))");
         }
         if (StringUtils.isNotBlank(author))

dspace-sword/src/main/java/org/dspace/sword/ItemCollectionGenerator.java

@@ -32,11 +32,11 @@ public class ItemCollectionGenerator extends ATOMCollectionGenerator
     }
 
     /**
-     * Build the collection around the give DSpaceObject.  If the object
+     * Build the collection around the given DSpaceObject.  If the object
      * is not an instance of a DSpace Item this method will throw an
      * exception.
      *
-     * @param dso the dso for which the collection should be build
+     * @param dso the dso for which the collection should be built
      * @throws DSpaceSWORDException if the dso is not an instance of Item
      */
     public Collection buildCollection(DSpaceObject dso)
@@ -95,7 +95,7 @@ public class ItemCollectionGenerator extends ATOMCollectionGenerator
             scol.setAbstract(dcAbstract);
         }
 
-        // do we suppot mediated deposit
+        // do we support mediated deposit
         scol.setMediation(swordConfig.isMediated());
 
         // the list of mime types that we accept, which we take from the

dspace-xmlui-mirage2/src/main/webapp/xsl/core/page-structure.xsl

@@ -237,12 +237,12 @@
             <!-- The following javascript removes the default text of empty text areas when they are focused on or submitted -->
             <!-- There is also javascript to disable submitting a form when the 'enter' key is pressed. -->
             <script>
-                //Clear default text of emty text areas on focus
+                //Clear default text of empty text areas on focus
                 function tFocus(element)
                 {
                 if (element.value == '<i18n:text>xmlui.dri2xhtml.default.textarea.value</i18n:text>'){element.value='';}
                 }
-                //Clear default text of emty text areas on submit
+                //Clear default text of empty text areas on submit
                 function tSubmit(form)
                 {
                 var defaultedElements = document.getElementsByTagName("textarea");

dspace/config/crosswalks/oai/xoai.xml

@@ -60,9 +60,9 @@
         </Context>
 
         <!--
-            OpenAIRE Guidelines 1.1:
+            OpenAIRE Guidelines 3.0:
 
-            - https://guidelines.openaire.eu/en/latest/
+            - https://guidelines.openaire.eu/
 
             There is a limitation over the embargoedEndDate parameter:
 
@@ -79,7 +79,7 @@
             <Format ref="oaidc"/>
             <Format ref="mets"/>
             <Description>
-                This context complies with OpenAIRE rules.
+                This contexts complies with OpenAIRE Guidelines for Literature Repositories v3.0.
             </Description>
         </Context>
     </Contexts>
@@ -240,6 +240,8 @@
         <Filter id="openAireFilter">
             <Definition>
                 <And>
+                    <LeftCondition>
+                        <And>
                             <LeftCondition>
                                 <And>
                                     <LeftCondition>
@@ -251,11 +253,13 @@
                                 </And>
                             </LeftCondition>
                             <RightCondition>
-                        <And>
-                            <LeftCondition>
                                 <Custom ref="driverDocumentTypeCondition"/>
+                            </RightCondition>
+                        </And>
                     </LeftCondition>
                     <RightCondition>
+                        <Or>
+                            <LeftCondition>
                                 <And>
                                     <LeftCondition>
                                         <Or>
@@ -267,12 +271,15 @@
                                             </RightCondition>
                                         </Or>
                                     </LeftCondition>
+                                    <RightCondition>
+                                        <Custom ref="driverAccessCondition"/>
+                                    </RightCondition>
+                                </And>
+                            </LeftCondition>
                             <RightCondition>
                                 <Custom ref="openaireRelationCondition"/>
                             </RightCondition>
-                                </And>
+                        </Or>
-                            </RightCondition>
-                        </And>
                     </RightCondition>
                 </And>
             </Definition>
@@ -360,6 +367,7 @@
                     <string>annotation</string>
                     <string>contributionToPeriodical</string>
                     <string>patent</string>
+                    <string>dataset</string>
                     <string>other</string>
                 </list>
             </Configuration>
@@ -374,7 +382,6 @@
                 <string name="field">dc.rights</string>
                 <string name="operator">contains</string>
                 <list name="values">
-                    <string>open access</string>
                     <string>openAccess</string>
                 </list>
             </Configuration>
@@ -400,7 +407,7 @@
             <Configuration>
                 <string name="field">dc.relation</string>
                 <string name="operator">starts_with</string>
-                <string name="value">info:eu-repo/grantAgreement/EC</string>
+                <string name="value">info:eu-repo/grantAgreement/</string>
             </Configuration>
         </CustomCondition>
     </Filters>
@@ -412,8 +419,8 @@
             <!-- Just an alias -->
         </Set>
         <Set id="openaireSet">
-            <Spec>ec_fundedresources</Spec>
+            <Spec>openaire</Spec>
-            <Name>EC_fundedresources set</Name>
+            <Name>OpenAIRE</Name>
             <!-- Just an alias -->
         </Set>
     </Sets>

pom.xml

@@ -1140,12 +1140,12 @@
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>pdfbox</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>fontbox</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.2</version>
             </dependency>
             <dependency>
 	        <groupId>org.bouncycastle</groupId>