UrsZeidler · UrsZeidler · Nov 5, 2023 · Oct 20, 2023 · Nov 2, 2023 · Nov 4, 2023
diff --git a/build/ant/rcptt-test.xml b/build/ant/rcptt-test.xml
@@ -58,10 +58,8 @@
 ${language}
 
 -vmargs
--Xms1024m
 -Xmx2048m
 -Dorg.eclipse.equinox.http.jetty.autostart=false
--Dorg.eclipse.swt.browser.DefaultType=mozilla
 -Dimage.folder=${images}
 -Dbase.folder=${test-results}
 </echo>

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:lts-jdk11
+FROM jenkins/jenkins:lts-jdk17
 
 USER root
 

diff --git a/build/docker/Jenkinsfile b/build/docker/Jenkinsfile
@@ -78,7 +78,7 @@ def run_rcptt(String language,String testList, String skipTags, String reportNam
     	installationName: 'default-xvfb']) {
         //ant    
         withAnt(installation: 'ant', jdk: 'open-jdk-17.0.8.1') {
-           withEnv(["rcptt_runner_HOME=${tool name: 'rcptt-runner-2.5.4', type: 'com.cloudbees.jenkins.plugins.customtools.CustomTool'}"]) {
+           withEnv(["rcptt_runner_HOME=${tool name: 'rcptt-runner-2.5.5', type: 'com.cloudbees.jenkins.plugins.customtools.CustomTool'}"]) {
              sh """
             	ant -buildfile build/ant/rcptt-test.xml test \
             	  -Drunner-path=${rcptt_runner_HOME} \

diff --git a/build/docker/jenkins-plugins.txt b/build/docker/jenkins-plugins.txt
@@ -18,3 +18,4 @@ htmlpublisher
 performance
 custom-tools-plugin
 junit-attachments
+test-results-analyzer
diff --git a/build/docker/jenkins-tools.yaml b/build/docker/jenkins-tools.yaml
@@ -1,5 +1,17 @@
 jenkins:
   numExecutors: 1
+  globalConfigFiles:
+    configs:
+    - globalMavenSettings:
+        comment: "Global settings"
+        content: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<settings xmlns=\"http://maven.apache.org/SETTINGS/1.0.0\"\
+          \ \n          xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n\
+          \          xsi:schemaLocation=\"http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd\"\
+          >\n  <localRepository>/var/jenkins_home/maven/.m2</localRepository>\n</settings>"
+        id: "d958714b-56dc-4af3-af71-6b816d27011d"
+        isReplaceAll: true
+        name: "MyGlobalSettings"
+        providerId: "org.jenkinsci.plugins.configfiles.maven.GlobalMavenSettingsConfig"
 tool:
   ant:
     installations:
@@ -11,13 +23,13 @@ tool:
               id: "1.10.11"
   customTool:
     installations:
-    - name: "rcptt-runner"
+    - name: "rcptt-runner-2.5.5"
       properties:
       - installSource:
           installers:
           - zip:
               subdir: "eclipse"
-              url: "http://download.eclipse.org/rcptt/nightly/2.5.2/202109092356/runner/rcptt.runner-2.5.2-N202109092356.zip"
+              url: "https://download.eclipse.org/rcptt/nightly/2.5.5/202310231355/runner/rcptt.runner-2.5.5-N202310231355.zip"
     - name: "rcptt-runner-2.5.4"
       properties:
       - installSource:
@@ -58,6 +70,11 @@ tool:
           installers:
           - maven:
               id: "3.9.0"
+  mavenGlobalConfig:
+    globalSettingsProvider:
+      mvn:
+        settingsConfigId: "d958714b-56dc-4af3-af71-6b816d27011d"
+    settingsProvider: "standard"
   xvfb:
     installations:
     - home: "/usr/bin"

diff --git a/build/launchconfig/build rcptt-test.xml-de.launch b/build/launchconfig/build rcptt-test.xml-de.launch
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-    <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+    <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
         <listEntry value="/build/ant/rcptt-test.xml"/>
     </listAttribute>
     <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
         <listEntry value="1"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-11-openjdk-amd64/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="build"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
     <mapAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_PROPERTIES">
-        <mapEntry key="eclipse.pdebuild.home" value="/home/urs/programme/eclipse-installs/shr5rcp-git-add_pomless_build/eclipse/../../../../.p2/pool/plugins/org.eclipse.pde.build_3.10.800.v20200410-1419/."/>
-        <mapEntry key="eclipse.pdebuild.scripts" value="/home/urs/programme/eclipse-installs/shr5rcp-git-add_pomless_build/eclipse/../../../../.p2/pool/plugins/org.eclipse.pde.build_3.10.800.v20200410-1419/scripts"/>
-        <mapEntry key="eclipse.pdebuild.templates" value="/home/urs/programme/eclipse-installs/shr5rcp-git-add_pomless_build/eclipse/../../../../.p2/pool/plugins/org.eclipse.pde.build_3.10.800.v20200410-1419/templates"/>
         <mapEntry key="language" value="de"/>
+        <mapEntry key="runner-path" value="/home/urs/programme/eclipse-installs/rcptt-2.5.5/eclipse/"/>
         <mapEntry key="skip-tags" value="en"/>
     </mapAttribute>
     <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/build/ant/rcptt-test.xml}"/>

diff --git a/build/launchconfig/verify.launch b/build/launchconfig/verify.launch
@@ -10,7 +10,7 @@
         <listEntry value="maven.test.failure.ignore=true"/>
     </listAttribute>
     <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
-    <booleanAttribute key="M2_SKIP_TESTS" value="true"/>
+    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>
     <intAttribute key="M2_THREADS" value="1"/>
     <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
     <stringAttribute key="M2_USER_SETTINGS" value=""/>
@@ -19,6 +19,6 @@
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/build}/../"/>
 </launchConfiguration>
diff --git a/de.urszeidler.shr5.acceleo/src/de/urszeidler/shr5/acceleo/sheets/foCharacterSheet.mtl b/de.urszeidler.shr5.acceleo/src/de/urszeidler/shr5/acceleo/sheets/foCharacterSheet.mtl
@@ -1032,16 +1032,16 @@ endif /]
     <fo:table-column  />
     <fo:table-column  />
     <fo:table-body  >
-[for (b : Beschreibbar | persona.getAllSkills())]
+[for (b : OclAny | persona.getAllSkills())]
 [if (b.oclIsKindOf(FertigkeitsGruppe))]
 [let fg : FertigkeitsGruppe = b.oclAsType(FertigkeitsGruppe)]
-<!-- start of [b.getText()/] -->
+<!-- start of [fg.getText()/] -->
 [printSkillList(fg.fertigkeiten->asSequence(), persona, filter)/]
-<!-- end of [b.getText()/] -->
+<!-- end of [fg.getText()/] -->
 [/let]
 [else]
-[let l : ShrList = b.oclAsType(ShrList)]
-[printSkillList(l.entries->collect(oclAsType(Fertigkeit))->asSequence(), persona, filter)/]
+[let l : Sequence(OclAny) = b]
+[printSkillList(l->collect(oclAsType(Fertigkeit))->asSequence(), persona, filter)/]
 [/let]
 [/if]
 [/for]

diff --git a/de.urszeidler.shr5.model.edit/src/de/urszeidler/eclipse/shr5/util/Shr5EditingTools.java b/de.urszeidler.shr5.model.edit/src/de/urszeidler/eclipse/shr5/util/Shr5EditingTools.java
@@ -10,6 +10,7 @@
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
@@ -85,32 +86,21 @@ public static String localizeText(Object object, String orgText, String iso3Coun
     public static List<Object> createFertigkeitGroupsRoot(AbstraktPersona persona) {
         Collection<EObject> groups = ItemPropertyDescriptor.getReachableObjectsOfType(persona, Shr5Package.Literals.FERTIGKEITS_GRUPPE);
         Collection<EObject> skill = ItemPropertyDescriptor.getReachableObjectsOfType(persona, Shr5Package.Literals.FERTIGKEIT);
-
-        ShrList root = Shr5Factory.eINSTANCE.createShrList();
-
-
-        ShrList ungrouped = Shr5Factory.eINSTANCE.createShrList();
-        ungrouped.setName("ungruppiert");
-        ShrList knownGroup = Shr5Factory.eINSTANCE.createShrList();
-        knownGroup.setName("wissen");
-        ShrList languGoup = Shr5Factory.eINSTANCE.createShrList();
-        languGoup.setName("sprache");
-
-        root.getEntries().add(ungrouped);
-        root.getEntries().add(knownGroup);
-        root.getEntries().add(languGoup);
+        List<EObject> ungrouped = new ArrayList<>();
+        List<EObject> knownGroup = new ArrayList<>();
+        List<EObject> languGoup = new ArrayList<>();
 
         for (EObject eObject : skill) {
             if (eObject instanceof Sprachfertigkeit) {
                 Sprachfertigkeit wf = (Sprachfertigkeit)eObject;
-                languGoup.getEntries().add(wf);
+                languGoup.add(wf);
             } else if (eObject instanceof Wissensfertigkeit) {
                 Wissensfertigkeit wf = (Wissensfertigkeit)eObject;
-                knownGroup.getEntries().add(wf);
+                knownGroup.add(wf);
             } else if (eObject instanceof Fertigkeit) {
                 Fertigkeit f = (Fertigkeit)eObject;
                 if (!Shr5Package.Literals.FERTIGKEITS_GRUPPE__FERTIGKEITEN.equals(f.eContainingFeature())) {
-                    ungrouped.getEntries().add(f);
+                    ungrouped.add(f);
                 }
             }
         }

diff --git a/de.urszeidler.shr5.product.build/pom.xml b/de.urszeidler.shr5.product.build/pom.xml
@@ -43,6 +43,12 @@
 							<!-- Create ZIP archive of product distribution. -->
 							<goal>archive-products</goal>
 						</goals>
+							<configuration>
+								<formats>
+									<linux>zip</linux>
+									<macosx>zip</macosx>
+								</formats>
+							</configuration>
 					</execution>
 				</executions>
 				<configuration>

diff --git a/de.urszeidler.shr5.product.simple/pom.xml b/de.urszeidler.shr5.product.simple/pom.xml
@@ -43,6 +43,12 @@
 							<!-- Create ZIP archive of product distribution. -->
 							<goal>archive-products</goal>
 						</goals>
+							<configuration>
+								<formats>
+									<linux>zip</linux>
+									<macosx>zip</macosx>
+								</formats>
+							</configuration>
 					</execution>
 				</executions>
 				<configuration>

diff --git a/de.urszeidler.shr5.rcptt.tests/character-generation/core-rule-1.test b/de.urszeidler.shr5.rcptt.tests/character-generation/core-rule-1.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _bAKkQB_xEeWSRorpcoiIvw
-Runtime-Version: 2.5.2.202109092356
-Save-Time: 10/7/21, 6:57 PM
+Runtime-Version: 2.5.5.202305081357
+Save-Time: 11/4/23, 7:59 PM
 Tags: character-generation, core-rule, en
 Testcase-Type: ecl
 
@@ -163,6 +163,10 @@ with [get-editor "Shr5 Generator"] {
         get-group Special | get-editbox -after [get-label "Edge base"] | set-text 5
         click
     }
+    with [get-section Description] {//close section to have a better look
+        click
+    }
+
     with [get-section Skills | get-tree] {
         select "Skill group Acting" | activate-cell-edit -column 2
         get-editbox | set-text 2
@@ -199,9 +203,11 @@ with [get-editor "Shr5 Generator" | get-section Skills | get-tree] {
     select "Skill group Biotech/Skill First Aid" | activate-cell-edit -column 2
     get-editbox | set-text 4
     apply-cell-edit -deactivate
+    try -times 3 -delay 10000 -command {
     select "Knowledge skills/Knowledge skill Alcohol" | activate-cell-edit -column 2
     get-editbox | set-text 4
     apply-cell-edit -deactivate
+    }
     select "Knowledge skills/Knowledge skill Architecture" | activate-cell-edit -column 2
     get-editbox | set-text 4
     apply-cell-edit -deactivate

diff --git a/...t.tests/other/configure_source_books.test → ...ests/other/show_resource_prespective.test b/...t.tests/other/configure_source_books.test → ...ests/other/show_resource_prespective.test
@@ -7,7 +7,7 @@ Element-Version: 3.0
 External-Reference: 
 Id: _-9FcUO93EeqYI6oYfJ_1jw
 Runtime-Version: 2.5.5.202305081357
-Save-Time: 10/4/23, 6:16 PM
+Save-Time: 11/4/23, 8:03 PM
 Tags: de
 Testcase-Type: ecl
 
@@ -23,12 +23,18 @@ with [get-view "Model Explorer" | get-tree] {
     select "shr5Resources/All/Resourcen/Gear/Credsticks/Credstick Silver"
     select "shr5Resources/All/Resourcen/Skills"
     select "shr5Resources/All/Resourcen/Skills/Skills"
-    select "shr5Resources/All/Resourcen/Skills/Skills/Fertigkeit Projektilwaffen"
     select "shr5Resources/All/Resourcen/Gear/Gears/Kommlink Leviathan Technical LT-2100"
     select "shr5Resources/All/Resourcen/Gear/Gears/Kommlink FTL Quark"
     select "shr5Resources/All/Resourcen/Gear/Bioware/Bioware Schadenskompensator 12"
     select "shr5Resources/All/Resourcen/Gear/Bioware/Bioware Symbionten 4"
     select "shr5Resources/All/Resourcen/Gear/Armors/Kleidung Ares Victory: Industrious"
+    try -times 3 -delay 10000 -command {
+    	select "shr5Resources/All/Resourcen/Skills"
+    	select "shr5Resources/All/Resourcen/Skills/Skills"
+    	select "shr5Resources/All/Resourcen/Skills/Knowledgeskills"
+    	select "shr5Resources/All/Resourcen/Definitions"
+    	select "shr5Resources/All/Resourcen/Skills/Skills/Fertigkeit Projektilwaffen"
+    } 
 }
 
 ------=_.content-0a7243a0-75d3-3d5f-9791-539de0e5b7ac--
diff --git a/de.urszeidler.shr5.rcptt.tests/reports/character-sheets-de.test b/de.urszeidler.shr5.rcptt.tests/reports/character-sheets-de.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _jmvK4PIXEeqCOpkEiTC5cw
-Runtime-Version: 2.5.1.M3
-Save-Time: 9/30/20 8:39 PM
+Runtime-Version: 2.5.5.202305081357
+Save-Time: 11/4/23, 9:03 AM
 Tags: de
 Testcase-Type: ecl
 
@@ -26,10 +26,11 @@ proc "gen-sheet" [val editor] [val sheet]{
 
 }
 
+try -times 10 -delay 2000 -command {
+	get-menu -path "Charakter/Öffne Managed Charakter" | click -metaKeys ""
+	get-window "Managed Charakter öffnen." | get-tree | select "SC Ki Adept Gunter von Kintzel"  | double-click -metaKeys ""
+} 
 
-
-get-menu -path "Charakter/Öffne Managed Charakter" | click -metaKeys ""
-get-window "Managed Charakter öffnen." | get-tree | select "SC Ki Adept Gunter von Kintzel"  | double-click -metaKeys ""
 exec-with-options {
     get-editor "SC Ki Adept Gunter von Kintzel" | get-button "Transform to text" | click -metaKeys ""
     get-window -class ModelToTextExportDialog | get-combo -after [get-label "Wählen Transformation"] 

diff --git a/de.urszeidler.shr5.rcptt.tests/reports/character-sheets-en.test b/de.urszeidler.shr5.rcptt.tests/reports/character-sheets-en.test
@@ -6,8 +6,8 @@ Element-Type: testcase
 Element-Version: 3.0
 External-Reference: 
 Id: _WcJdQANMEeuWf_pT0nlv4Q
-Runtime-Version: 2.5.1.M3
-Save-Time: 9/30/20 9:13 PM
+Runtime-Version: 2.5.5.202305081357
+Save-Time: 11/4/23, 9:02 AM
 Tags: en
 Testcase-Type: ecl
 
@@ -27,10 +27,12 @@ proc "gen-sheet" [val editor] [val sheet]{
 }
 
 
+try -times 10 -delay 2000 -command {
+	get-menu -path "Character/Open Managed Character" | click -metaKeys ""
+	get-window "Open Managed Character." | get-tree | select "PC Ki Adept Gunter von Kintzel"
+	get-window "Open Managed Character." | get-button OK | click -metaKeys ""
+} 
 
-get-menu -path "Character/Open Managed Character" | click -metaKeys ""
-get-window "Open Managed Character." | get-tree | select "PC Ki Adept Gunter von Kintzel"
-get-window "Open Managed Character." | get-button OK | click -metaKeys ""
 
 exec-with-options {
     get-editor "PC Ki Adept Gunter von Kintzel" | get-button "Transform to text" | click -metaKeys ""

diff --git a/pom.xml b/pom.xml
@@ -10,8 +10,8 @@
 	<properties>
 <!-- 		<findbugs.version>3.0.1</findbugs.version> -->
 		<rcptt.version>2.5.1</rcptt.version>
-		<tycho.version>2.7.5</tycho.version>
-		<jacoco.version>0.8.3</jacoco.version>
+		<tycho.version>3.0.5</tycho.version>
+		<jacoco.version>0.8.11</jacoco.version>
 		<acceleo-version>3.6.4</acceleo-version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>