From 39d50c10535192cce7059bfbea3d1f4fffc622b5 Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Mon, 13 May 2019 11:21:13 -0500
Subject: [PATCH] Move 'Translator' classes to .client.j2se subpackage in order
 to allow a Java 9 module for javase

---
 .../j2se}/HtmlAssetTranslator.java            |  2 +-
 .../j2se}/StringsResourceTranslator.java      |  2 +-
 pom.xml                                       |  3 +++
 src/clirr/ignored-differences.xml             | 22 +++++++++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)
 rename javase/src/main/java/com/google/zxing/{ => client/j2se}/HtmlAssetTranslator.java (99%)
 rename javase/src/main/java/com/google/zxing/{ => client/j2se}/StringsResourceTranslator.java (99%)
 create mode 100644 src/clirr/ignored-differences.xml

diff --git a/javase/src/main/java/com/google/zxing/HtmlAssetTranslator.java b/javase/src/main/java/com/google/zxing/client/j2se/HtmlAssetTranslator.java
similarity index 99%
rename from javase/src/main/java/com/google/zxing/HtmlAssetTranslator.java
rename to javase/src/main/java/com/google/zxing/client/j2se/HtmlAssetTranslator.java
index 97cd42de3..30f535bf7 100644
--- a/javase/src/main/java/com/google/zxing/HtmlAssetTranslator.java
+++ b/javase/src/main/java/com/google/zxing/client/j2se/HtmlAssetTranslator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package com.google.zxing.client.j2se;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/javase/src/main/java/com/google/zxing/StringsResourceTranslator.java b/javase/src/main/java/com/google/zxing/client/j2se/StringsResourceTranslator.java
similarity index 99%
rename from javase/src/main/java/com/google/zxing/StringsResourceTranslator.java
rename to javase/src/main/java/com/google/zxing/client/j2se/StringsResourceTranslator.java
index 91ae520f3..caf3533e4 100644
--- a/javase/src/main/java/com/google/zxing/StringsResourceTranslator.java
+++ b/javase/src/main/java/com/google/zxing/client/j2se/StringsResourceTranslator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.zxing;
+package com.google.zxing.client.j2se;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/pom.xml b/pom.xml
index d1a0064c1..7b4956c86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -514,6 +514,9 @@
               </goals>
             </execution>
           </executions>
+          <configuration>
+            <ignoredDifferencesFile>${project.parent.basedir}/src/clirr/ignored-differences.xml</ignoredDifferencesFile>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
diff --git a/src/clirr/ignored-differences.xml b/src/clirr/ignored-differences.xml
new file mode 100644
index 000000000..373d5abca
--- /dev/null
+++ b/src/clirr/ignored-differences.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2019 ZXing authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<differences>
+  <difference>
+    <className>com/google/zxing/*Translator</className>
+    <differenceType>8001</differenceType>
+  </difference>
+</differences>