SAK-44755 samigo-app using mixed apache commons libs (sakaiproject#8877)

* SAK-44755 samigo-app using mixed apache commons libs * Update commons-text scope in master * commons add libs to pom * commons-text remove elasticsearch override
jonny-irving · Dec 8, 2020 · a364c93 · a364c93
1 parent 5af81f1
commit a364c93
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/commons/impl/pom.xml b/commons/impl/pom.xml
@@ -83,6 +83,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

diff --git a/commons/tool/pom.xml b/commons/tool/pom.xml
@@ -68,6 +68,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/master/pom.xml b/master/pom.xml
@@ -774,6 +774,7 @@
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-text</artifactId>
         <version>${sakai.commons-text.version}</version>
+        <scope>provided</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>

diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
@@ -124,13 +124,17 @@
             <artifactId>commons-fileupload</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>

diff --git a/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemBean.java b/samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/bean/author/ItemBean.java
@@ -40,7 +40,7 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.sakaiproject.tool.assessment.data.ifc.assessment.ItemDataIfc;
 import org.sakaiproject.component.cover.ServerConfigurationService;

diff --git a/...rg/sakaiproject/tool/assessment/ui/listener/author/CalculatedQuestionExtractListener.java b/...rg/sakaiproject/tool/assessment/ui/listener/author/CalculatedQuestionExtractListener.java
@@ -35,7 +35,7 @@
 import javax.faces.event.ActionEvent;
 import javax.faces.event.ActionListener;
 
-import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.sakaiproject.tool.assessment.services.GradingService;
 import org.sakaiproject.tool.assessment.ui.bean.author.CalculatedQuestionBean;
 import org.sakaiproject.tool.assessment.ui.bean.author.CalculatedQuestionCalculationBean;

diff --git a/search/elasticsearch/impl/pom.xml b/search/elasticsearch/impl/pom.xml
@@ -77,7 +77,6 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>