upgraded dependencies and jitpack build

pegasystems · Dec 29, 2021 · ab4aa20 · ab4aa20
1 parent b8b01ed
commit ab4aa20
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,8 @@ import net.ltgt.gradle.errorprone.CheckSeverity
 plugins {
     id 'java'
     id 'application'
-    id 'net.ltgt.errorprone'        version '0.8.1'
-    id 'com.github.spotbugs'        version '2.0.0'
-    id "com.jfrog.bintray"          version '1.8.5'
+    id 'net.ltgt.errorprone'        version '2.0.2'
+    id 'com.github.spotbugs'        version '4.8.0'
     id 'nebula.release'             version '15.3.1'
 }
 
@@ -21,10 +20,8 @@ apply from: "$rootDir/gradle/publishing.gradle"
 
 repositories {
     mavenLocal()
-    maven {
-        url "https://dl.bintray.com/pegasystems/fringeutils" 
-    }
     mavenCentral()
+    maven { url "https://jitpack.io" }
 }
 
 dependencies {
@@ -33,15 +30,27 @@ dependencies {
     errorproneJavac("com.google.errorprone:javac:latest.release")
 
     implementation 'gnu.getopt:java-getopt:1.0.13'
+    //implementation 'com.pega.gcs:fringeutils-common:3.4.0-SNAPSHOT'
+    implementation 'com.github.pegasystems:fringeutils-common:v3.4.0'
 
-    implementation 'com.pega.gcs:fringeutils-common:3.3.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+}
 
-    testImplementation 'junit:junit:4.12'
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 application {
     mainClassName = "com.pega.gcs.tracerviewer.TracerViewer"
-    applicationDefaultJvmArgs = ['XXX_SET_USER_DIR_XXX', '-Dfile.encoding=UTF-8', '-Xms512M', '-Xmx1G', '-XX:+UseParNewGC', '-XX:+UseConcMarkSweepGC']
+    applicationDefaultJvmArgs = [
+                                    'XXX_SET_USER_DIR_XXX',
+                                    '-Dfile.encoding=UTF-8',
+                                    '-Xms1G',
+                                    '-Xmx2G',
+                                    '-XX:+UseG1GC',
+                                    '-XX:+UseStringDeduplication'
+                                ]
 }
 
 tasks.withType(JavaCompile) {

diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -36,29 +36,6 @@ publishing {
     }
 }
 
-bintray {
-    user = resolveProperty('bintrayUsername')
-    key = resolveProperty('bintrayKey')
-    publications = ['mavenJava']
-    publish = true
-
-    pkg {
-        def orgName = rootProject.findProperty('organization')
-
-        userOrg = orgName
-        repo = rootProject.findProperty('release.stage') == 'final' ? releaseRepository : snapshotRepository
-        name = project.name
-        websiteUrl = 'https://github.com/pegasystems/pega-tracerviewer'
-        issueTrackerUrl = 'https://github.com/pegasystems/pega-tracerviewer/issues'
-        vcsUrl = 'https://github.com/pegasystems/pega-tracerviewer.git'
-        licenses = ['Apache-2.0']
-        labels = ['java', 'pega', 'pega trace xml']
-        publicDownloadNumbers = true
-        githubRepo = 'pegasystems/pega-tracerviewer'
-        githubReleaseNotesFile = 'README.md'
-    }
-}
-
 /*
  * Check environment for property and if that fails 
  * ask gradle to find the property somewhere within

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/pega/gcs/tracerviewer/TraceEventFactory.java b/src/main/java/com/pega/gcs/tracerviewer/TraceEventFactory.java
@@ -114,6 +114,10 @@ public class TraceEventFactory {
         // InteractionQueryData
         xmlElementType = new XMLElementType("InteractionQueryData", "&", true);
         xmlElementTableTypeMap.put(xmlElementType.getElementName(), xmlElementType);
+
+        // InteractionQueryParam
+        xmlElementType = new XMLElementType("InteractionQueryParam", "&", true);
+        xmlElementTableTypeMap.put(xmlElementType.getElementName(), xmlElementType);
     }
 
     public static DateFormat getDateFormat() {

diff --git a/src/main/java/com/pega/gcs/tracerviewer/TraceTreeTableMouseListener.java b/src/main/java/com/pega/gcs/tracerviewer/TraceTreeTableMouseListener.java
@@ -26,6 +26,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
 
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
@@ -437,8 +439,23 @@ protected void done() {
 
                                         success = get();
 
+                                    } catch (CancellationException ce) {
+
+                                        LOG.error("Trace event export task cancelled.");
+
+                                    } catch (ExecutionException ee) {
+
+                                        String message = ee.getCause().getMessage() + " has occured while exporting.";
+
+                                        LOG.error(message, ee);
+
+                                        JOptionPane.showMessageDialog(mainWindow, message, "Error",
+                                                JOptionPane.ERROR_MESSAGE);
+
                                     } catch (Exception e) {
-                                        LOG.error("TraceEventTreeNodeXMLExportTask erorr: ", e);
+
+                                        LOG.error("TraceEventTreeNodeXMLExportTask error", e);
+
                                     } finally {
 
                                         modalProgressMonitor.close();

diff --git a/src/main/java/com/pega/gcs/tracerviewer/TraceXMLLoadSnippetJDialog.java b/src/main/java/com/pega/gcs/tracerviewer/TraceXMLLoadSnippetJDialog.java
@@ -12,6 +12,7 @@
 
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -182,6 +183,7 @@ private JTextArea getXmlSnippetJTextArea() {
         if (xmlSnippetJTextArea == null) {
             xmlSnippetJTextArea = new JTextArea();
 
+            xmlSnippetJTextArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
             xmlSnippetJTextArea.getDocument().addDocumentListener(new DocumentListener() {
 
                 @Override
@@ -216,6 +218,7 @@ private JTextArea getErrorMessageJTextArea() {
 
             errorMessageJTextArea = new JTextArea();
             errorMessageJTextArea.setEditable(false);
+            errorMessageJTextArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
 
             DefaultCaret caret = (DefaultCaret) errorMessageJTextArea.getCaret();
             caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);

diff --git a/src/main/java/com/pega/gcs/tracerviewer/view/TracerDataCompareView.java b/src/main/java/com/pega/gcs/tracerviewer/view/TracerDataCompareView.java
@@ -9,6 +9,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.LayoutManager;
 import java.awt.Rectangle;
@@ -393,6 +394,7 @@ private JTextField getStatusBar() {
         statusBar.setEditable(false);
         statusBar.setBackground(null);
         statusBar.setBorder(null);
+        statusBar.setCursor(new Cursor(Cursor.TEXT_CURSOR));
 
         return statusBar;
     }

diff --git a/src/main/java/com/pega/gcs/tracerviewer/view/TracerDataSingleView.java b/src/main/java/com/pega/gcs/tracerviewer/view/TracerDataSingleView.java
@@ -9,6 +9,7 @@
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -242,6 +243,7 @@ protected JTextField getStatusBar() {
             statusBar.setEditable(false);
             statusBar.setBackground(null);
             statusBar.setBorder(null);
+            statusBar.setCursor(new Cursor(Cursor.TEXT_CURSOR));
         }
 
         return statusBar;