Revert "Merge with master"

This reverts commit 751fb46.

Author: KebabRonin

application-licensing-common/application-licensing-common-api/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <artifactId>application-licensing-common</artifactId>
     <groupId>com.xwiki.licensing</groupId>
-    <version>1.30.2-SNAPSHOT</version>
+    <version>1.30.1-SNAPSHOT</version>
   </parent>
   <artifactId>application-licensing-common-api</artifactId>
   <name>Licensing Application - Common - API</name>

application-licensing-common/application-licensing-common-api/src/main/java/com/xwiki/licensing/License.java

@@ -267,7 +267,7 @@ public Map<String, String> getLicensee()
     }
 
     /**
-     * Set licensee information.
+     * Set licensee informations.
      *
      * @param licensee a map of licensee information to be assigned.
      */

application-licensing-common/application-licensing-common-model/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <artifactId>application-licensing-common</artifactId>
     <groupId>com.xwiki.licensing</groupId>
-    <version>1.30.2-SNAPSHOT</version>
+    <version>1.30.1-SNAPSHOT</version>
   </parent>
   <artifactId>application-licensing-common-model</artifactId>
   <name>Licensing Application - Common - Model</name>

application-licensing-common/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <artifactId>application-licensing</artifactId>
     <groupId>com.xwiki.licensing</groupId>
-    <version>1.30.2-SNAPSHOT</version>
+    <version>1.30.1-SNAPSHOT</version>
   </parent>
   <artifactId>application-licensing-common</artifactId>
   <packaging>pom</packaging>

application-licensing-licensor/application-licensing-licensor-api/pom.xml

@@ -24,7 +24,7 @@
   <parent>
     <artifactId>application-licensing-licensor</artifactId>
     <groupId>com.xwiki.licensing</groupId>
-    <version>1.30.2-SNAPSHOT</version>
+    <version>1.30.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>application-licensing-licensor-api</artifactId>

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/LicenseManager.java

@@ -42,10 +42,10 @@ public interface LicenseManager
     /**
      * Add a new license to the current set of active license. The added license is checked to be applicable to the
      * current wiki instance, else it will not be added. The license is also checked to be more interesting than the
-     * currently installed licenses. If the license does not provide any improvement of the licensing state of this
-     * wiki, it will not be added. This check does not reject unsigned license, but gives immediate priority to signed
+     * currently installed licenses. If the license does not provides any improvement of the licensing state of this
+     * wiki, it will not be added. This check does not reject unsigned license, but give immediate priority to signed
      * ones over unsigned ones, even if the signed license has narrower constraints. These evaluations are done for
-     * each licensed extension independently, whether these extensions are currently installed or not.
+     * each licensed extension independently, whether these extension are currently installed or not.
      *
      * @param license a license to be added (could be signed or not, unsigned will be stored but not really applied)
      * @return true if the license has been actually added (see above).

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/LicenseValidator.java

@@ -30,7 +30,7 @@
 public interface LicenseValidator
 {
     /**
-     * A LicenseValidator that always returns false. Used when the license validator received is not pristine.
+     * A LicenseValidator that always reply false. Used when the license validator received is not pristine.
      */
     LicenseValidator INVALIDATOR = new LicenseValidator() {
         @Override
@@ -69,7 +69,7 @@ public boolean isValid(License license)
     boolean isSigned(License license);
 
     /**
-     * Check if a license is valid, its constraints are respected.
+     * Check if a license is valid, its constrains are respected.
      * The instance constraint is NOT checked, see {@link #isApplicable(License)}
      *
      * @param license the license to be checked.

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/DefaultLicensedExtensionManager.java

@@ -117,7 +117,7 @@ private Map<String, Collection<InstalledExtension>> getLicensorBackwardDependenc
             // This can happen if the licensor API extension is currently being installed (some components are loaded
             // before the extension is marked as installed).
             this.logger.warn("The Licensor API extension ({}) is not installed on the root namespace as it should."
-                + " Licensed extensions won't be detected correctly as a consequence.", LICENSOR_EXTENSION_ID);
+                + " Licensed extensions won't be detected correctly as a conseuence.", LICENSOR_EXTENSION_ID);
         }
 
         return Collections.emptyMap();

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/GetTrialLicenseListener.java

@@ -98,7 +98,7 @@ public void onEvent(Event event, Object source, Object data)
     }
 
     /**
-     * Try to generate a trial license for the given extension. Since a free extension has no license to cover its
+     * Try to generate a trial license for the given extension. Since a free extension has no license to cover it's
      * dependencies, check also to see if there aren't any paid dependencies, direct or transitive, that need a trial
      * license.
      *

application-licensing-licensor/application-licensing-licensor-api/src/main/java/com/xwiki/licensing/internal/LicenseRenewListener.java

@@ -50,7 +50,7 @@
 
 /**
  * Listen to licensed extensions upgrades or install in order to trigger a license renewal if needed. A license renew
- * is needed if licensed dependencies (direct or transitive) have changed between versions, or if the current license
+ * it's needed if licensed dependencies (direct or transitive) have changed between versions, or if the currnt license
  * has outdated feature ids. Listen also for the install event in case a license was already generated for an older
  * uninstalled version.
  *