Skip to content

Commit ef40a08

Browse files
lincolnthreelincolnthree
committed
Merge pull request forge#529 from gastaldi/maven_3_2_5
FORGE-2186: Upgraded to Maven 3.2.5 and Aether 1.0
2 parents 52ba603 + c2284fc commit ef40a08

File tree

32 files changed

+968
-1618
lines changed

32 files changed

+968
-1618
lines changed

‎addon-manager/addon/pom.xml

Lines changed: 28 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.jboss.forge.addon</groupId>
@@ -60,22 +61,6 @@
6061

6162
<build>
6263
<plugins>
63-
<plugin>
64-
<groupId>org.jboss.forge.furnace</groupId>
65-
<artifactId>furnace-maven-plugin</artifactId>
66-
<executions>
67-
<execution>
68-
<id>generate-dot</id>
69-
<phase>prepare-package</phase>
70-
<goals>
71-
<goal>generate-dot</goal>
72-
</goals>
73-
<configuration>
74-
<attach>true</attach>
75-
</configuration>
76-
</execution>
77-
</executions>
78-
</plugin>
7964
<plugin>
8065
<groupId>org.apache.maven.plugins</groupId>
8166
<artifactId>maven-jar-plugin</artifactId>
@@ -95,4 +80,30 @@
9580
</plugin>
9681
</plugins>
9782
</build>
83+
84+
<profiles>
85+
<profile>
86+
<id>release</id>
87+
<build>
88+
<plugins>
89+
<plugin>
90+
<groupId>org.jboss.forge.furnace</groupId>
91+
<artifactId>furnace-maven-plugin</artifactId>
92+
<executions>
93+
<execution>
94+
<id>generate-dot</id>
95+
<phase>prepare-package</phase>
96+
<goals>
97+
<goal>generate-dot</goal>
98+
</goals>
99+
<configuration>
100+
<attach>true</attach>
101+
</configuration>
102+
</execution>
103+
</executions>
104+
</plugin>
105+
</plugins>
106+
</build>
107+
</profile>
108+
</profiles>
98109
</project>

‎addons/addon/pom.xml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.jboss.forge.addon</groupId>
@@ -64,22 +65,6 @@
6465
</dependencies>
6566
<build>
6667
<plugins>
67-
<plugin>
68-
<groupId>org.jboss.forge.furnace</groupId>
69-
<artifactId>furnace-maven-plugin</artifactId>
70-
<executions>
71-
<execution>
72-
<id>generate-dot</id>
73-
<phase>prepare-package</phase>
74-
<goals>
75-
<goal>generate-dot</goal>
76-
</goals>
77-
<configuration>
78-
<attach>true</attach>
79-
</configuration>
80-
</execution>
81-
</executions>
82-
</plugin>
8368
<plugin>
8469
<groupId>org.apache.maven.plugins</groupId>
8570
<artifactId>maven-jar-plugin</artifactId>
@@ -97,7 +82,32 @@
9782
</execution>
9883
</executions>
9984
</plugin>
100-
10185
</plugins>
10286
</build>
87+
88+
<profiles>
89+
<profile>
90+
<id>release</id>
91+
<build>
92+
<plugins>
93+
<plugin>
94+
<groupId>org.jboss.forge.furnace</groupId>
95+
<artifactId>furnace-maven-plugin</artifactId>
96+
<executions>
97+
<execution>
98+
<id>generate-dot</id>
99+
<phase>prepare-package</phase>
100+
<goals>
101+
<goal>generate-dot</goal>
102+
</goals>
103+
<configuration>
104+
<attach>true</attach>
105+
</configuration>
106+
</execution>
107+
</executions>
108+
</plugin>
109+
</plugins>
110+
</build>
111+
</profile>
112+
</profiles>
103113
</project>

‎bean-validation/addon/pom.xml

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.jboss.forge.addon</groupId>
@@ -44,22 +45,6 @@
4445
</dependencies>
4546
<build>
4647
<plugins>
47-
<plugin>
48-
<groupId>org.jboss.forge.furnace</groupId>
49-
<artifactId>furnace-maven-plugin</artifactId>
50-
<executions>
51-
<execution>
52-
<id>generate-dot</id>
53-
<phase>prepare-package</phase>
54-
<goals>
55-
<goal>generate-dot</goal>
56-
</goals>
57-
<configuration>
58-
<attach>true</attach>
59-
</configuration>
60-
</execution>
61-
</executions>
62-
</plugin>
6348
<plugin>
6449
<groupId>org.apache.maven.plugins</groupId>
6550
<artifactId>maven-jar-plugin</artifactId>
@@ -77,7 +62,33 @@
7762
</execution>
7863
</executions>
7964
</plugin>
80-
8165
</plugins>
8266
</build>
67+
68+
<profiles>
69+
<profile>
70+
<id>release</id>
71+
<build>
72+
<plugins>
73+
<plugin>
74+
<groupId>org.jboss.forge.furnace</groupId>
75+
<artifactId>furnace-maven-plugin</artifactId>
76+
<executions>
77+
<execution>
78+
<id>generate-dot</id>
79+
<phase>prepare-package</phase>
80+
<goals>
81+
<goal>generate-dot</goal>
82+
</goals>
83+
<configuration>
84+
<attach>true</attach>
85+
</configuration>
86+
</execution>
87+
</executions>
88+
</plugin>
89+
</plugins>
90+
</build>
91+
</profile>
92+
</profiles>
93+
8394
</project>

‎configuration/addon/pom.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.jboss.forge.addon</groupId>
@@ -48,22 +49,6 @@
4849
</dependencies>
4950
<build>
5051
<plugins>
51-
<plugin>
52-
<groupId>org.jboss.forge.furnace</groupId>
53-
<artifactId>furnace-maven-plugin</artifactId>
54-
<executions>
55-
<execution>
56-
<id>generate-dot</id>
57-
<phase>prepare-package</phase>
58-
<goals>
59-
<goal>generate-dot</goal>
60-
</goals>
61-
<configuration>
62-
<attach>true</attach>
63-
</configuration>
64-
</execution>
65-
</executions>
66-
</plugin>
6752
<plugin>
6853
<artifactId>maven-jar-plugin</artifactId>
6954
<executions>
@@ -81,4 +66,29 @@
8166
</plugin>
8267
</plugins>
8368
</build>
69+
<profiles>
70+
<profile>
71+
<id>release</id>
72+
<build>
73+
<plugins>
74+
<plugin>
75+
<groupId>org.jboss.forge.furnace</groupId>
76+
<artifactId>furnace-maven-plugin</artifactId>
77+
<executions>
78+
<execution>
79+
<id>generate-dot</id>
80+
<phase>prepare-package</phase>
81+
<goals>
82+
<goal>generate-dot</goal>
83+
</goals>
84+
<configuration>
85+
<attach>true</attach>
86+
</configuration>
87+
</execution>
88+
</executions>
89+
</plugin>
90+
</plugins>
91+
</build>
92+
</profile>
93+
</profiles>
8494
</project>

‎convert/addon/pom.xml

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.jboss.forge.addon</groupId>
@@ -34,22 +35,6 @@
3435

3536
<build>
3637
<plugins>
37-
<plugin>
38-
<groupId>org.jboss.forge.furnace</groupId>
39-
<artifactId>furnace-maven-plugin</artifactId>
40-
<executions>
41-
<execution>
42-
<id>generate-dot</id>
43-
<phase>prepare-package</phase>
44-
<goals>
45-
<goal>generate-dot</goal>
46-
</goals>
47-
<configuration>
48-
<attach>true</attach>
49-
</configuration>
50-
</execution>
51-
</executions>
52-
</plugin>
5338
<plugin>
5439
<groupId>org.apache.maven.plugins</groupId>
5540
<artifactId>maven-jar-plugin</artifactId>
@@ -67,7 +52,31 @@
6752
</execution>
6853
</executions>
6954
</plugin>
70-
7155
</plugins>
7256
</build>
57+
<profiles>
58+
<profile>
59+
<id>release</id>
60+
<build>
61+
<plugins>
62+
<plugin>
63+
<groupId>org.jboss.forge.furnace</groupId>
64+
<artifactId>furnace-maven-plugin</artifactId>
65+
<executions>
66+
<execution>
67+
<id>generate-dot</id>
68+
<phase>prepare-package</phase>
69+
<goals>
70+
<goal>generate-dot</goal>
71+
</goals>
72+
<configuration>
73+
<attach>true</attach>
74+
</configuration>
75+
</execution>
76+
</executions>
77+
</plugin>
78+
</plugins>
79+
</build>
80+
</profile>
81+
</profiles>
7382
</project>

‎core/addon/pom.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
@@ -126,22 +127,6 @@
126127

127128
<build>
128129
<plugins>
129-
<plugin>
130-
<groupId>org.jboss.forge.furnace</groupId>
131-
<artifactId>furnace-maven-plugin</artifactId>
132-
<executions>
133-
<execution>
134-
<id>generate-dot</id>
135-
<phase>prepare-package</phase>
136-
<goals>
137-
<goal>generate-dot</goal>
138-
</goals>
139-
<configuration>
140-
<attach>true</attach>
141-
</configuration>
142-
</execution>
143-
</executions>
144-
</plugin>
145130
<plugin>
146131
<artifactId>maven-jar-plugin</artifactId>
147132
<executions>
@@ -159,4 +144,29 @@
159144
</plugin>
160145
</plugins>
161146
</build>
147+
<profiles>
148+
<profile>
149+
<id>release</id>
150+
<build>
151+
<plugins>
152+
<plugin>
153+
<groupId>org.jboss.forge.furnace</groupId>
154+
<artifactId>furnace-maven-plugin</artifactId>
155+
<executions>
156+
<execution>
157+
<id>generate-dot</id>
158+
<phase>prepare-package</phase>
159+
<goals>
160+
<goal>generate-dot</goal>
161+
</goals>
162+
<configuration>
163+
<attach>true</attach>
164+
</configuration>
165+
</execution>
166+
</executions>
167+
</plugin>
168+
</plugins>
169+
</build>
170+
</profile>
171+
</profiles>
162172
</project>

0 commit comments

Comments
 (0)