Skip to content

Commit 4f159f2

Browse files
pedro-hospedro-hos
authored
Merge pull request #956 from pedro-hos/1.1.x-nexusv3
Update pom.xml files to enable deployment via new JBoss Nexus process
2 parents 614f215 + e237851 commit 4f159f2

File tree

9 files changed

+67
-25
lines changed

9 files changed

+67
-25
lines changed

‎dist/build/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<artifactId>prospero-build</artifactId>
1010
<packaging>jar</packaging>
1111

12+
<name>Prospero Build</name>
13+
1214
<dependencies>
1315
<dependency>
1416
<groupId>org.wildfly.prospero</groupId>

‎dist/common/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<artifactId>prospero-dist-common</artifactId>
1010
<packaging>pom</packaging>
1111

12+
<name>Prospero Distributions Common</name>
13+
1214
<properties>
1315
<prospero.script.path>packages/org.jboss.prospero/content/bin/</prospero.script.path>
1416
</properties>

‎dist/docs/pom.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,14 @@
1515
<name>Prospero Docs</name>
1616

1717
<properties>
18+
<maven.deploy.skip>true</maven.deploy.skip>
19+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
1820
<ec2-pub-ip-dash>1-2-3-4</ec2-pub-ip-dash>
1921
<ec2-pub-ip>1.2.3.4</ec2-pub-ip>
2022
</properties>
2123

2224
<build>
2325
<plugins>
24-
<plugin>
25-
<groupId>org.apache.maven.plugins</groupId>
26-
<artifactId>maven-deploy-plugin</artifactId>
27-
<configuration>
28-
<skip>true</skip>
29-
</configuration>
30-
</plugin>
3126
<plugin>
3227
<groupId>org.asciidoctor</groupId>
3328
<artifactId>asciidoctor-maven-plugin</artifactId>

‎dist/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
<artifactId>prospero-dist</artifactId>
1313
<packaging>pom</packaging>
14+
15+
<name>Prospero Distributions</name>
1416

1517
<properties>
1618
<!-- common module renames the start scripts, need to use processed resources -->

‎integration-tests/pom.xml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
<artifactId>prospero-integration-tests</artifactId>
1111

12+
<name>Prospero Integration tests</name>
13+
1214
<properties>
13-
<maven.compiler.source>11</maven.compiler.source>
14-
<maven.compiler.target>11</maven.compiler.target>
15+
<maven.deploy.skip>true</maven.deploy.skip>
16+
<skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
1517
</properties>
1618

1719
<dependencies>
@@ -88,13 +90,6 @@
8890
<skipTests>true</skipTests>
8991
</configuration>
9092
</plugin>
91-
<plugin>
92-
<groupId>org.apache.maven.plugins</groupId>
93-
<artifactId>maven-deploy-plugin</artifactId>
94-
<configuration>
95-
<skip>true</skip>
96-
</configuration>
97-
</plugin>
9893
</plugins>
9994
</build>
10095

‎pom.xml‎

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.jboss</groupId>
77
<artifactId>jboss-parent</artifactId>
8-
<version>39</version>
8+
<version>50</version>
99
<relativePath />
1010
</parent>
1111

@@ -14,14 +14,61 @@
1414
<version>1.1.19.Final-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616

17+
<name>Prospero Parent</name>
18+
<description>Provisioning tool for the Wildfly application server.</description>
19+
<url>https://github.com/wildfly-extras/prospero/</url>
20+
21+
<licenses>
22+
<license>
23+
<name>Apache License 2.0</name>
24+
<url>https://www.apache.org/licenses/LICENSE-2.0</url>
25+
<distribution>repo</distribution>
26+
</license>
27+
</licenses>
28+
29+
<developers>
30+
<developer>
31+
<name>Bartosz Spyrko-Smietanko</name>
32+
<email>bspyrkos@redhat.com</email>
33+
<organization>Red Hat</organization>
34+
<organizationUrl>https://www.redhat.com</organizationUrl>
35+
</developer>
36+
<developer>
37+
<name>Pedro Silva</name>
38+
<email>pesilva@redhat.com</email>
39+
<organization>Red Hat</organization>
40+
<organizationUrl>https://www.redhat.com</organizationUrl>
41+
</developer>
42+
<developer>
43+
<name>Tomas Hofman</name>
44+
<email>thofman@redhat.com</email>
45+
<organization>Red Hat</organization>
46+
<organizationUrl>https://www.redhat.com</organizationUrl>
47+
</developer>
48+
<developer>
49+
<name>Yeray Borges Santana</name>
50+
<email>yborgess@redhat.com</email>
51+
<organization>Red Hat</organization>
52+
<organizationUrl>https://www.redhat.com</organizationUrl>
53+
</developer>
54+
<developer>
55+
<name>Jean Francois Denise</name>
56+
<email>jdenise@redhat.com</email>
57+
<organization>Red Hat</organization>
58+
<organizationUrl>https://www.redhat.com</organizationUrl>
59+
</developer>
60+
</developers>
61+
1762
<scm>
1863
<connection>scm:git:git@github.com:wildfly-extras/prospero.git</connection>
1964
<developerConnection>scm:git:git@github.com:wildfly-extras/prospero.git</developerConnection>
2065
<url>https://github.com/wildfly-extras/prospero</url>
21-
<tag>1.1.0.Final</tag>
22-
</scm>
66+
<tag>HEAD</tag>
67+
</scm>
2368

2469
<properties>
70+
<nexus.repository.staging>wildfly-staging</nexus.repository.staging>
71+
<maven.compiler.release>11</maven.compiler.release>
2572
<prospero.dist.name>prospero</prospero.dist.name>
2673
<prospero.target.server>Wildfly</prospero.target.server>
2774
<prospero.base.feature-pack.groupId>org.wildfly</prospero.base.feature-pack.groupId>
@@ -449,11 +496,6 @@
449496
<artifactId>maven-shade-plugin</artifactId>
450497
<version>${version.maven-shade-plugin}</version>
451498
</plugin>
452-
<plugin>
453-
<groupId>org.apache.maven.plugins</groupId>
454-
<artifactId>maven-compiler-plugin</artifactId>
455-
<version>${version.maven-compiler-plugin}</version>
456-
</plugin>
457499
<plugin>
458500
<groupId>org.apache.maven.plugins</groupId>
459501
<artifactId>maven-antrun-plugin</artifactId>

‎prospero-cli/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<artifactId>prospero-cli</artifactId>
1313
<packaging>jar</packaging>
1414

15+
<name>Prospero CLI</name>
16+
1517
<dependencies>
1618
<dependency>
1719
<groupId>com.fasterxml.jackson.dataformat</groupId>

‎prospero-common/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<artifactId>prospero-common</artifactId>
1313
<packaging>jar</packaging>
1414

15+
<name>Prospero Common</name>
16+
1517
<dependencies>
1618
<dependency>
1719
<groupId>org.wildfly.installation-manager</groupId>

‎prospero-common/src/main/java/org/wildfly/prospero/VersionLogger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public static String getVersion() throws Exception {
5555
URL url = resources.nextElement();
5656
Manifest manifest = new Manifest(url.openStream());
5757
final String specTitle = manifest.getMainAttributes().getValue("Specification-Title");
58-
if ("prospero-common".equals(specTitle) || "prospero-cli".equals(specTitle)) {
58+
if ("Prospero Common".equals(specTitle) || "Prospero CLI".equals(specTitle)) {
5959
return StringUtils.join(manifest.getMainAttributes().getValue("Implementation-Version"));
6060
}
6161
}

0 commit comments

Comments
 (0)