Merge pull request #301 from jfdenise/main

Fix JDK source and target
wildfly · May 11, 2022 · f47ff8f · f47ff8f
2 parents 0fe33c8 + b379c3a
commit f47ff8f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
@@ -63,7 +63,11 @@
         </exclusion>
       </exclusions>
     </dependency>
-
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-api</artifactId>
@@ -174,7 +178,6 @@
       <plugin>
         <groupId>org.wildfly.extras</groupId>
         <artifactId>adoc-maven-plugin-descriptor</artifactId>
-        <version>1.0.0.Alpha2</version>
         <executions>
           <execution>
             <phase>prepare-package</phase>

diff --git a/pom.xml b/pom.xml
@@ -52,6 +52,9 @@
   </modules>
 
   <properties>
+    <!-- Require Java 11 -->
+    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
     <!--
         Dependency versions. Please keep alphabetical.
 
@@ -62,6 +65,7 @@
         versions, add the artifactId or other qualifier to the property name.
         For example: <version.org.jboss.as.console>
     -->
+    <version.adoc-maven-plugin-descriptor>1.0.0.Alpha3</version.adoc-maven-plugin-descriptor>
     <version.com.io7m.xom>1.2.10</version.com.io7m.xom>
     <version.com.mycila.license-maven-plugin>3.0</version.com.mycila.license-maven-plugin>
     <version.junit>4.13.1</version.junit>
@@ -77,7 +81,7 @@
     <version.org.jboss.logging>3.3.1.Final</version.org.jboss.logging>
     <version.org.jboss.logmanager>2.0.6.Final</version.org.jboss.logmanager>
     <version.org.jboss.staxmapper>1.1.0.Final</version.org.jboss.staxmapper>
-    <version.plugin.plugin>3.5</version.plugin.plugin>
+    <version.plugin.plugin>3.6.4</version.plugin.plugin>
 
     <!-- sfl4j is brought in by eclipse aether and version needs to be overridden. Currently only used in tool module -->
     <version.org.slf4j>1.7.21</version.org.slf4j>
@@ -185,7 +189,14 @@
         <artifactId>maven-aether-provider</artifactId>
         <version>${version.maven-aether-provider}</version>
       </dependency>
-
+
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <scope>provided</scope>
+        <version>${version.org.apache.maven}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-settings-builder</artifactId>
@@ -394,6 +405,11 @@
           <artifactId>xml-maven-plugin</artifactId>
           <version>${version.org.codehaus.mojo.xml-maven-plugin}</version>
         </plugin>
+        <plugin>
+          <groupId>org.wildfly.extras</groupId>
+          <artifactId>adoc-maven-plugin-descriptor</artifactId>
+          <version>${version.adoc-maven-plugin-descriptor}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>