[2.19.x] Fixed all tests, removed modified Solr 7.4.0 files so the in…

…cluded Solr 8.8.1 works properly (#6558)
codice · Apr 21, 2021 · 01b622f · 01b622f
1 parent 39c5817
commit 01b622f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 4,217 deletions.
diff --git a/catalog/solr/catalog-solr-solrclient/pom.xml b/catalog/solr/catalog-solr-solrclient/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.13.2</version>
+            <version>${solr.log4j.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/distribution/ddf-common/src/main/resources/security/default.policy b/distribution/ddf-common/src/main/resources/security/default.policy
@@ -480,6 +480,10 @@ grant codeBase "file:/PAXEXAM-PROBE/sample-soap-endpoint/ddf.thirdparty.restito/
     permission java.io.FilePermission "<<ALL FILES>>", "read,write,delete,execute";
 }
 
+grant codeBase "file:/org.jline.terminal" {
+    permission java.io.FilePermission "<<ALL FILES>>", "execute";
+}
+
 grant {
     permission java.io.FilePermission "${test.resources.dir}", "read, write, delete";
     permission java.io.FilePermission "${test.resources.dir}${/}-", "read, write, delete";

diff --git a/distribution/solr-distro/src/main/resources/bin/solr b/distribution/solr-distro/src/main/resources/bin/solr
diff --git a/distribution/solr-distro/src/main/resources/bin/solr.cmd b/distribution/solr-distro/src/main/resources/bin/solr.cmd
diff --git a/features/admin/pom.xml b/features/admin/pom.xml
@@ -213,7 +213,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${apache-log4j.version}</version>
+            <version>${solr.log4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/features/apps/pom.xml b/features/apps/pom.xml
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${apache-log4j.version}</version>
+            <version>${solr.log4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/features/install-profiles/pom.xml b/features/install-profiles/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>${apache-log4j.version}</version>
+            <version>${solr.log4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/features/security/src/main/feature/feature.xml b/features/security/src/main/feature/feature.xml
@@ -414,6 +414,7 @@
 
     <feature name="security-filter-csrf" version="${project.version}"
              description="CSRF Filter for web applications.">
+        <feature>security-core-api</feature>
         <bundle>mvn:ddf.security.filter/security-filter-csrf/${project.version}</bundle>
     </feature>
 
@@ -616,6 +617,7 @@
     </feature>
 
     <feature name="platform-email" version="${project.version}" start-level="50">
+        <feature>security-encryption</feature>
         <bundle>mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
         <bundle>mvn:com.sun.mail/javax.mail/${javax-mail.version}</bundle>
         <feature>guava</feature>