Skip to content

Commit 743aa11

Browse files
committed
Ensure POM is flattened for user consumption before publishing to Maven
1 parent 6343ba2 commit 743aa11

2 files changed

Lines changed: 62 additions & 17 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
clean:
22
$(MAKE) -C toolchain clean
33
./mvnw clean
4-
@rm dependency-reduced-pom.xml
4+
@rm -f dependency-reduced-pom.xml
55

66
native:
77
$(MAKE) -C toolchain make
88

99
build: native
10-
./mvnw clean package
10+
./mvnw clean package -Ptesting
1111

1212
test: build
1313
java -jar target/jSerialComm-$(shell ls target/*-test.jar | cut -d '-' -f 2)-test.jar

pom.xml

Lines changed: 60 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -157,28 +157,35 @@
157157
</plugin>
158158

159159
<plugin>
160-
<artifactId>maven-assembly-plugin</artifactId>
161-
<version>2.3</version>
162-
<configuration>
163-
<descriptors>
164-
<descriptor>src/assembly/assembly.xml</descriptor>
165-
</descriptors>
166-
</configuration>
160+
<groupId>org.codehaus.mojo</groupId>
161+
<artifactId>flatten-maven-plugin</artifactId>
162+
<version>1.7.3</version>
167163
<executions>
168164
<execution>
169-
<id>make-assembly</id>
170-
<phase>package</phase>
165+
<id>flatten</id>
166+
<phase>process-resources</phase>
171167
<goals>
172-
<goal>single</goal>
168+
<goal>flatten</goal>
173169
</goals>
174170
<configuration>
175-
<archive>
176-
<manifest>
177-
<mainClass>com.fazecast.jSerialComm.SerialPortTest</mainClass>
178-
</manifest>
179-
</archive>
171+
<outputDirectory>target</outputDirectory>
172+
<flattenedPomFilename>deploy-pom.xml</flattenedPomFilename>
173+
<updatePomFile>true</updatePomFile>
174+
<flattenMode>oss</flattenMode>
175+
<pomElements>
176+
<repositories>remove</repositories>
177+
<dependencies>remove</dependencies>
178+
<build>remove</build>
179+
</pomElements>
180180
</configuration>
181181
</execution>
182+
<execution>
183+
<id>flatten.clean</id>
184+
<phase>clean</phase>
185+
<goals>
186+
<goal>clean</goal>
187+
</goals>
188+
</execution>
182189
</executions>
183190
</plugin>
184191

@@ -213,4 +220,42 @@
213220
</plugin>
214221
</plugins>
215222
</build>
223+
224+
<profiles>
225+
<profile>
226+
<id>testing</id>
227+
<activation>
228+
<activeByDefault>false</activeByDefault>
229+
</activation>
230+
<build>
231+
<plugins>
232+
<plugin>
233+
<artifactId>maven-assembly-plugin</artifactId>
234+
<version>2.3</version>
235+
<configuration>
236+
<descriptors>
237+
<descriptor>src/assembly/assembly.xml</descriptor>
238+
</descriptors>
239+
</configuration>
240+
<executions>
241+
<execution>
242+
<id>make-assembly</id>
243+
<phase>package</phase>
244+
<goals>
245+
<goal>single</goal>
246+
</goals>
247+
<configuration>
248+
<archive>
249+
<manifest>
250+
<mainClass>com.fazecast.jSerialComm.SerialPortTest</mainClass>
251+
</manifest>
252+
</archive>
253+
</configuration>
254+
</execution>
255+
</executions>
256+
</plugin>
257+
</plugins>
258+
</build>
259+
</profile>
260+
</profiles>
216261
</project>

0 commit comments

Comments
 (0)