From c459c91012887fc29e4675651f47674d10721aff Mon Sep 17 00:00:00 2001
From: Sergey Ponomarev <stokito@gmail.com>
Date: Thu, 17 Oct 2024 19:39:59 +0300
Subject: [PATCH] OF-2889: i18n properties: don't convert from UTF-8 to Latin1

---
 i18n/pom.xml    | 31 -------------------------------
 plugins/pom.xml | 25 +------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/i18n/pom.xml b/i18n/pom.xml
index 87e5ed8779..8df7fed05d 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -9,35 +9,4 @@
     <artifactId>i18n</artifactId>
     <name>Internationalization files for Openfire</name>
     <description>These files are shared among the starter and xmppserver modules</description>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <!--
-                    Java has trouble reading translations from UTF-8 files. To work around that,
-                    this plugin ensures that Java-compatible encoding is used.
-                    See https://stackoverflow.com/questions/4659929/how-to-use-utf-8-in-resource-properties-with-resourcebundle
-                  -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>native2ascii-maven-plugin</artifactId>
-                <version>2.0.1</version>
-                <executions>
-                    <execution>
-                        <id>utf8-to-latin1</id>
-                        <goals>
-                            <goal>inplace</goal>
-                        </goals>
-                        <configuration>
-                            <dir>${project.build.outputDirectory}</dir>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5d6b1b417b..f6b9196da7 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -184,9 +184,7 @@
             </plugin>
             <plugin>
                 <!--
-                    Java has trouble reading translations from UTF-8 files. To work around that,
-                    this plugin copies the i18n files from source to the build directory, to be
-                    modified later by the native2ascii-maven-plugin.
+                    This plugin copies the i18n files from source to the build directory.
                   -->
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.1.0</version>
@@ -208,27 +206,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <!--
-                    Java has trouble reading translations from UTF-8 files. To work around that,
-                    this plugin ensures that Java-compatible encoding is used.
-                    See https://stackoverflow.com/questions/4659929/how-to-use-utf-8-in-resource-properties-with-resourcebundle
-                  -->
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>native2ascii-maven-plugin</artifactId>
-                <version>2.0.1</version>
-                <executions>
-                    <execution>
-                        <id>utf8-to-latin1</id>
-                        <goals>
-                            <goal>inplace</goal>
-                        </goals>
-                        <configuration>
-                            <dir>${project.build.directory}/i18n/</dir>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>