Skip to content

Commit 2d2c075

Browse files
committed
refactor: migrate from commons-lang3 StringEscapeUtils to commons-text
- Add new blue-ext-commons-text module wrapping Apache Commons Text 1.10.0 - Update blue-ui-core and blue-ui-editor to depend on commons-text - Replace org.apache.commons.lang3.StringEscapeUtils imports with org.apache.commons.text.StringEscapeUtils - Add blue-ext-commons-text module to parent pom
1 parent 670369a commit 2d2c075

File tree

6 files changed

+67
-2
lines changed

6 files changed

+67
-2
lines changed

blue-ext-commons-text/pom.xml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
<parent>
6+
<groupId>com.kunstmusik</groupId>
7+
<artifactId>blue-parent</artifactId>
8+
<version>2.9.1-SNAPSHOT</version>
9+
</parent>
10+
<artifactId>blue-ext-commons-text</artifactId>
11+
<packaging>nbm</packaging>
12+
<build>
13+
<plugins>
14+
<plugin>
15+
<groupId>org.apache.netbeans.utilities</groupId>
16+
<artifactId>nbm-maven-plugin</artifactId>
17+
<configuration>
18+
<publicPackages>
19+
<publicPackage>org.apache.commons.text</publicPackage>
20+
<publicPackage>org.apache.commons.text.*</publicPackage>
21+
</publicPackages>
22+
</configuration>
23+
24+
</plugin>
25+
<plugin>
26+
<groupId>org.apache.maven.plugins</groupId>
27+
<artifactId>maven-jar-plugin</artifactId>
28+
<configuration>
29+
<archive>
30+
<manifestFile>
31+
${project.build.outputDirectory}/META-INF/MANIFEST.MF
32+
</manifestFile>
33+
</archive>
34+
</configuration>
35+
</plugin>
36+
</plugins>
37+
</build>
38+
<dependencies>
39+
<dependency>
40+
<groupId>org.netbeans.api</groupId>
41+
<artifactId>org-netbeans-api-annotations-common</artifactId>
42+
<version>${netbeans.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>org.apache.commons</groupId>
46+
<artifactId>commons-text</artifactId>
47+
<version>1.10.0</version>
48+
<type>jar</type>
49+
</dependency>
50+
</dependencies>
51+
<properties>
52+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
53+
</properties>
54+
</project>

blue-ui-core/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@
140140
<artifactId>blue-ext-commons-lang3</artifactId>
141141
<version>${project.version}</version>
142142
</dependency>
143+
<dependency>
144+
<groupId>com.kunstmusik</groupId>
145+
<artifactId>blue-ext-commons-text</artifactId>
146+
<version>${project.version}</version>
147+
</dependency>
143148
<dependency>
144149
<groupId>com.kunstmusik</groupId>
145150
<artifactId>blue-ext-commons-io</artifactId>

blue-ui-core/src/main/java/blue/orchestra/editor/blueSynthBuilder/BSBCompletionItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.awt.event.KeyEvent;
1212
import javax.swing.text.BadLocationException;
1313
import javax.swing.text.JTextComponent;
14-
import org.apache.commons.lang3.StringEscapeUtils;
14+
import org.apache.commons.text.StringEscapeUtils;
1515
import org.netbeans.api.editor.completion.Completion;
1616
import org.netbeans.spi.editor.completion.CompletionItem;
1717
import org.netbeans.spi.editor.completion.CompletionTask;

blue-ui-editor/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
<artifactId>blue-ext-commons-lang3</artifactId>
5555
<version>${project.version}</version>
5656
</dependency>
57+
<dependency>
58+
<groupId>com.kunstmusik</groupId>
59+
<artifactId>blue-ext-commons-text</artifactId>
60+
<version>${project.version}</version>
61+
</dependency>
5762
<dependency>
5863
<groupId>org.netbeans.api</groupId>
5964
<artifactId>org-netbeans-api-templates</artifactId>

blue-ui-editor/src/main/java/blue/ui/editor/csound/orc/CsoundOrcCompletionItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import javax.swing.text.BadLocationException;
1313
import javax.swing.text.Document;
1414
import javax.swing.text.JTextComponent;
15-
import org.apache.commons.lang3.StringEscapeUtils;
15+
import org.apache.commons.text.StringEscapeUtils;
1616
import org.netbeans.api.editor.completion.Completion;
1717
import org.netbeans.spi.editor.completion.CompletionItem;
1818
import org.netbeans.spi.editor.completion.CompletionResultSet;

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
<module>blue-ext-exml</module>
8585
<module>blue-ext-jython</module>
8686
<module>blue-ext-commons-lang3</module>
87+
<module>blue-ext-commons-text</module>
8788
<module>blue-ext-commons-io</module>
8889
<module>blue-ext-openjfx</module>
8990
<module>blue-utilities</module>

0 commit comments

Comments
 (0)