Update for 1.3.2

- Switched from maven-assembly-plugin to maven-shade-plugin
  for final packaging
- Updated maven-jar-plugin to 3.2.0

.gitignore

@@ -4,3 +4,4 @@ target
 .DS_Store
 .idea
 symon.iml
+/dependency-reduced-pom.xml

README.md

@@ -1,9 +1,9 @@
 SYMON - A 6502 System Simulator
 ===============================
 
-**Version:** 1.3.1
+**Version:** 1.3.2
 
-**Last Updated:** 12 October, 2019
+**Last Updated:** 08 March, 2021
 
 See the file COPYING for license.
 
@@ -356,7 +356,7 @@ Additional components used in this project are copyright their respective owners
 
 This project would not have been possible without the following resources:
 
-  - [Andrew Jacobs' 6502 Pages](http://www.obelisk.demon.co.uk/6502/), for
+  - [Andrew Jacobs' 6502 Pages](http://obelisk.me.uk/6502/), for
     wonderfully detailed information about the 6502
 
   - [Neil Parker's "The 6502/65C02/65C816 Instruction Set Decoded"](http://www.llx.com/~nparker/a2/opcodes.html),

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.loomcom.symon</groupId>
     <artifactId>symon</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.1</version>
+    <version>1.3.2</version>
     <name>symon</name>
     <url>http://www.loomcom.com/symon</url>
     <properties>
@@ -24,13 +24,13 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
+            <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>3.12.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -44,24 +44,31 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
+                <artifactId>maven-shade-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.0</version>
                 <configuration>
-                    <descriptorRefs>
+                    <transformers>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                    </descriptorRefs>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <archive>
-                        <manifest>
                             <mainClass>com.loomcom.symon.Main</mainClass>
-                        </manifest>
+                        </transformer>
-                    </archive>
+                    </transformers>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
                 </configuration>
                 <executions>
                     <execution>
+                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>single</goal>
+                            <goal>shade</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -81,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
                         <manifest>

src/main/java/com/loomcom/symon/ui/StatusPanel.java

@@ -30,6 +30,7 @@ import com.loomcom.symon.machines.Machine;
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EtchedBorder;
+import javax.swing.plaf.metal.MetalTextFieldUI;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -69,7 +70,7 @@ public class StatusPanel extends JPanel {
     private JTextField xField;
     private JTextField yField;
 
-    private Machine machine;
+    private final Machine machine;
 
     private static final int EMPTY_BORDER = 10;
     private static final Border LABEL_BORDER = BorderFactory.createEmptyBorder(0, 5, 0, 0);
@@ -392,6 +393,13 @@ public class StatusPanel extends JPanel {
         textField.setMaximumSize(size);
         textField.setPreferredSize(size);
         textField.setBackground(Color.WHITE);
+        // Although we usually defer to the system look-and-feel, for
+        // these small text fields in particular, we use a Metal
+        // look-and-feel because native look-and-feel breaks very small
+        // text fields under GTK+ (they are drawn with an inner margin
+        // even if the margin is set to 0)
+        textField.setUI(new MetalTextFieldUI());
+
         return textField;
     }