Merge branch 'master' into consolidation/some_name_mappings

core/src/main/java/com/devonfw/tools/solicitor/config/ConfigFactory.java

@@ -126,8 +126,10 @@ public ModelRoot createConfig(String url) {
         rs.setSource(rc.getSource());
         rs.setUsagePattern(rc.getUsagePattern());
         if (rc.getRepoType() != null) {
-          this.deprecationChecker.check(true,
-              "The parameter 'repoType' in the reader configuration is deprecated, see https://github.com/devonfw/solicitor/issues/190");
+          this.deprecationChecker.check(false,
+              "The parameter 'repoType' in the reader configuration is deprecated, see "
+                  + "https://github.com/devonfw/solicitor/issues/190 and "
+                  + "https://github.com/devonfw/solicitor/issues/263");
         }
         rs.setRepoType(rc.getRepoType());
         rs.setConfiguration(rc.getConfiguration());

core/src/main/java/com/devonfw/tools/solicitor/reader/npmlicensecrawler/NpmLicenseCrawlerReader.java

@@ -69,12 +69,16 @@ public Set<String> getSupportedTypes() {
   public void readInventory(String type, String sourceUrl, Application application, UsagePattern usagePattern,
       String repoType, Map<String, String> configuration) {
 
-    this.deprecationChecker.check(true, "Use of Reader of type '" + SUPPORTED_TYPE
-        + "' is deprecated, use 'npm-license-checker' instead. See https://github.com/devonfw/solicitor/issues/125");
+    this.deprecationChecker.check(false,
+        "Use of Reader of type '" + SUPPORTED_TYPE
+            + "' is deprecated, use 'npm-license-checker' instead. See https://github.com/devonfw/solicitor/issues/125"
+            + " and https://github.com/devonfw/solicitor/issues/263");
 
     if (SUPPORTED_TYPE_DEPRECATED.equals(type)) {
-      this.deprecationChecker.check(true, "Use of type 'npm' is deprecated. Change type in config to '" + SUPPORTED_TYPE
-          + "'. See https://github.com/devonfw/solicitor/issues/62");
+      this.deprecationChecker.check(false,
+          "Use of type 'npm' is deprecated. Change type in config to '" + SUPPORTED_TYPE
+              + "'. See https://github.com/devonfw/solicitor/issues/62 and "
+              + "https://github.com/devonfw/solicitor/issues/263");
     }
     int components = 0;
     int licenses = 0;

core/src/main/java/com/devonfw/tools/solicitor/ruleengine/drools/ModelHelper.java

@@ -200,8 +200,8 @@ public static boolean match(String input, String condition) {
     }
     if (input != null && condition != null) {
       if (condition.startsWith(REGEX_PREFIX)) {
-        deprecationChecker.check(true,
-            "Use of 'REGEX:' prefix notation is deprecated, use '(REGEX)' suffix instead. See https://github.com/devonfw/solicitor/issues/78");
+        deprecationChecker.check(false, "Use of 'REGEX:' prefix notation is deprecated, use '(REGEX)' suffix instead. "
+            + "See https://github.com/devonfw/solicitor/issues/78 and https://github.com/devonfw/solicitor/issues/263");
         String pattern = condition.substring(REGEX_PREFIX.length());
         return input.matches(pattern);
       }

core/src/main/resources/com/devonfw/tools/solicitor/config/solicitor_base.cfg

@@ -26,7 +26,7 @@
     "templateSource" : "classpath:com/devonfw/tools/solicitor/rules/rule_templates/LicenseAssignment.drt",
     "ruleGroup" : "LicenseAssignmentProject",
     "description" : "setting license in case that no one was detected or overwriting a wrongly detected license (project overrides; 'old' rule structure)",
-    "deprecationWarnOnly" : true,
+    "deprecationWarnOnly" : false,
     "deprecationDetails" : "Use of decision table LicenseAssignmentProject is deprecated, use LicenseAssignmentV2Project instead. See release notes of release 1.4.0 for migration hints"
   },{
     "type" : "dt",

core/src/test/resources/ownlicenseinfo/solicitor_own.cfg

@@ -16,8 +16,7 @@
     "readers" : [ {
       "type" : "maven",
       "source" : "file:target/generated-resources/licenses.xml",
-      "usagePattern" : "DYNAMIC_LINKING",
-	  "repoType" : "maven"
+      "usagePattern" : "DYNAMIC_LINKING"
     } ]
   } ],
   "writers" : [ {

documentation/master-solicitor.asciidoc

@@ -1417,12 +1417,12 @@ wrong/misleading output) the first stage of deprecation will be skipped.
 === List of Deprecated Features
 The following features are deprecated via the above mechanism:
 
-* Reader of type "npm-license-crawler-csv" (use Reader of type "npm-license-checker" instead); Stage 1 from Version 1.4.0 on; see https://github.com/devonfw/solicitor/issues/125
+* Reader of type "npm-license-crawler-csv" (use Reader of type "npm-license-checker" instead); Stage 2 from Version 1.24.0 on; see https://github.com/devonfw/solicitor/issues/125 and https://github.com/devonfw/solicitor/issues/263
 * Reader of type "gradle"  (use Reader of type "gradle2" instead); Stage 2 from Version 1.0.5 on; see https://github.com/devonfw/solicitor/issues/58
-* Reader of type "npm"; Stage 1 from Version 1.0.8 on; see https://github.com/devonfw/solicitor/issues/62
-* "REGEX:" prefix notation in rule templates (use "(REGEX)" suffix instead); Stage 1 from Version 1.3.0 on; see https://github.com/devonfw/solicitor/issues/78
-* Use of `LicenseAssignmentProject.xls` decision table (use `LicenseAssignmentV2Project.xls` instead); Stage 1 from Version 1.4.0 on
-* Use of `repoType` in the configuration of readers, see <<Applications>>; Stage 1 from Version 1.14.0 on; see https://github.com/devonfw/solicitor/issues/190
+* Reader of type "npm"; Stage 2 from Version 1.24.0 on; see https://github.com/devonfw/solicitor/issues/62 and https://github.com/devonfw/solicitor/issues/263
+* "REGEX:" prefix notation in rule templates (use "(REGEX)" suffix instead); Stage 2 from Version 1.24.0 on; see https://github.com/devonfw/solicitor/issues/78 and https://github.com/devonfw/solicitor/issues/263
+* Use of `LicenseAssignmentProject.xls` decision table (use `LicenseAssignmentV2Project.xls` instead); Stage 2 from Version 1.24.0 on; see https://github.com/devonfw/solicitor/issues/263
+* Use of `repoType` in the configuration of readers, see <<Applications>>; Stage 2 from Version 1.24.0 on; see https://github.com/devonfw/solicitor/issues/190 and https://github.com/devonfw/solicitor/issues/263
 * Running Solicitor on Java 8; Stage 1 from Version 1.22.0 on; see https://github.com/devonfw/solicitor/issues/247
 * LicenseUrl guessing; Stage 1 from Version 1.23.0 on; see https://github.com/devonfw/solicitor/issues/255
 
@@ -1755,6 +1755,7 @@ Spring beans implementing this interface will be called at certain points in the
 [appendix]
 == Release Notes
 Changes in 1.24.0::
+* https://github.com/devonfw/solicitor/issues/263: Some features were pushed from deprecation stage 1 to stage 2, which means they do not longer work with default configuration: repoType attribute, npm and npm-license-crawler readers, REGEX prefix notation, LicenseAssignmentProject.xls. See <<List of Deprecated Features>> for details.
 * https://github.com/devonfw/solicitor/pull/265: Added some license name mappings.
 
 Changes in 1.23.0::