#1696 (#1698)

* changelog.md * #1696 upgrade vulnerable libs * #1696 update vulnerable libs Co-authored-by: wsbrenk <zissener-weg-brenk.de>
ho-dev · Nov 15, 2022 · 253a53e · 253a53e
1 parent 4647c15
commit 253a53e
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,8 +14,8 @@ repositories {
 
 dependencies {
     implementation 'com.install4j:install4j-runtime:8.0.7'
-    implementation 'com.github.scribejava:scribejava-core:8.3.1'
-    implementation 'org.hsqldb:hsqldb:2.5.0'
+    implementation 'com.github.scribejava:scribejava-core:8.3.3'
+    implementation 'org.hsqldb:hsqldb:2.7.1'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3'
@@ -24,10 +24,10 @@ dependencies {
     implementation 'com.github.weisj:darklaf-theme:3.0.2'              //'darklaf-theme:latest.integration'
     implementation 'com.github.weisj:darklaf-property-loader:3.0.2'    //'darklaf-property-loader:latest.integration'
     implementation 'org.javatuples:javatuples:1.2'
-    implementation 'org.apache.commons:commons-text:1.9'
+    implementation 'org.apache.commons:commons-text:1.10.0'
     implementation 'org.jetbrains:annotations:23.0.0'
-    implementation 'org.knowm.xchart:xchart:3.8.0'
-    implementation 'org.jsoup:jsoup:1.14.3'
+    implementation 'org.knowm.xchart:xchart:3.8.1'
+    implementation 'org.jsoup:jsoup:1.15.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
 }
 
@@ -39,8 +39,8 @@ test {
 //  Version ============================================================
 // Development_stage (DEV:0  BETA:1  STABLE:2)
 def major = '6'
-def minor = '1'
-def development_stage = 2
+def minor = '2'
+def development_stage = 1
 def releaseArtefacts = true
 def development_tag = ["dev", "beta", "tag_stable"]
 def version_type = ["-DEV", "-BETA", ""]
@@ -309,9 +309,9 @@ task pushmd(dependsOn: preparingBuild)  {
         // list the contributors that don't want to be mentioned in release notes
         def contributorFilter = ["Che"]
 
-        def commitCount = callGit('git rev-list 6.0..HEAD --count')
-        def diff = callGit('git diff --shortstat 6.0..HEAD')
-        def contributors = filter(callGit('git shortlog -s -n 6.0..HEAD'), contributorFilter)
+        def commitCount = callGit('git rev-list 6.1..HEAD --count')
+        def diff = callGit('git diff --shortstat 6.1..HEAD')
+        def contributors = filter(callGit('git shortlog -s -n 6.1..HEAD'), contributorFilter)
         def latestCommit = callGit('git log -1 --pretty=format:"%s"')
 
         println("create release-notes")

diff --git a/src/main/java/core/util/chart/HODoublePieChart.java b/src/main/java/core/util/chart/HODoublePieChart.java
@@ -29,10 +29,10 @@ public class HODoublePieChart implements IChart {
 
 
     public HODoublePieChart(boolean _bLegendVisible){
-        this(_bLegendVisible, PieStyler.AnnotationType.Percentage, PieStyler.AnnotationType.Percentage);
+        this(_bLegendVisible, PieStyler.LabelType.Percentage, PieStyler.LabelType.Percentage);
     }
 
-    public HODoublePieChart(boolean _bLegendVisible, PieStyler.AnnotationType AnnotationTypeL, PieStyler.AnnotationType AnnotationTypeR){
+    public HODoublePieChart(boolean _bLegendVisible, PieStyler.LabelType AnnotationTypeL, PieStyler.LabelType AnnotationTypeR){
 
         bLegendVisible = _bLegendVisible;
 
@@ -48,13 +48,13 @@ public HODoublePieChart(boolean _bLegendVisible, PieStyler.AnnotationType Annota
         m_stylerR.setChartFontColor(ThemeManager.getColor(HOColorName.STAT_PANEL_FG));
         m_stylerR.setPlotBackgroundColor(ThemeManager.getColor(HOColorName.STAT_PANEL_BG));
         m_stylerR.setChartBackgroundColor(ThemeManager.getColor(HOColorName.STAT_PANEL_BG));
-        m_stylerL.setAnnotationType(AnnotationTypeL);
-        m_stylerR.setAnnotationType(AnnotationTypeR);
+        m_stylerL.setLabelType(AnnotationTypeL);
+        m_stylerR.setLabelType(AnnotationTypeR);
 
-        Font cFont = m_stylerL.getAnnotationsFont();
+        Font cFont = m_stylerL.getAnnotationTextFont();
         cFont = cFont.deriveFont(Font.BOLD, cFont.getSize()+3);
-        m_stylerL.setAnnotationsFont(cFont);
-        m_stylerR.setAnnotationsFont(cFont);
+        m_stylerL.setAnnotationTextFont(cFont);
+        m_stylerR.setAnnotationTextFont(cFont);
 
 
         // Legend
@@ -165,9 +165,6 @@ public final void setAllValues(LinesChartDataModel[] models, String[] xData,
                                    boolean hasLabels, boolean hasHelpLines){
 
     }
-
-
-
 }
 
 

diff --git a/src/main/java/core/util/chart/HOLinesChart.java b/src/main/java/core/util/chart/HOLinesChart.java
@@ -166,7 +166,6 @@ public final void updateGraph(){
 
         XYSeries serie;
 
-        m_chart.getStyler().setHasAnnotations(m_hasLabels);
         m_chart.getStyler().setPlotGridLinesVisible(m_hasHelpLines);
 
         var series = m_chart.getSeriesMap();

diff --git a/src/main/resources/changelog.md b/src/main/resources/changelog.md
@@ -1,3 +1,56 @@
+# Changelist HO! 6.1
+
+## Some numbers
+* 11 commits
+* 22 files changed, 469 insertions(+), 493 deletions(-)
+* Contributors:
+  11	wsbrenk
+
+## Highlights
+* bug fixes
+
+## [Detailed Changelog](https://github.com/akasolace/HO/issues?q=milestone%3A6.1)
+
+### Installer/Update
+* fix update error of portable version (#1654)
+
+### Squad
+* fix painting error when HO path contains non ascii characters (#1644)
+
+### Team Analyser
+* fix team analyzer simulation out of bounds error (#1638)
+* fix wrong rating values in simulator (#1655)
+
+### Rating
+
+### Matches
+* fix handling of replacement of injured goalkeeper by field player (#1633)
+
+### Lineup
+* enable download of lineups of future matches even if match order status is not known (#1630)
+
+### Statistics
+
+### NT
+
+### Training
+* fix season offset when upgrading from HO3. Correct training seasons are displayed (#1651)
+
+### League
+
+### Youth
+* fix exception on sorting of invalid column indexes (#1645)
+
+### Misc
+
+
+## Translations
+
+Reports by Contributors - August 05, 2022 - October 15, 2022
+
+* Moorhuhninho 33
+* TeamBMW 23
+
 # Changelist HO! 6.0
 
 ## Some numbers

diff --git a/src/main/resources/release_notes.md b/src/main/resources/release_notes.md
@@ -1,46 +1,37 @@
 
 
 ## Highlights
-* bug fixes
+* update libs
 
-## [Detailed Changelog](https://github.com/akasolace/HO/issues?q=milestone%3A6.1)
+## [Detailed Changelog](https://github.com/akasolace/HO/issues?q=milestone%3A6.2)
 
 ### Installer/Update
-* fix update error of portable version (#1654)
 
 ### Squad
-* fix painting error when HO path contains non ascii characters (#1644)
 
 ### Team Analyser
-* fix team analyzer simulation out of bounds error (#1638)
-* fix wrong rating values in simulator (#1655)
 
 ### Rating
 
 ### Matches
-* fix handling of replacement of injured goalkeeper by field player (#1633)
 
 ### Lineup
-* enable download of lineups of future matches even if match order status is not known (#1630)
 
 ### Statistics
 
 ### NT
 
 ### Training
-* fix season offset when upgrading from HO3. Correct training seasons are displayed (#1651)
 
 ### League
 
 ### Youth
-* fix exception on sorting of invalid column indexes (#1645)
 
 ### Misc
 
 
 ## Translations
 
-Reports by Contributors - August 05, 2022 - October 15, 2022
+Reports by Contributors - October 15, 2022 - November 15, 2022
 
-* Moorhuhninho 33
-* TeamBMW 23
+* Jan 135