Added support for APL-3.0-or-later

project.json

@@ -1,7 +1,7 @@
 {
     "projectinfo": {
         "name": "OpenLRAE",
-        "version": "1.0",
+        "version": "1.4-SNAPSHOT",
         "redistribution": "SOFTWARE_PACKAGE_OR_SAAS",
         "licenses": ["APACHE_2_0"]
     },

src/main/resources/com/manolodominguez/openlrae/i18n/CompatibilityWarnings.properties

@@ -71,3 +71,9 @@ GPL_3_0_ONLY_STATIC_AGPL_3_0_ONLY=You can link statically a GPL-3.0-only compone
 GPL_3_0_OR_LATER_STATIC_AGPL_3_0_ONLY=You can link statically a GPL-3.0-or-later component to an AGPL-3.0-only project. The project can be released under AGPL-3.0-only except for that component that has to maintain its own GPL-3.0-or-later license.
 LGPL_2_1_ONLY_STATIC_LGPL_2_1_OR_LATER=You can link statically a LGPL-2.1-only component to an LGPL-2.1-or-later project, but this project cannot be released under greater versions of LGPL or GPL (v3.0 or later) in the future.
 LGPL_2_1_OR_LATER_STATIC_LGPL_2_1_ONLY=You can link statically a LGPL-2.1-or-later component to an LGPL-2.1-only project, but this project cannot be released under greater versions of LGPL or GPL (v3.0 or later) in the future.
+AGPL_3_0_OR_LATER_DYNAMIC_AGPL_3_0_ONLY=You can link dinamically an AGPL-3.0-or-later to an AGPL-3.0-only project, but you have to redistribute the AGPL-3.0-or-later component under AGPL-3.0-or-later and the rest of the project under AGPL-3.0-only. You cannot release the whole under AGPL-3.0-only.
+GPL_3_0_ONLY_STATIC_AGPL_3_0_OR_LATER=You can link statically a GPL-3.0-only component to an AGPL-3.0-or-later project. The project can be released under AGPL-3.0-or-later except for that component that has to maintain its own GPL-3.0-only license.
+GPL_3_0_OR_LATER_STATIC_AGPL_3_0_OR_LATER=You can link statically a GPL-3.0-or-later component to an AGPL-3.0-or-later project. The project can be released under AGPL-3.0-or-later except for that component that has to maintain its own GPL-3.0-or-later license.
+AGPL_3_0_OR_LATER_STATIC_AGPL_3_0_ONLY=You can link statically an AGPL-3.0-or-later component to an AGPL-3.0-only project. The project can be released under AGPL-3.0-only except for that component that has to maintain its own AGPL-3.0-or-later license.
+AGPL_3_0_OR_LATER_STATIC_GPL_3_0_ONLY=You can link statically an AGPL-3.0-or-later component to an GPL-3.0-only project. The project can be released under GPL-3.0-only except for that component that has to maintain its own AGPL-3.0-or-later license.
+AGPL_3_0_OR_LATER_STATIC_GPL_3_0_OR_LATER=You can link statically an AGPL-3.0-or-later component to an GPL-3.0-or-later project. The project can be released under GPL-3.0-or-later except for that component that has to maintain its own AGPL-3.0-or-later license.

src/main/resources/com/manolodominguez/openlrae/i18n/CompatibilityWarnings_es.properties

@@ -71,3 +71,9 @@ GPL_3_0_ONLY_STATIC_AGPL_3_0_ONLY=Puede enlazar est\u00e1ticamente un componente
 GPL_3_0_OR_LATER_STATIC_AGPL_3_0_ONLY=Puede enlazar est\u00e1ticamente un componente GPL-3.0-or-later en un proyecto AGPL-3.0-only. El proyecto se puede liberar con licencia AGPL-3.0-only excepto dicho componente que deber\u00e1 mantener su propia licencia GPL-3.0-or-later.
 LGPL_2_1_ONLY_STATIC_LGPL_2_1_OR_LATER=Puede enlazar est\u00e1ticamente un componente LGPL-2.1-only en un proyecto LGPL-2.1-or-later, pero el proyecto no podr\u00e1 liberarse bajo una versi\u00f3n posterior de la licencia LGPL o GPL (v3.0 o siguientes) en el futuro.
 LGPL_2_1_OR_LATER_STATIC_LGPL_2_1_ONLY=Puede enlazar est\u00e1ticamente un componente LGPL-2.1-or-later en un proyecto LGPL-2.1-only, pero el proyecto no podr\u00e1 liberarse bajo una versi\u00f3n posterior de la licencia LGPL o GPL (v3.0 o siguientes) en el futuro.
+AGPL_3_0_OR_LATER_DYNAMIC_AGPL_3_0_ONLY=Puede enlazar din\u00e1micamente un componente AGPL-3.0-or-later en un proyecto AGPL-3.0-only, but tendr\u00e1 que redistribuir el componente AGPL-3.0-or-later bajo los t\u00e9rminos de la licencia AGPL-3.0-or-later y el resto del proyecto bajo los t\u00e9rminos de la licencia AGPL-3.0-only. No puede licenciar el conjunto completo con AGPL-3.0-only.
+GPL_3_0_ONLY_STATIC_AGPL_3_0_OR_LATER=Puede enlazar est\u00e1ticamente un componente GPL-3.0-only en un proyecto AGPL-3.0-or-later. El proyecto se puede liberar con licencia AGPL-3.0-or-later excepto dicho componente que deber\u00e1 mantener su propia licencia GPL-3.0-only.
+GPL_3_0_OR_LATER_STATIC_AGPL_3_0_OR_LATER=Puede enlazar est\u00e1ticamente un componente GPL-3.0-or-later en un proyecto AGPL-3.0-or-later. El proyecto se puede liberar con licencia AGPL-3.0-or-later excepto dicho componente que deber\u00e1 mantener su propia licencia GPL-3.0-or-later.
+AGPL_3_0_OR_LATER_STATIC_AGPL_3_0_ONLY=Puede enlazar est\u00e1ticamente un componente AGPL-3.0-or-later en un proyecto AGPL-3.0-only. El proyecto se puede liberar con licencia AGPL-3.0-only excepto dicho componente que deber\u00e1 mantener su propia licencia AGPL-3.0-or-later.
+AGPL_3_0_OR_LATER_STATIC_GPL_3_0_ONLY=Puede enlazar est\u00e1ticamente un componente AGPL-3.0-or-later en un proyecto GPL-3.0-only. El proyecto se puede liberar con licencia GPL-3.0-only excepto dicho componente que deber\u00e1 mantener su propia licencia AGPL-3.0-or-later.
+AGPL_3_0_OR_LATER_STATIC_GPL_3_0_OR_LATER=Puede enlazar est\u00e1ticamente un componente AGPL-3.0-or-later en un proyecto GPL-3.0-or-later. El proyecto se puede liberar con licencia GPL-3.0-or-later excepto dicho componente que deber\u00e1 mantener su propia licencia AGPL-3.0-or-later.

src/test/java/com/manolodominguez/openlrae/analysis/riskanalysers/RiskAnalyserLimitedSetOfPotentialComponentsLicensesTest.java

@@ -124,13 +124,13 @@ void testRunAnalyser() {
         assertTrue(!result.getTips().isEmpty());
         assertTrue(result.getRiskExposure() >= 0.0f);
         assertTrue(result.getRiskExposure() <= 1.0f);
-        assertEquals(0.5f, result.getRiskExposure());
+        assertEquals(0.5192f, result.getRiskExposure());
         assertTrue(result.getRiskImpact() >= 0.0f);
         assertTrue(result.getRiskImpact() <= 1.0f);
-        assertEquals(0.5f, result.getRiskImpact());
+        assertEquals(0.5192f, result.getRiskImpact());
         assertTrue(result.getRiskValue() >= 0.0f);
         assertTrue(result.getRiskValue() <= 1.0f);
-        assertEquals(0.25f, result.getRiskValue());
+        assertEquals(0.2696f, result.getRiskValue());
     }
 
     /**

src/test/java/com/manolodominguez/openlrae/analysis/riskanalysers/RiskAnalyserLimitedSetOfPotentialProjectLicensesTest.java

@@ -124,13 +124,13 @@ void testRunAnalyser() {
         assertTrue(!result.getTips().isEmpty());
         assertTrue(result.getRiskExposure() >= 0.0f);
         assertTrue(result.getRiskExposure() <= 1.0f);
-        assertEquals(0.9091f, result.getRiskExposure());
+        assertEquals(0.913f, result.getRiskExposure());
         assertTrue(result.getRiskImpact() >= 0.0f);
         assertTrue(result.getRiskImpact() <= 1.0f);
-        assertEquals(0.3633f, result.getRiskImpact());
+        assertEquals(0.3621f, result.getRiskImpact());
         assertTrue(result.getRiskValue() >= 0.0f);
         assertTrue(result.getRiskValue() <= 1.0f);
-        assertEquals(0.3303f, result.getRiskValue());
+        assertEquals(0.3306f, result.getRiskValue());
     }
 
     /**

src/test/java/com/manolodominguez/openlrae/baseofknowledge/basevalues/SupportedLicensesTest.java

@@ -53,8 +53,8 @@ void tearDown() {
     @Test
     void testItemsNumber() {
         System.out.println("items number");
-        // Currently there are 25 licenses defined in enum
-        assertEquals(25, SupportedLicenses.values().length);
+        // Currently there are 26 licenses defined in enum
+        assertEquals(26, SupportedLicenses.values().length);
     }
 
     /**
@@ -69,6 +69,7 @@ void testItems() {
         for (SupportedLicenses license : SupportedLicenses.values()) {
             switch (license) {
                 case AGPL_3_0_ONLY:
+                case AGPL_3_0_OR_LATER:
                 case APACHE_1_1:
                 case APACHE_2_0:
                 case ARTISTIC_2_0:
@@ -109,8 +110,8 @@ void testItems() {
     @Test
     void testGetLicensesForProjects() {
         System.out.println("getLicensesForProjects");
-        // Currently there are 22 licenses for projects defined in enum
-        assertEquals(22, SupportedLicenses.getLicensesForProjects().length);
+        // Currently there are 23 licenses for projects defined in enum
+        assertEquals(23, SupportedLicenses.getLicensesForProjects().length);
     }
 
     /**
@@ -119,8 +120,8 @@ void testGetLicensesForProjects() {
     @Test
     void testGetLicensesForComponents() {
         System.out.println("getLicensesForComponents");
-        // Currently there are 25 licenses for components defined in enum
-        assertEquals(25, SupportedLicenses.getLicensesForComponents().length);
+        // Currently there are 26 licenses for components defined in enum
+        assertEquals(26, SupportedLicenses.getLicensesForComponents().length);
     }
 
     /**
@@ -139,8 +140,8 @@ void testGetFicticiousLicenses() {
     @Test
     void testGetNotFicticiousLicenses() {
         System.out.println("getNotFicticiousLicenses");
-        // Currently there are 22 not ficticious licenses defined in enum
-        assertEquals(22, SupportedLicenses.getNotFicticiousLicenses().length);
+        // Currently there are 23 not ficticious licenses defined in enum
+        assertEquals(23, SupportedLicenses.getNotFicticiousLicenses().length);
     }
 
 }