From 3f3b870cde3886cc90d12eea6fb8bc342513eb7c Mon Sep 17 00:00:00 2001
From: Andrew Berezovskyi <andriib@kth.se>
Date: Mon, 1 Jan 2024 21:33:23 +0100
Subject: [PATCH] build: clean up TRS POM a bit

Signed-off-by: Andrew Berezovskyi <andriib@kth.se>
---
 org.eclipse.lyo.testsuite.server/pom.xml | 59 ++++--------------------
 org.eclipse.lyo.testsuite.trs/pom.xml    | 53 +++++----------------
 2 files changed, 20 insertions(+), 92 deletions(-)

diff --git a/org.eclipse.lyo.testsuite.server/pom.xml b/org.eclipse.lyo.testsuite.server/pom.xml
index e1ef41f..9549625 100644
--- a/org.eclipse.lyo.testsuite.server/pom.xml
+++ b/org.eclipse.lyo.testsuite.server/pom.xml
@@ -28,8 +28,15 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <skipTests>true</skipTests> <!-- run mvn with -DskipTests=false -->
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.release>17</maven.compiler.release>
   </properties>
+  <scm>
+    <url>http://git.eclipse.org/c/lyo/org.eclipse.lyo.testsuite.git</url>
+  </scm>
 
   <profiles>
     <profile>
@@ -61,9 +68,7 @@
       </releases>
     </repository>
   </repositories>
-  <scm>
-    <url>http://git.eclipse.org/c/lyo/org.eclipse.lyo.testsuite.git</url>
-  </scm>
+
   <dependencies>
     <!-- https://stackoverflow.com/questions/52502189/java-11-package-javax-xml-bind-does-not-exist -->
     <dependency>
@@ -140,6 +145,7 @@
       <version>1.5.10</version>
     </dependency>
 
+    <!-- used in SimplifiedQueryAtomTests -->
     <dependency>
       <groupId>org.apache.abdera</groupId>
       <artifactId>abdera-parser</artifactId>
@@ -161,17 +167,6 @@
 
   <build>
     <plugins>
-      <!-- Compiler Plugin -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.12.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-
       <!-- Source Jar Plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -187,47 +182,11 @@
         </executions>
       </plugin>
 
-      <!-- Javadoc Plugin -->
-      <!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9</version>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-						<configuration>
-							<additionalparam>${javadoc.opts}</additionalparam>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin> -->
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
         <version>2.12</version>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <shadedArtifactAttached>true</shadedArtifactAttached>
-          <createDependencyReducedPom>false</createDependencyReducedPom>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
     <testSourceDirectory>${basedir}/src/main/java</testSourceDirectory>
   </build>
diff --git a/org.eclipse.lyo.testsuite.trs/pom.xml b/org.eclipse.lyo.testsuite.trs/pom.xml
index d0f4044..93dd8a5 100644
--- a/org.eclipse.lyo.testsuite.trs/pom.xml
+++ b/org.eclipse.lyo.testsuite.trs/pom.xml
@@ -26,9 +26,10 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <version-jvm>1.8</version-jvm>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <skipTests>true</skipTests> <!-- run mvn with -DskipTests=false -->
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.release>17</maven.compiler.release>
     <version-jetty>9.4.6.v20170531</version-jetty>
     <version.lyo.core>2.2.0</version.lyo.core>
     <version.lyo.server>2.2.0</version.lyo.server>
@@ -110,23 +111,22 @@
   </dependencies>
 
   <build>
-    <outputDirectory>target/classes</outputDirectory>
     <resources>
       <resource>
         <directory>src/main/java</directory>
         <includes>
-          <include> **/*.properties</include>
-          <include> **/*.index</include>
-          <include> **/resources</include>
+          <include>**/*.properties</include>
+          <include>**/*.index</include>
+          <include>**/resources</include>
         </includes>
       </resource>
     </resources>
     <plugins>
-
       <!-- Source Jar Plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -136,43 +136,12 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- Javadoc Plugin -->
-      <!-- <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.4</version>
-                <configuration>
-                    <additionalparam>-Xdoclint:none</additionalparam>
-                </configuration>
-
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin> -->
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <shadedArtifactAttached>true</shadedArtifactAttached>
-          <createDependencyReducedPom>false</createDependencyReducedPom>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.12</version>
       </plugin>
     </plugins>
+    <testSourceDirectory>${basedir}/src/main/java</testSourceDirectory>
   </build>
 </project>