IGNITE-22317 Revert unrelated changes, fix compilation on java 8 - Fixes

#280. Signed-off-by: Aleksey Plekhanov <plehanov.alex@gmail.com>
apache · Jul 11, 2024 · e84b926 · e84b926
1 parent e932e70
commit e84b926
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 76 deletions.
diff --git a/.github/workflows/prepare-rc.yml b/.github/workflows/prepare-rc.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v2
         with:
-          java-version: 17
+          java-version: 8
           distribution: 'adopt'
 
       - name: Extract POM Version and Compare With Branch Version

diff --git a/.github/workflows/release-checker.yml b/.github/workflows/release-checker.yml
@@ -74,7 +74,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v2
         with:
-          java-version: 17
+          java-version: 8
           distribution: 'adopt'
 
       - name: Extract Branch POM Version and Compare

diff --git a/modules/spring-session-ext/pom.xml b/modules/spring-session-ext/pom.xml
@@ -34,7 +34,8 @@
     <url>https://ignite.apache.org</url>
 
     <properties>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
 
         <spring.session.version>3.2.2</spring.session.version>
         <spring.security.version>6.2.4</spring.security.version>

diff --git a/modules/spring-tx-ext/pom.xml b/modules/spring-tx-ext/pom.xml
@@ -36,7 +36,9 @@
     <url>https://ignite.apache.org</url>
 
     <properties>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+
         <xstream.version>1.4.8</xstream.version>
     </properties>
 

diff --git a/parent-internal/pom.xml b/parent-internal/pom.xml
@@ -99,27 +99,6 @@
     </dependencies>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <configuration>
-                        <doclet>capital.scalable.restdocs.jsondoclet.ExtractDocumentationAsJsonDoclet</doclet>
-                        <docletArtifact>
-                            <groupId>capital.scalable</groupId>
-                            <artifactId>spring-auto-restdocs-json-doclet-jdk9</artifactId>
-                            <version>2.0.11</version>
-                        </docletArtifact>
-                        <destDir>generated-javadoc-json</destDir>
-                        <reportOutputDirectory>${basedir}${docDirectory}/report</reportOutputDirectory>
-                        <useStandardDocletOptions>false</useStandardDocletOptions>
-                        <show>package</show>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -307,56 +286,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>tools.jar-default</id>
-            <activation>
-                <file>
-                    <exists>${java.home}/../lib/tools.jar</exists>
-                </file>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
-                    <scope>system</scope>
-                    <version>${java.version}</version>
-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>tools.jar-mac</id>
-            <activation>
-                <file>
-                    <exists>${java.home}/../Classes/classes.jar</exists>
-                </file>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
-                    <scope>system</scope>
-                    <version>${java.version}</version>
-                    <systemPath>${java.home}/../Classes/classes.jar</systemPath>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>tools.jar-j9</id>
-            <activation>
-                <file>
-                    <exists>${java.home}/lib/tools.jar</exists>
-                </file>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun</groupId>
-                    <artifactId>tools</artifactId>
-                    <scope>system</scope>
-                    <version>${java.version}</version>
-                    <systemPath>${java.home}/lib/tools.jar</systemPath>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 </project>