Skip to content

Commit 869eda2

Browse files
dmatejdmatej
committed
Fixed flattening
- The plugin enforces the flattenmode set of elements, so fatjar ovewrote our set in parent -> resolved by splitting executions to two types - flattened-pom.xml is not hidden file any more and since it is in the target directory, it is automatically deleted by maven clean plugin. - Switched from ossrh to oss flattenMode - url attributes moved to nucleus-parent, so simple-glassfish-jar takes it too - I used kdiff3 to compare results, based on that I extended lists of elements to keep/flatten Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
1 parent 7cee23e commit 869eda2

File tree

11 files changed

+55
-132
lines changed

11 files changed

+55
-132
lines changed

‎appserver/common/glassfish-ee-api/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,18 +78,8 @@
7878
<artifactId>flatten-maven-plugin</artifactId>
7979
<executions>
8080
<execution>
81-
<id>flatten</id>
81+
<id>flat-jar</id>
8282
<phase>process-resources</phase>
83-
<goals>
84-
<goal>flatten</goal>
85-
</goals>
86-
</execution>
87-
<execution>
88-
<id>flatten.clean</id>
89-
<phase>clean</phase>
90-
<goals>
91-
<goal>clean</goal>
92-
</goals>
9383
</execution>
9484
</executions>
9585
</plugin>

‎appserver/distributions/glassfish/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,23 +121,10 @@
121121
<plugin>
122122
<groupId>org.codehaus.mojo</groupId>
123123
<artifactId>flatten-maven-plugin</artifactId>
124-
<configuration>
125-
<flattenMode>fatjar</flattenMode>
126-
</configuration>
127124
<executions>
128125
<execution>
129-
<id>flatten</id>
126+
<id>archive-with-dependencies</id>
130127
<phase>process-resources</phase>
131-
<goals>
132-
<goal>flatten</goal>
133-
</goals>
134-
</execution>
135-
<execution>
136-
<id>flatten.clean</id>
137-
<phase>clean</phase>
138-
<goals>
139-
<goal>clean</goal>
140-
</goals>
141128
</execution>
142129
</executions>
143130
</plugin>

‎appserver/distributions/web/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,23 +109,10 @@
109109
<plugin>
110110
<groupId>org.codehaus.mojo</groupId>
111111
<artifactId>flatten-maven-plugin</artifactId>
112-
<configuration>
113-
<flattenMode>fatjar</flattenMode>
114-
</configuration>
115112
<executions>
116113
<execution>
117-
<id>flatten</id>
114+
<id>archive-with-dependencies</id>
118115
<phase>process-resources</phase>
119-
<goals>
120-
<goal>flatten</goal>
121-
</goals>
122-
</execution>
123-
<execution>
124-
<id>flatten.clean</id>
125-
<phase>clean</phase>
126-
<goals>
127-
<goal>clean</goal>
128-
</goals>
129116
</execution>
130117
</executions>
131118
</plugin>

‎appserver/extras/embedded/all/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -201,23 +201,10 @@
201201
<plugin>
202202
<groupId>org.codehaus.mojo</groupId>
203203
<artifactId>flatten-maven-plugin</artifactId>
204-
<configuration>
205-
<flattenMode>fatjar</flattenMode>
206-
</configuration>
207204
<executions>
208205
<execution>
209-
<id>flatten</id>
206+
<id>archive-with-dependencies</id>
210207
<phase>process-resources</phase>
211-
<goals>
212-
<goal>flatten</goal>
213-
</goals>
214-
</execution>
215-
<execution>
216-
<id>flatten.clean</id>
217-
<phase>clean</phase>
218-
<goals>
219-
<goal>clean</goal>
220-
</goals>
221208
</execution>
222209
</executions>
223210
</plugin>

‎appserver/extras/embedded/web/pom.xml‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -225,23 +225,10 @@
225225
<plugin>
226226
<groupId>org.codehaus.mojo</groupId>
227227
<artifactId>flatten-maven-plugin</artifactId>
228-
<configuration>
229-
<flattenMode>fatjar</flattenMode>
230-
</configuration>
231228
<executions>
232229
<execution>
233-
<id>flatten</id>
230+
<id>archive-with-dependencies</id>
234231
<phase>process-resources</phase>
235-
<goals>
236-
<goal>flatten</goal>
237-
</goals>
238-
</execution>
239-
<execution>
240-
<id>flatten.clean</id>
241-
<phase>clean</phase>
242-
<goals>
243-
<goal>clean</goal>
244-
</goals>
245232
</execution>
246233
</executions>
247234
</plugin>

‎appserver/pom.xml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-->
2020

2121
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" child.project.url.inherit.append.path="false">
22+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2323
<modelVersion>4.0.0</modelVersion>
2424

2525
<parent>
@@ -33,7 +33,6 @@
3333
<packaging>pom</packaging>
3434

3535
<name>Eclipse GlassFish Parent Project</name>
36-
<url>https://projects.eclipse.org/projects/ee4j.glassfish</url>
3736

3837
<modules>
3938
<module>common</module>
@@ -71,14 +70,6 @@
7170
<module>ant-tasks</module>
7271
</modules>
7372

74-
<scm child.scm.connection.inherit.append.path="false"
75-
child.scm.developerConnection.inherit.append.path="false"
76-
child.scm.url.inherit.append.path="false">
77-
<connection>scm:git:git://github.com/eclipse-ee4j/glassfish.git</connection>
78-
<developerConnection>scm:git:git://github.com/eclipse-ee4j/glassfish.git</developerConnection>
79-
<url>https://github.com/eclipse-ee4j/glassfish</url>
80-
</scm>
81-
8273
<properties>
8374
<glassfish.version>${project.version}</glassfish.version>
8475

‎appserver/web/web-embed/api/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,8 @@
6363
<artifactId>flatten-maven-plugin</artifactId>
6464
<executions>
6565
<execution>
66-
<id>flatten</id>
66+
<id>flat-jar</id>
6767
<phase>process-resources</phase>
68-
<goals>
69-
<goal>flatten</goal>
70-
</goals>
71-
</execution>
72-
<execution>
73-
<id>flatten.clean</id>
74-
<phase>clean</phase>
75-
<goals>
76-
<goal>clean</goal>
77-
</goals>
7868
</execution>
7969
</executions>
8070
</plugin>

‎nucleus/common/glassfish-api/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,8 @@
114114
<artifactId>flatten-maven-plugin</artifactId>
115115
<executions>
116116
<execution>
117-
<id>flatten</id>
117+
<id>flat-jar</id>
118118
<phase>process-resources</phase>
119-
<goals>
120-
<goal>flatten</goal>
121-
</goals>
122-
</execution>
123-
<execution>
124-
<id>flatten.clean</id>
125-
<phase>clean</phase>
126-
<goals>
127-
<goal>clean</goal>
128-
</goals>
129119
</execution>
130120
</executions>
131121
</plugin>

‎nucleus/common/scattered-archive-api/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,8 @@
9292
<artifactId>flatten-maven-plugin</artifactId>
9393
<executions>
9494
<execution>
95-
<id>flatten</id>
95+
<id>flat-jar</id>
9696
<phase>process-resources</phase>
97-
<goals>
98-
<goal>flatten</goal>
99-
</goals>
100-
</execution>
101-
<execution>
102-
<id>flatten.clean</id>
103-
<phase>clean</phase>
104-
<goals>
105-
<goal>clean</goal>
106-
</goals>
10797
</execution>
10898
</executions>
10999
</plugin>

‎nucleus/common/simple-glassfish-api/pom.xml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,8 @@
5454
<artifactId>flatten-maven-plugin</artifactId>
5555
<executions>
5656
<execution>
57-
<id>flatten</id>
57+
<id>flat-jar</id>
5858
<phase>process-resources</phase>
59-
<goals>
60-
<goal>flatten</goal>
61-
</goals>
62-
</execution>
63-
<execution>
64-
<id>flatten.clean</id>
65-
<phase>clean</phase>
66-
<goals>
67-
<goal>clean</goal>
68-
</goals>
6959
</execution>
7060
</executions>
7161
</plugin>

0 commit comments

Comments
 (0)