Merge pull request #12 from jfdenise/main

Upgrade dependencies, towards GA
jbossas · Mar 1, 2023 · 8f977cd · 8f977cd
2 parents 799f323 + 6224786
commit 8f977cd
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 4 deletions.
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -46,6 +46,10 @@
             <groupId>org.wildfly.channel</groupId>
             <artifactId>maven-resolver</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.prospero</groupId>
+            <artifactId>prospero-metadata</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>
@@ -66,6 +70,13 @@
             <groupId>org.jboss</groupId>
             <artifactId>staxmapper</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.maven.plugin-tools</groupId>
+            <artifactId>maven-plugin-annotations</artifactId>
+            <!-- Only used at compile-time -->
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/pom.xml b/pom.xml
@@ -44,18 +44,20 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <version.junit>4.13.2</version.junit>
+        <version.org.apache.maven.plugin-tools>3.7.0</version.org.apache.maven.plugin-tools>
         <version.org.eclipse.aether>1.1.0</version.org.eclipse.aether>
         <version.com.google.guava>31.1.0.jre-redhat-00001</version.com.google.guava>
         <version.com.google.guava.failureaccess>1.0.1.redhat-00003</version.com.google.guava.failureaccess>
         <version.org.jboss.logging.slf4j-jboss-logging>1.2.1.Final</version.org.jboss.logging.slf4j-jboss-logging>
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
         <version.org.wildfly.common.wildfly-common>1.6.0.Final-redhat-00001</version.org.wildfly.common.wildfly-common>
-        <version.org.wildfly.core>19.0.0.Beta16-redhat-00004</version.org.wildfly.core>
+        <version.org.wildfly.core>20.0.0.Beta6</version.org.wildfly.core>
         <version.org.jboss.logging.jboss-logging>3.4.3.Final-redhat-00001</version.org.jboss.logging.jboss-logging>
-        <version.org.jboss.logmanager.jboss-logmanager>2.1.18.Final-redhat-00001</version.org.jboss.logmanager.jboss-logmanager>
+        <version.org.jboss.logmanager.jboss-logmanager>2.1.19.Final-redhat-00001</version.org.jboss.logmanager.jboss-logmanager>
         <version.org.jboss.staxmapper>1.3.0.Final-redhat-1</version.org.jboss.staxmapper>
-        <version.org.wildfly.maven.plugin>4.0.0.Final</version.org.wildfly.maven.plugin>
-        <version.org.wildfly.channel>1.0.0.Beta3-redhat-00001</version.org.wildfly.channel>
+        <version.org.wildfly.maven.plugin>4.1.0.Beta2</version.org.wildfly.maven.plugin>
+        <version.org.wildfly.channel>1.0.0.Beta5-redhat-00001</version.org.wildfly.channel>
+        <version.org.wildfly.prospero>1.0.0.Beta6-redhat-00001</version.org.wildfly.prospero>
     </properties>
 
     <dependencyManagement>
@@ -98,6 +100,10 @@
                         <groupId>org.wildfly.channel</groupId>
                         <artifactId>*</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.wildfly.prospero</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -110,6 +116,17 @@
                 <artifactId>maven-resolver</artifactId>
                 <version>${version.org.wildfly.channel}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wildfly.prospero</groupId>
+                <artifactId>prospero-metadata</artifactId>
+                <version>${version.org.wildfly.prospero}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.wildfly.channel</groupId>
+                        <artifactId>channel-core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
             <dependency>
                 <groupId>org.wildfly.plugins</groupId>
                 <artifactId>wildfly-plugin-core</artifactId>
@@ -159,6 +176,11 @@
                 <artifactId>wildfly-checkstyle-config</artifactId>
                 <version>${version.org.wildfly.checkstyle-config}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.maven.plugin-tools</groupId>
+                <artifactId>maven-plugin-annotations</artifactId>
+                <version>${version.org.apache.maven.plugin-tools}</version>
+            </dependency>
             <!-- tests -->
             <dependency>
                 <groupId>org.wildfly.core</groupId>

diff --git a/tests/src/test/resources/test-project/package-pom.xml b/tests/src/test/resources/test-project/package-pom.xml
@@ -38,6 +38,20 @@
                 <updatePolicy>never</updatePolicy>
             </snapshots>
         </repository>
+        <repository>  
+            <id>techpreview</id>  
+            <name>tech preview</name>  
+            <url>https://maven.repository.redhat.com/earlyaccess/all</url>  
+            <layout>default</layout>  
+            <releases>  
+                <enabled>true</enabled>  
+                <updatePolicy>never</updatePolicy>  
+            </releases>  
+            <snapshots>  
+                <enabled>false</enabled>  
+                <updatePolicy>never</updatePolicy>  
+            </snapshots>  
+        </repository>  
     </repositories>
     <build>
         <plugins>