Skip to content

Commit 809cbf5

Browse files
line-oline-o
authored
Merge pull request #3951 from adamretter/hotfix/github-release-only-for-releases
2 parents 3516b2e + e1363b4 commit 809cbf5

File tree

2 files changed

+84
-64
lines changed

2 files changed

+84
-64
lines changed

‎exist-distribution/pom.xml‎

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,39 +1066,6 @@
10661066
</execution>
10671067
</executions>
10681068
</plugin>
1069-
<plugin>
1070-
<groupId>de.jutzig</groupId>
1071-
<artifactId>github-release-plugin</artifactId>
1072-
<executions>
1073-
<execution>
1074-
<id>github-upload</id>
1075-
<phase>deploy</phase>
1076-
<goals>
1077-
<goal>release</goal>
1078-
</goals>
1079-
<inherited>false</inherited>
1080-
<configuration>
1081-
<description>
1082-
Release Notes: https://exist-db.org/exist/apps/wiki/blogs/eXist/exist${project.version}
1083-
1084-
Maven Central: https://search.maven.org/search?q=g:org.exist-db
1085-
</description>
1086-
<releaseName>eXist-db ${project.version}</releaseName>
1087-
<tag>eXist-${project.version}</tag>
1088-
<fileSets>
1089-
<fileSet>
1090-
<directory>${project.build.directory}</directory>
1091-
<includes>
1092-
<include>eXist-db-${project.version}.dmg</include>
1093-
<include>${project.artifactId}-${project.version}-unix.tar.bz2</include>
1094-
<include>${project.artifactId}-${project.version}-win.zip</include>
1095-
</includes>
1096-
</fileSet>
1097-
</fileSets>
1098-
</configuration>
1099-
</execution>
1100-
</executions>
1101-
</plugin>
11021069
</plugins>
11031070
</build>
11041071

@@ -1284,6 +1251,49 @@
12841251
</plugins>
12851252
</build>
12861253
</profile>
1254+
1255+
<profile>
1256+
<!-- NOTE: this is activated by the maven-release-plugin -->
1257+
<id>exist-release</id>
1258+
<build>
1259+
<plugins>
1260+
<!-- This is needed in a profile to workaround https://github.com/jutzig/github-release-plugin/issues/50 -->
1261+
<plugin>
1262+
<groupId>de.jutzig</groupId>
1263+
<artifactId>github-release-plugin</artifactId>
1264+
<executions>
1265+
<execution>
1266+
<id>github-upload</id>
1267+
<phase>deploy</phase>
1268+
<goals>
1269+
<goal>release</goal>
1270+
</goals>
1271+
<inherited>false</inherited>
1272+
<configuration>
1273+
<description>
1274+
Release Notes: https://exist-db.org/exist/apps/wiki/blogs/eXist/exist${project.version}
1275+
1276+
Maven Central: https://search.maven.org/search?q=g:org.exist-db
1277+
</description>
1278+
<releaseName>eXist-db ${project.version}</releaseName>
1279+
<tag>eXist-${project.version}</tag>
1280+
<fileSets>
1281+
<fileSet>
1282+
<directory>${project.build.directory}</directory>
1283+
<includes>
1284+
<include>eXist-db-${project.version}.dmg</include>
1285+
<include>${project.artifactId}-${project.version}-unix.tar.bz2</include>
1286+
<include>${project.artifactId}-${project.version}-win.zip</include>
1287+
</includes>
1288+
</fileSet>
1289+
</fileSets>
1290+
</configuration>
1291+
</execution>
1292+
</executions>
1293+
</plugin>
1294+
</plugins>
1295+
</build>
1296+
</profile>
12871297
</profiles>
12881298

12891299
</project>

‎exist-installer/pom.xml‎

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -135,37 +135,6 @@
135135
<skip>true</skip>
136136
</configuration>
137137
</plugin>
138-
<plugin>
139-
<groupId>de.jutzig</groupId>
140-
<artifactId>github-release-plugin</artifactId>
141-
<executions>
142-
<execution>
143-
<id>github-upload</id>
144-
<phase>deploy</phase>
145-
<goals>
146-
<goal>release</goal>
147-
</goals>
148-
<inherited>true</inherited>
149-
<configuration>
150-
<description>
151-
Release Notes: https://exist-db.org/exist/apps/wiki/blogs/eXist/exist${project.version}
152-
153-
Maven Central: https://search.maven.org/search?q=g:org.exist-db
154-
</description>
155-
<releaseName>eXist-db ${project.version}</releaseName>
156-
<tag>eXist-${project.version}</tag>
157-
<fileSets>
158-
<fileSet>
159-
<directory>${project.build.directory}</directory>
160-
<includes>
161-
<include>${project.artifactId}-${project.version}.jar</include>
162-
</includes>
163-
</fileSet>
164-
</fileSets>
165-
</configuration>
166-
</execution>
167-
</executions>
168-
</plugin>
169138
</plugins>
170139
</build>
171140

@@ -201,6 +170,47 @@
201170
</plugins>
202171
</build>
203172
</profile>
173+
174+
<profile>
175+
<!-- NOTE: this is activated by the maven-release-plugin -->
176+
<id>exist-release</id>
177+
<build>
178+
<plugins>
179+
<!-- This is needed in a profile to workaround https://github.com/jutzig/github-release-plugin/issues/50 -->
180+
<plugin>
181+
<groupId>de.jutzig</groupId>
182+
<artifactId>github-release-plugin</artifactId>
183+
<executions>
184+
<execution>
185+
<id>github-upload</id>
186+
<phase>deploy</phase>
187+
<goals>
188+
<goal>release</goal>
189+
</goals>
190+
<inherited>true</inherited>
191+
<configuration>
192+
<description>
193+
Release Notes: https://exist-db.org/exist/apps/wiki/blogs/eXist/exist${project.version}
194+
195+
Maven Central: https://search.maven.org/search?q=g:org.exist-db
196+
</description>
197+
<releaseName>eXist-db ${project.version}</releaseName>
198+
<tag>eXist-${project.version}</tag>
199+
<fileSets>
200+
<fileSet>
201+
<directory>${project.build.directory}</directory>
202+
<includes>
203+
<include>${project.artifactId}-${project.version}.jar</include>
204+
</includes>
205+
</fileSet>
206+
</fileSets>
207+
</configuration>
208+
</execution>
209+
</executions>
210+
</plugin>
211+
</plugins>
212+
</build>
213+
</profile>
204214
</profiles>
205215

206216
</project>

0 commit comments

Comments
 (0)