Merge branch 'master' of http://nordh.xyz:8300/Axel/ATG

.drone.yml

@@ -1,11 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-  - name: code-analysis
-image: aosapps/drone-sonar-plugin
-settings:
-  sonar_host:
-    from_secret: http://nordh.xyz:9088
-  sonar_token:
-    from_secret: 6ebdc70aefc3751a6dd6e182dbf5f25e7414e0e7

ATG/.classpath

@@ -22,5 +22,21 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/JavaFx"/>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

ATG/.drone.yml

@@ -0,0 +1,10 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: maven_test
+    image: maven:3.8.6-openjdk-18
+    commands:
+      - cd ATG
+      - mvn clean verify sonar:sonar -Dsonar.projectKey=atg -Dsonar.host.url=http://nordh.xyz:9088 -Dsonar.login=6ebdc70aefc3751a6dd6e182dbf5f25e7414e0e7

ATG/.project

@@ -33,4 +33,15 @@
 		<nature>org.eclipse.statet.ide.resourceProjects.Statet</nature>
 		<nature>org.eclipse.statet.r.resourceProjects.R</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1657810561231</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

ATG/.settings/org.eclipse.jdt.core.prefs

@@ -11,5 +11,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=11

ATG/pom.xml

@@ -21,6 +21,21 @@
           <release>11</release>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.openjfx</groupId>
+          <artifactId>javafx-maven-plugin</artifactId>
+          <version>0.0.6</version>
+          <executions>
+              <execution>
+                  <!-- Default configuration for running -->
+                  <!-- Usage: mvn clean javafx:run -->
+                  <id>default-cli</id>
+                  <configuration>
+                      <mainClass>application.ATGMain</mainClass>
+                  </configuration>
+              </execution>
+          </executions>
+        </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -34,7 +49,7 @@
 	    <artifactId>htmlunit</artifactId>
 	    <version>2.46.0</version>
 	</dependency>
-	
+
 	<dependency>
     	<groupId>mysql</groupId>
     	<artifactId>mysql-connector-java</artifactId>
@@ -46,13 +61,24 @@
     	<artifactId>commons-csv</artifactId>
     	<version>1.9.0</version>
 	</dependency>
-	
-	
+
+
 	<dependency>
 	    <groupId>com.google.code.gson</groupId>
 	    <artifactId>gson</artifactId>
-	    <version>2.8.6</version>
+	    <version>2.9.0</version>
 	</dependency>
-	
+	<dependency>
+    <groupId>org.openjfx</groupId>
+    <artifactId>javafx-controls</artifactId>
+    <version>19-ea+8</version>
+  </dependency>
+  <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-fxml</artifactId>
+      <version>19-ea+8</version>
+  </dependency>
+
+
   </dependencies>
 </project>