Skip to content

Commit 6418588

Browse files
kabirkabir
authored
Merge pull request wildfly-extras#18 from kabir/nexus3
chore: Changes needed to deploy to Nexus 3.
2 parents 83bb9f8 + 06920cb commit 6418588

File tree

6 files changed

+72
-34
lines changed

6 files changed

+72
-34
lines changed

‎grpc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.wildfly.extras.a2a</groupId>
8+
<groupId>org.wildfly.a2a</groupId>
99
<artifactId>a2a-java-sdk-server-jakarta-parent</artifactId>
1010
<version>0.3.0.Beta1-SNAPSHOT</version>
1111
</parent>

‎impl/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.wildfly.extras.a2a</groupId>
8+
<groupId>org.wildfly.a2a</groupId>
99
<artifactId>a2a-java-sdk-server-jakarta-parent</artifactId>
1010
<version>0.3.0.Beta1-SNAPSHOT</version>
1111
</parent>

‎pom.xml‎

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<parent>
88
<groupId>org.jboss</groupId>
99
<artifactId>jboss-parent</artifactId>
10-
<version>49</version>
10+
<version>50</version>
1111
</parent>
1212

13-
<groupId>org.wildfly.extras.a2a</groupId>
13+
<groupId>org.wildfly.a2a</groupId>
1414
<artifactId>a2a-java-sdk-server-jakarta-parent</artifactId>
1515
<version>0.3.0.Beta1-SNAPSHOT</version>
1616

@@ -66,10 +66,34 @@
6666
<arquillian.java.vm.args></arquillian.java.vm.args>
6767
<server.debug.port>8787</server.debug.port>
6868

69+
<!-- maven-compiler-plugin settings -->
70+
<maven.compiler.release>17</maven.compiler.release>
71+
<maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
72+
<maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
73+
6974
<!-- Redirect test output to file -->
7075
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
7176

77+
<!--
78+
Configure the repositories on JBoss Nexus we want to push to
79+
-->
80+
<!-- Configure this one in settings.xml - it contains the tokens to deploy to nexus -->
81+
<nexus.serverId>jboss</nexus.serverId>
82+
<nexus.repository.release>wildfly-extras</nexus.repository.release>
83+
<nexus.repository.staging>wildfly-extras-staging</nexus.repository.staging>
84+
<nexus.staging.tag>a2a-java-sdk-server-jakarta-${project.version}</nexus.staging.tag>
85+
86+
<!--
87+
URL of Maven repository to deploy to. There is a -Pstaging-deploy profile to push to a
88+
staging repository instead.
89+
-->
90+
<maven.repository.url>https://repository.jboss.org/nexus/repository/wildfly-extras/</maven.repository.url>
91+
92+
<!-- Plugin versions, not managed by parent -->
93+
<version.plugin.wildfly-glow-arquillian>1.4.1.Final</version.plugin.wildfly-glow-arquillian>
94+
<version.plugin.wildfly-maven>5.1.3.Final</version.plugin.wildfly-maven>
7295
</properties>
96+
7397
<dependencyManagement>
7498
<dependencies>
7599
<dependency>
@@ -226,32 +250,20 @@
226250
<build>
227251
<pluginManagement>
228252
<plugins>
229-
<plugin>
230-
<groupId>org.apache.maven.plugins</groupId>
231-
<artifactId>maven-compiler-plugin</artifactId>
232-
<version>3.14.0</version>
233-
<configuration>
234-
<source>17</source>
235-
<target>17</target>
236-
<compilerArgs>
237-
<arg>-parameters</arg>
238-
</compilerArgs>
239-
</configuration>
240-
</plugin>
241253
<plugin>
242254
<groupId>org.wildfly.glow</groupId>
243255
<artifactId>wildfly-glow-arquillian-plugin</artifactId>
244-
<version>1.4.1.Final</version>
256+
<version>${version.plugin.wildfly-glow-arquillian}</version>
245257
</plugin>
246258
<plugin>
247259
<groupId>org.wildfly.plugins</groupId>
248260
<artifactId>wildfly-maven-plugin</artifactId>
249-
<version>5.1.3.Final</version>
261+
<version>${version.plugin.wildfly-maven}</version>
250262
</plugin>
263+
<!-- The maven-xxx-plugin versions are managed by the parent -->
251264
<plugin>
252265
<groupId>org.apache.maven.plugins</groupId>
253266
<artifactId>maven-surefire-plugin</artifactId>
254-
<version>3.5.3</version>
255267
<configuration>
256268
<systemPropertyVariables>
257269
<jboss.home>${jboss.home}</jboss.home>
@@ -263,7 +275,6 @@
263275
<plugin>
264276
<groupId>org.apache.maven.plugins</groupId>
265277
<artifactId>maven-source-plugin</artifactId>
266-
<version>3.3.1</version>
267278
<executions>
268279
<execution>
269280
<id>attach-sources</id>
@@ -276,7 +287,6 @@
276287
<plugin>
277288
<groupId>org.apache.maven.plugins</groupId>
278289
<artifactId>maven-javadoc-plugin</artifactId>
279-
<version>3.11.2</version>
280290
<executions>
281291
<execution>
282292
<id>attach-javadocs</id>
@@ -289,7 +299,6 @@
289299
<plugin>
290300
<groupId>org.apache.maven.plugins</groupId>
291301
<artifactId>maven-gpg-plugin</artifactId>
292-
<version>3.2.7</version>
293302
<executions>
294303
<execution>
295304
<id>sign-artifacts</id>
@@ -300,10 +309,6 @@
300309
</execution>
301310
</executions>
302311
</plugin>
303-
<plugin>
304-
<artifactId>maven-assembly-plugin</artifactId>
305-
<version>3.7.1</version>
306-
</plugin>
307312
</plugins>
308313
</pluginManagement>
309314
</build>
@@ -322,5 +327,13 @@
322327
<arquillian.java.vm.args>-agentlib:jdwp=transport=dt_socket,address=*:${server.debug.port},server=y,suspend=y</arquillian.java.vm.args>
323328
</properties>
324329
</profile>
330+
<profile>
331+
<!-- Do a "dry run" by deploying to the staging repository -->
332+
<id>staging-deploy</id>
333+
<properties>
334+
<maven.repository.url>https://repository.jboss.org/nexus/repository/wildfly-extras-staging/</maven.repository.url>
335+
</properties>
336+
</profile>
325337
</profiles>
338+
326339
</project>

‎tck/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.wildfly.extras.a2a</groupId>
8+
<groupId>org.wildfly.a2a</groupId>
99
<artifactId>a2a-java-sdk-server-jakarta-parent</artifactId>
1010
<version>0.3.0.Beta1-SNAPSHOT</version>
1111
</parent>

‎tests-grpc/pom.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.wildfly.extras.a2a</groupId>
8+
<groupId>org.wildfly.a2a</groupId>
99
<artifactId>a2a-java-sdk-server-jakarta-parent</artifactId>
1010
<version>0.3.0.Beta1-SNAPSHOT</version>
1111
</parent>
@@ -179,6 +179,21 @@
179179

180180
<build>
181181
<plugins>
182+
<plugin>
183+
<!--
184+
Disable the nxrm3 plugin for this test module so that we don't deploy it.
185+
Otherwise, we get errors on validation due to missing sources + javadoc
186+
-->
187+
<groupId>org.sonatype.plugins</groupId>
188+
<artifactId>nxrm3-maven-plugin</artifactId>
189+
<executions>
190+
<execution>
191+
<id>nexus-deploy</id>
192+
<phase>none</phase>
193+
</execution>
194+
</executions>
195+
</plugin>
196+
182197
<!-- WildFly Glow plugin for automatic layer detection -->
183198
<plugin>
184199
<groupId>org.wildfly.glow</groupId>

‎tests/pom.xml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<parent>
8-
<groupId>org.wildfly.extras.a2a</groupId>
8+
<groupId>org.wildfly.a2a</groupId>
99
<artifactId>a2a-java-sdk-server-jakarta-parent</artifactId>
1010
<version>0.3.0.Beta1-SNAPSHOT</version>
1111
</parent>
@@ -127,12 +127,22 @@
127127
</dependency>
128128
</dependencies>
129129
<build>
130-
<pluginManagement>
131-
<plugins>
132-
133-
</plugins>
134-
</pluginManagement>
135130
<plugins>
131+
<plugin>
132+
<!--
133+
Disable the nxrm3 plugin for this test module so that we don't deploy it.
134+
Otherwise, we get errors on validation due to missing sources + javadoc
135+
-->
136+
<groupId>org.sonatype.plugins</groupId>
137+
<artifactId>nxrm3-maven-plugin</artifactId>
138+
<executions>
139+
<execution>
140+
<id>nexus-deploy</id>
141+
<phase>none</phase>
142+
</execution>
143+
</executions>
144+
</plugin>
145+
136146
<plugin>
137147
<groupId>org.wildfly.glow</groupId>
138148
<artifactId>wildfly-glow-arquillian-plugin</artifactId>

0 commit comments

Comments
 (0)