From 6fa734087ed9f787013c89242c6c62e49553200b Mon Sep 17 00:00:00 2001
From: Andrea Cavalli <andrea@cavallium.it>
Date: Mon, 27 Sep 2021 19:36:07 +0200
Subject: [PATCH] Unify pom.xml

---
 .github/workflows/maven-publish.yml |  4 +-
 tdlib/pom.xml                       | 60 ++++++++++++++++++++---------
 tdlight/pom.xml                     |  5 +--
 3 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 3d3e974..93a0f1a 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -34,11 +34,11 @@ jobs:
 
           echo "REVISION=$REVISION" >> $GITHUB_ENV
           echo "IMPLEMENTATION_NAME=$IMPLEMENTATION_NAME" >> $GITHUB_ENV
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           server-id: mchv-release-distribution
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
diff --git a/tdlib/pom.xml b/tdlib/pom.xml
index e1d6b3f..b430dcd 100644
--- a/tdlib/pom.xml
+++ b/tdlib/pom.xml
@@ -99,7 +99,7 @@
 		</profile>
 	</profiles>
 	<build>
-		<sourceDirectory>../src/main/java</sourceDirectory>
+		<sourceDirectory>${project.basedir}/../src/main/java</sourceDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-clean-plugin</artifactId>
@@ -125,8 +125,13 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>3.2.0</version>
 				<configuration>
-					<source>8</source>
+					<source>17</source>
 					<additionalOptions>-html5</additionalOptions>
+          <level>public</level>
+          <verbose>false</verbose>
+          <quiet>true</quiet>
+          <additionalOptions>-Xdoclint:none</additionalOptions>
+          <additionalJOption>-Xdoclint:none</additionalJOption>
 				</configuration>
 				<executions>
 					<execution>
@@ -166,9 +171,6 @@
 				<version>3.8.1</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
-          <source>11</source>
-          <target>11</target>
-					<useIncrementalCompilation>false</useIncrementalCompilation>
 					<excludes>
 						<exclude>it/tdlight/tdlight/ClientManager.java</exclude>
 					</excludes>
@@ -181,6 +183,20 @@
 						<!-- specify source/target for IDE integration -->
 						<configuration>
 							<release>9</release>
+            </configuration>
+          </execution>
+          <!-- compile sources with Java 11 -->
+          <execution>
+            <id>java-11-module-compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <release>11</release>
+              <compileSourceRoots>
+                <compileSourceRoot>${project.basedir}/../src/main/java11</compileSourceRoot>
+              </compileSourceRoots>
+              <multiReleaseOutput>true</multiReleaseOutput>
 						</configuration>
 					</execution>
 					<!-- compile sources with Java 9 to generate and validate module-info.java -->
@@ -201,8 +217,7 @@
 						</goals>
 						<configuration>
 							<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
-							<source>8</source>
-							<target>8</target>
+              <release>8</release>
 							<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
 							<excludes>
 								<exclude>it/tdlight/tdlight/ClientManager.java</exclude>
@@ -212,18 +227,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.2.0</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-install-plugin</artifactId>
-				<version>3.0.0-M1</version>
-			</plugin>
-			<plugin>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
@@ -249,6 +252,25 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.2.0</version>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Multi-Release>true</Multi-Release>
+            </manifestEntries>
+          </archive>
+        </configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>3.0.0-M1</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>templating-maven-plugin</artifactId>
diff --git a/tdlight/pom.xml b/tdlight/pom.xml
index f4c18e9..66581d3 100644
--- a/tdlight/pom.xml
+++ b/tdlight/pom.xml
@@ -220,14 +220,13 @@
               <release>8</release>
               <!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
               <excludes>
+                <exclude>it/tdlight/tdlib/ClientManager.java</exclude>
                 <exclude>module-info.java</exclude>
               </excludes>
             </configuration>
           </execution>
         </executions>
       </plugin>
-
-      <!--
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>flatten-maven-plugin</artifactId>
@@ -252,7 +251,7 @@
 						</goals>
 					</execution>
 				</executions>
-			</plugin>-->
+			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.2.0</version>