Skip to content

Commit e339fed

Browse files
imbajinimbajin
committed
fix(dist): generate doc & exit script when upload files failed
1 parent e400e4d commit e339fed

File tree

4 files changed

+46
-150
lines changed

4 files changed

+46
-150
lines changed

‎hugegraph-common/pom.xml

+2-54
Original file line numberDiff line numberDiff line change
@@ -210,39 +210,12 @@
210210
<build>
211211
<plugins>
212212
<plugin>
213+
<groupId>org.apache.maven.plugins</groupId>
213214
<artifactId>maven-compiler-plugin</artifactId>
214-
<configuration>
215-
<source>${compiler.source}</source>
216-
<target>${compiler.target}</target>
217-
<compilerArguments>
218-
<Xmaxerrs>500</Xmaxerrs>
219-
</compilerArguments>
220-
<compilerArgs>
221-
<arg>-Xlint:unchecked</arg>
222-
</compilerArgs>
223-
</configuration>
224215
</plugin>
225216
<plugin>
226217
<groupId>org.apache.maven.plugins</groupId>
227218
<artifactId>maven-jar-plugin</artifactId>
228-
<configuration>
229-
<archive>
230-
<index>true</index>
231-
<manifest>
232-
<addDefaultImplementationEntries>
233-
false
234-
</addDefaultImplementationEntries>
235-
<addDefaultSpecificationEntries>
236-
true
237-
</addDefaultSpecificationEntries>
238-
</manifest>
239-
<manifestEntries>
240-
<!-- Must be on one line, otherwise the automatic
241-
upgrade script cannot replace the version number -->
242-
<Implementation-Version>${project.version}</Implementation-Version>
243-
</manifestEntries>
244-
</archive>
245-
</configuration>
246219
</plugin>
247220

248221
<plugin>
@@ -273,45 +246,20 @@
273246

274247
<profiles>
275248
<profile>
276-
<id>release</id>
249+
<id>apache-release</id>
277250
<build>
278251
<plugins>
279252
<plugin>
280253
<groupId>org.apache.maven.plugins</groupId>
281254
<artifactId>maven-source-plugin</artifactId>
282-
<executions>
283-
<execution>
284-
<id>attach-sources</id>
285-
<goals>
286-
<goal>jar-no-fork</goal>
287-
</goals>
288-
</execution>
289-
</executions>
290255
</plugin>
291256
<plugin>
292257
<groupId>org.apache.maven.plugins</groupId>
293258
<artifactId>maven-javadoc-plugin</artifactId>
294-
<executions>
295-
<execution>
296-
<id>attach-javadocs</id>
297-
<goals>
298-
<goal>jar</goal>
299-
</goals>
300-
</execution>
301-
</executions>
302259
</plugin>
303260
<plugin>
304261
<groupId>org.apache.maven.plugins</groupId>
305262
<artifactId>maven-gpg-plugin</artifactId>
306-
<executions>
307-
<execution>
308-
<id>sign-artifacts</id>
309-
<phase>verify</phase>
310-
<goals>
311-
<goal>sign</goal>
312-
</goals>
313-
</execution>
314-
</executions>
315263
</plugin>
316264
</plugins>
317265
</build>

‎hugegraph-dist/scripts/apache-release.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,15 @@ GIT_BRANCH="release-${RELEASE_VERSION}"
2828

2929
RELEASE_VERSION=${RELEASE_VERSION:?"Please input the release version behind script"}
3030

31-
WORK_DIR=$(cd "$(dirname "$0")" || exit; pwd)
31+
WORK_DIR=$(
32+
cd "$(dirname "$0")" || exit
33+
pwd
34+
)
3235
cd "${WORK_DIR}" || exit
3336
echo "In the work dir: $(pwd)"
3437

3538
# clean old dir then build a new one
36-
rm -rfv dist && mkdir -p dist/apache-${REPO}
39+
rm -rf dist && mkdir -p dist/apache-${REPO}
3740

3841
# step1: package the source code
3942
cd ../../ || exit
@@ -92,9 +95,10 @@ svn status
9295

9396
##### 4.3 commit & push files
9497
if [ "$USERNAME" = "" ]; then
95-
svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}"
98+
svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}" || exit
9699
else
97-
svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}" --username "${USERNAME}" --password "${PASSWORD}"
100+
svn commit -m "submit files for ${REPO} ${RELEASE_VERSION}" \
101+
--username "${USERNAME}" --password "${PASSWORD}" || exit
98102
fi
99103

100104
echo "Finished all, please check all steps in script manually again!"

‎hugegraph-rpc/pom.xml

+2-54
Original file line numberDiff line numberDiff line change
@@ -103,39 +103,12 @@
103103
<build>
104104
<plugins>
105105
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
106107
<artifactId>maven-compiler-plugin</artifactId>
107-
<configuration>
108-
<source>${compiler.source}</source>
109-
<target>${compiler.target}</target>
110-
<compilerArguments>
111-
<Xmaxerrs>500</Xmaxerrs>
112-
</compilerArguments>
113-
<compilerArgs>
114-
<arg>-Xlint:unchecked</arg>
115-
</compilerArgs>
116-
</configuration>
117108
</plugin>
118109
<plugin>
119110
<groupId>org.apache.maven.plugins</groupId>
120111
<artifactId>maven-jar-plugin</artifactId>
121-
<configuration>
122-
<archive>
123-
<index>true</index>
124-
<manifest>
125-
<addDefaultImplementationEntries>
126-
false
127-
</addDefaultImplementationEntries>
128-
<addDefaultSpecificationEntries>
129-
true
130-
</addDefaultSpecificationEntries>
131-
</manifest>
132-
<manifestEntries>
133-
<!-- Must be on one line, otherwise the automatic
134-
upgrade script cannot replace the version number -->
135-
<Implementation-Version>${project.version}</Implementation-Version>
136-
</manifestEntries>
137-
</archive>
138-
</configuration>
139112
</plugin>
140113

141114
<plugin>
@@ -166,45 +139,20 @@
166139

167140
<profiles>
168141
<profile>
169-
<id>release</id>
142+
<id>apache-release</id>
170143
<build>
171144
<plugins>
172145
<plugin>
173146
<groupId>org.apache.maven.plugins</groupId>
174147
<artifactId>maven-source-plugin</artifactId>
175-
<executions>
176-
<execution>
177-
<id>attach-sources</id>
178-
<goals>
179-
<goal>jar-no-fork</goal>
180-
</goals>
181-
</execution>
182-
</executions>
183148
</plugin>
184149
<plugin>
185150
<groupId>org.apache.maven.plugins</groupId>
186151
<artifactId>maven-javadoc-plugin</artifactId>
187-
<executions>
188-
<execution>
189-
<id>attach-javadocs</id>
190-
<goals>
191-
<goal>jar</goal>
192-
</goals>
193-
</execution>
194-
</executions>
195152
</plugin>
196153
<plugin>
197154
<groupId>org.apache.maven.plugins</groupId>
198155
<artifactId>maven-gpg-plugin</artifactId>
199-
<executions>
200-
<execution>
201-
<id>sign-artifacts</id>
202-
<phase>verify</phase>
203-
<goals>
204-
<goal>sign</goal>
205-
</goals>
206-
</execution>
207-
</executions>
208156
</plugin>
209157
</plugins>
210158
</build>

‎pom.xml

+34-38
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
<name>${project.artifactId}</name>
2929
<url>https://github.com/apache/hugegraph-commons</url>
3030
<description>
31-
hugegraph-commons is a common module for HugeGraph-Common and HugeGraph-Rpc with their peripheral components.
32-
It includes rpc frame, locks, configurations, events, iterators, rest and some
33-
numeric or collection util classes to simplify the development of HugeGraph and its components.
31+
hugegraph-commons is a common module for HugeGraph-Common and HugeGraph-Rpc with their
32+
peripheral components.
33+
It includes rpc frame, locks, configurations, events, iterators, rest and some numeric or
34+
collection util classes to simplify the development of HugeGraph and its components.
3435
</description>
3536

3637
<parent>
@@ -48,37 +49,37 @@
4849
</licenses>
4950

5051
<developers>
51-
<developer>
52-
<id>Apache Hugegraph(Incubating)</id>
53-
<email>[email protected]</email>
54-
<url>https://hugegraph.apache.org/</url>
55-
</developer>
52+
<developer>
53+
<id>Apache Hugegraph(Incubating)</id>
54+
<email>[email protected]</email>
55+
<url>https://hugegraph.apache.org/</url>
56+
</developer>
5657
</developers>
5758

5859
<mailingLists>
59-
<mailingList>
60-
<name>Developer List</name>
61-
<subscribe>[email protected]</subscribe>
62-
<unsubscribe>[email protected]</unsubscribe>
63-
<post>[email protected]</post>
64-
</mailingList>
65-
<mailingList>
66-
<name>Commits List</name>
67-
<subscribe>[email protected]</subscribe>
68-
<unsubscribe>[email protected]</unsubscribe>
69-
<post>[email protected]</post>
70-
</mailingList>
71-
<mailingList>
72-
<name>Issues List</name>
73-
<subscribe>[email protected]</subscribe>
74-
<unsubscribe>[email protected]</unsubscribe>
75-
<post>[email protected]</post>
76-
</mailingList>
60+
<mailingList>
61+
<name>Developer List</name>
62+
<subscribe>[email protected]</subscribe>
63+
<unsubscribe>[email protected]</unsubscribe>
64+
<post>[email protected]</post>
65+
</mailingList>
66+
<mailingList>
67+
<name>Commits List</name>
68+
<subscribe>[email protected]</subscribe>
69+
<unsubscribe>[email protected]</unsubscribe>
70+
<post>[email protected]</post>
71+
</mailingList>
72+
<mailingList>
73+
<name>Issues List</name>
74+
<subscribe>[email protected]</subscribe>
75+
<unsubscribe>[email protected]</unsubscribe>
76+
<post>[email protected]</post>
77+
</mailingList>
7778
</mailingLists>
7879

7980
<issueManagement>
80-
<system>Github Issues</system>
81-
<url>https://github.com/apache/hugegraph-commons/issues</url>
81+
<system>Github Issues</system>
82+
<url>https://github.com/apache/hugegraph-commons/issues</url>
8283
</issueManagement>
8384

8485
<scm>
@@ -171,12 +172,8 @@
171172
<archive>
172173
<index>true</index>
173174
<manifest>
174-
<addDefaultImplementationEntries>
175-
false
176-
</addDefaultImplementationEntries>
177-
<addDefaultSpecificationEntries>
178-
true
179-
</addDefaultSpecificationEntries>
175+
<addDefaultImplementationEntries>false</addDefaultImplementationEntries>
176+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
180177
</manifest>
181178
<manifestEntries>
182179
<!-- Must be on one line, otherwise the automatic
@@ -279,7 +276,7 @@
279276

280277
<profiles>
281278
<profile>
282-
<id>release</id>
279+
<id>apache-release</id>
283280
<build>
284281
<plugins>
285282
<plugin>
@@ -306,9 +303,8 @@
306303
</execution>
307304
</executions>
308305
<configuration>
309-
<additionalOptions>
310-
<additionalOption>-Xdoclint:none</additionalOption>
311-
</additionalOptions>
306+
<doclint>none</doclint>
307+
<failOnError>false</failOnError>
312308
</configuration>
313309
</plugin>
314310
<plugin>

0 commit comments

Comments
 (0)