Skip to content

Commit ab4aa20

Browse files
committed
upgraded dependencies and jitpack build
1 parent b8b01ed commit ab4aa20

File tree

8 files changed

+48
-34
lines changed

8 files changed

+48
-34
lines changed

build.gradle

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import net.ltgt.gradle.errorprone.CheckSeverity
33
plugins {
44
id 'java'
55
id 'application'
6-
id 'net.ltgt.errorprone' version '0.8.1'
7-
id 'com.github.spotbugs' version '2.0.0'
8-
id "com.jfrog.bintray" version '1.8.5'
6+
id 'net.ltgt.errorprone' version '2.0.2'
7+
id 'com.github.spotbugs' version '4.8.0'
98
id 'nebula.release' version '15.3.1'
109
}
1110

@@ -21,10 +20,8 @@ apply from: "$rootDir/gradle/publishing.gradle"
2120

2221
repositories {
2322
mavenLocal()
24-
maven {
25-
url "https://dl.bintray.com/pegasystems/fringeutils"
26-
}
2723
mavenCentral()
24+
maven { url "https://jitpack.io" }
2825
}
2926

3027
dependencies {
@@ -33,15 +30,27 @@ dependencies {
3330
errorproneJavac("com.google.errorprone:javac:latest.release")
3431

3532
implementation 'gnu.getopt:java-getopt:1.0.13'
33+
//implementation 'com.pega.gcs:fringeutils-common:3.4.0-SNAPSHOT'
34+
implementation 'com.github.pegasystems:fringeutils-common:v3.4.0'
3635

37-
implementation 'com.pega.gcs:fringeutils-common:3.3.0'
36+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
37+
}
3838

39-
testImplementation 'junit:junit:4.12'
39+
java {
40+
sourceCompatibility = JavaVersion.VERSION_1_8
41+
targetCompatibility = JavaVersion.VERSION_1_8
4042
}
4143

4244
application {
4345
mainClassName = "com.pega.gcs.tracerviewer.TracerViewer"
44-
applicationDefaultJvmArgs = ['XXX_SET_USER_DIR_XXX', '-Dfile.encoding=UTF-8', '-Xms512M', '-Xmx1G', '-XX:+UseParNewGC', '-XX:+UseConcMarkSweepGC']
46+
applicationDefaultJvmArgs = [
47+
'XXX_SET_USER_DIR_XXX',
48+
'-Dfile.encoding=UTF-8',
49+
'-Xms1G',
50+
'-Xmx2G',
51+
'-XX:+UseG1GC',
52+
'-XX:+UseStringDeduplication'
53+
]
4554
}
4655

4756
tasks.withType(JavaCompile) {

gradle/publishing.gradle

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,6 @@ publishing {
3636
}
3737
}
3838

39-
bintray {
40-
user = resolveProperty('bintrayUsername')
41-
key = resolveProperty('bintrayKey')
42-
publications = ['mavenJava']
43-
publish = true
44-
45-
pkg {
46-
def orgName = rootProject.findProperty('organization')
47-
48-
userOrg = orgName
49-
repo = rootProject.findProperty('release.stage') == 'final' ? releaseRepository : snapshotRepository
50-
name = project.name
51-
websiteUrl = 'https://github.com/pegasystems/pega-tracerviewer'
52-
issueTrackerUrl = 'https://github.com/pegasystems/pega-tracerviewer/issues'
53-
vcsUrl = 'https://github.com/pegasystems/pega-tracerviewer.git'
54-
licenses = ['Apache-2.0']
55-
labels = ['java', 'pega', 'pega trace xml']
56-
publicDownloadNumbers = true
57-
githubRepo = 'pegasystems/pega-tracerviewer'
58-
githubReleaseNotesFile = 'README.md'
59-
}
60-
}
61-
6239
/*
6340
* Check environment for property and if that fails
6441
* ask gradle to find the property somewhere within
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/com/pega/gcs/tracerviewer/TraceEventFactory.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ public class TraceEventFactory {
114114
// InteractionQueryData
115115
xmlElementType = new XMLElementType("InteractionQueryData", "&", true);
116116
xmlElementTableTypeMap.put(xmlElementType.getElementName(), xmlElementType);
117+
118+
// InteractionQueryParam
119+
xmlElementType = new XMLElementType("InteractionQueryParam", "&", true);
120+
xmlElementTableTypeMap.put(xmlElementType.getElementName(), xmlElementType);
117121
}
118122

119123
public static DateFormat getDateFormat() {

src/main/java/com/pega/gcs/tracerviewer/TraceTreeTableMouseListener.java

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.util.HashMap;
2727
import java.util.List;
2828
import java.util.Map;
29+
import java.util.concurrent.CancellationException;
30+
import java.util.concurrent.ExecutionException;
2931

3032
import javax.swing.ImageIcon;
3133
import javax.swing.JFileChooser;
@@ -437,8 +439,23 @@ protected void done() {
437439

438440
success = get();
439441

442+
} catch (CancellationException ce) {
443+
444+
LOG.error("Trace event export task cancelled.");
445+
446+
} catch (ExecutionException ee) {
447+
448+
String message = ee.getCause().getMessage() + " has occured while exporting.";
449+
450+
LOG.error(message, ee);
451+
452+
JOptionPane.showMessageDialog(mainWindow, message, "Error",
453+
JOptionPane.ERROR_MESSAGE);
454+
440455
} catch (Exception e) {
441-
LOG.error("TraceEventTreeNodeXMLExportTask erorr: ", e);
456+
457+
LOG.error("TraceEventTreeNodeXMLExportTask error", e);
458+
442459
} finally {
443460

444461
modalProgressMonitor.close();

src/main/java/com/pega/gcs/tracerviewer/TraceXMLLoadSnippetJDialog.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import java.awt.Color;
1414
import java.awt.Component;
15+
import java.awt.Cursor;
1516
import java.awt.Dimension;
1617
import java.awt.GridBagConstraints;
1718
import java.awt.GridBagLayout;
@@ -182,6 +183,7 @@ private JTextArea getXmlSnippetJTextArea() {
182183
if (xmlSnippetJTextArea == null) {
183184
xmlSnippetJTextArea = new JTextArea();
184185

186+
xmlSnippetJTextArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
185187
xmlSnippetJTextArea.getDocument().addDocumentListener(new DocumentListener() {
186188

187189
@Override
@@ -216,6 +218,7 @@ private JTextArea getErrorMessageJTextArea() {
216218

217219
errorMessageJTextArea = new JTextArea();
218220
errorMessageJTextArea.setEditable(false);
221+
errorMessageJTextArea.setCursor(new Cursor(Cursor.TEXT_CURSOR));
219222

220223
DefaultCaret caret = (DefaultCaret) errorMessageJTextArea.getCaret();
221224
caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);

src/main/java/com/pega/gcs/tracerviewer/view/TracerDataCompareView.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.awt.BorderLayout;
1111
import java.awt.Color;
12+
import java.awt.Cursor;
1213
import java.awt.Dimension;
1314
import java.awt.LayoutManager;
1415
import java.awt.Rectangle;
@@ -393,6 +394,7 @@ private JTextField getStatusBar() {
393394
statusBar.setEditable(false);
394395
statusBar.setBackground(null);
395396
statusBar.setBorder(null);
397+
statusBar.setCursor(new Cursor(Cursor.TEXT_CURSOR));
396398

397399
return statusBar;
398400
}

src/main/java/com/pega/gcs/tracerviewer/view/TracerDataSingleView.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import java.awt.BorderLayout;
1111
import java.awt.Color;
12+
import java.awt.Cursor;
1213
import java.awt.Dimension;
1314
import java.awt.GridBagConstraints;
1415
import java.awt.GridBagLayout;
@@ -242,6 +243,7 @@ protected JTextField getStatusBar() {
242243
statusBar.setEditable(false);
243244
statusBar.setBackground(null);
244245
statusBar.setBorder(null);
246+
statusBar.setCursor(new Cursor(Cursor.TEXT_CURSOR));
245247
}
246248

247249
return statusBar;

0 commit comments

Comments
 (0)