Skip to content

Commit ceff491

Browse files
committed
[releng] Simplify skipping install/deploy/japicmp for some artifacts
Use properties instead of <plugin> elements to set skip=true.
1 parent 814b06d commit ceff491

3 files changed

Lines changed: 12 additions & 77 deletions

File tree

sshd-benchmarks/pom.xml

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3434
<jmh.version>1.37</jmh.version>
3535
<uberjar.name>benchmarks</uberjar.name>
36+
<maven.install.skip>true</maven.install.skip>
37+
<maven.deploy.skip>true</maven.deploy.skip>
38+
<japicmp.skip>true</japicmp.skip>
3639
</properties>
3740

3841
<dependencies>
@@ -53,7 +56,7 @@
5356
<artifactId>args4j</artifactId>
5457
<version>2.37</version>
5558
</dependency>
56-
59+
5760
<dependency>
5861
<groupId>org.apache.sshd</groupId>
5962
<artifactId>sshd-common</artifactId>
@@ -156,29 +159,6 @@
156159
</execution>
157160
</executions>
158161
</plugin>
159-
<plugin>
160-
<groupId>com.github.siom79.japicmp</groupId>
161-
<artifactId>japicmp-maven-plugin</artifactId>
162-
<version>${japicmp.version}</version>
163-
<configuration>
164-
<skip>true</skip>
165-
</configuration>
166-
</plugin>
167-
<!-- Don't install or deploy this. -->
168-
<plugin>
169-
<groupId>org.apache.maven.plugins</groupId>
170-
<artifactId>maven-install-plugin</artifactId>
171-
<configuration>
172-
<skip>true</skip>
173-
</configuration>
174-
</plugin>
175-
<plugin>
176-
<groupId>org.apache.maven.plugins</groupId>
177-
<artifactId>maven-deploy-plugin</artifactId>
178-
<configuration>
179-
<skip>true</skip>
180-
</configuration>
181-
</plugin>
182162
</plugins>
183163
</build>
184164
</project>

sshd-site/pom.xml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ss'Z'</maven.build.timestamp.format>
37+
<maven.install.skip>true</maven.install.skip>
38+
<maven.deploy.skip>true</maven.deploy.skip>
39+
<pmd.skip>true</pmd.skip>
3740
</properties>
3841

3942
<build>
@@ -48,25 +51,8 @@
4851
</plugin>
4952
</plugins>
5053
</pluginManagement>
51-
<plugins>
52-
<!-- Don't install or deploy this. -->
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-install-plugin</artifactId>
56-
<configuration>
57-
<skip>true</skip>
58-
</configuration>
59-
</plugin>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-deploy-plugin</artifactId>
63-
<configuration>
64-
<skip>true</skip>
65-
</configuration>
66-
</plugin>
67-
</plugins>
6854
</build>
69-
55+
7056
<profiles>
7157
<profile>
7258
<id>japicmp</id>
@@ -165,7 +151,7 @@
165151
</build>
166152
</profile>
167153
</profiles>
168-
154+
169155
<reporting>
170156
<plugins>
171157
<plugin>
@@ -178,17 +164,6 @@
178164
</reportSet>
179165
</reportSets>
180166
</plugin>
181-
<plugin>
182-
<groupId>org.apache.maven.plugins</groupId>
183-
<artifactId>maven-pmd-plugin</artifactId>
184-
<reportSets>
185-
<reportSet>
186-
<configuration>
187-
<skip>true</skip>
188-
</configuration>
189-
</reportSet>
190-
</reportSets>
191-
</plugin>
192167
</plugins>
193168
</reporting>
194169

sshd-test/pom.xml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333

3434
<properties>
3535
<projectRoot>${project.basedir}/..</projectRoot>
36+
<maven.install.skip>true</maven.install.skip>
37+
<maven.deploy.skip>true</maven.deploy.skip>
38+
<japicmp.skip>true</japicmp.skip>
3639
</properties>
3740

3841
<dependencies>
@@ -118,29 +121,6 @@
118121

119122
<build>
120123
<plugins>
121-
<plugin>
122-
<groupId>com.github.siom79.japicmp</groupId>
123-
<artifactId>japicmp-maven-plugin</artifactId>
124-
<version>${japicmp.version}</version>
125-
<configuration>
126-
<skip>true</skip>
127-
</configuration>
128-
</plugin>
129-
<!-- Don't install or deploy this. -->
130-
<plugin>
131-
<groupId>org.apache.maven.plugins</groupId>
132-
<artifactId>maven-install-plugin</artifactId>
133-
<configuration>
134-
<skip>true</skip>
135-
</configuration>
136-
</plugin>
137-
<plugin>
138-
<groupId>org.apache.maven.plugins</groupId>
139-
<artifactId>maven-deploy-plugin</artifactId>
140-
<configuration>
141-
<skip>true</skip>
142-
</configuration>
143-
</plugin>
144124
<plugin>
145125
<groupId>org.apache.maven.plugins</groupId>
146126
<artifactId>maven-surefire-plugin</artifactId>

0 commit comments

Comments
 (0)