Skip to content

Commit a8ea337

Browse files
authored
Fixing the release plugin (#839)
1 parent 5897708 commit a8ea337

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

pom.xml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2017, 2020, Oracle Corporation and/or its affiliates. All rights reserved.
3+
Copyright (c) 2017, 2021, Oracle and/or its affiliates.
44
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
-->
66
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -49,6 +49,7 @@
4949
<sonar.exclusions>.flattened-pom.xml,target/**</sonar.exclusions>
5050
<sonar.test.exclusions>src/test/**</sonar.test.exclusions>
5151
<unit-test-wlst-dir>${env.WLST_DIR}</unit-test-wlst-dir>
52+
<skip-system-test-execution>false</skip-system-test-execution>
5253
</properties>
5354

5455
<dependencyManagement>
@@ -107,6 +108,11 @@
107108
</archive>
108109
</configuration>
109110
</plugin>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-release-plugin</artifactId>
114+
<version>3.0.0-M1</version>
115+
</plugin>
110116
<plugin>
111117
<groupId>org.apache.maven.plugins</groupId>
112118
<artifactId>maven-surefire-plugin</artifactId>
@@ -259,10 +265,10 @@
259265
<plugin>
260266
<groupId>org.apache.maven.plugins</groupId>
261267
<artifactId>maven-release-plugin</artifactId>
262-
<version>2.5.3</version>
263268
<configuration>
264-
<useReleaseProfile>false</useReleaseProfile>
265-
<tagNameFormat>weblogic-deploy-tooling-@{project.version}</tagNameFormat>
269+
<tagNameFormat>release-@{project.version}</tagNameFormat>
270+
<!-- Tell release:perform to stop before trying to push to a remote repository -->
271+
<goals>install</goals>
266272
</configuration>
267273
</plugin>
268274
</plugins>
@@ -290,5 +296,19 @@
290296
<module>system-test</module>
291297
</modules>
292298
</profile>
299+
<profile>
300+
<id>release</id>
301+
<properties>
302+
<skip-system-test-execution>true</skip-system-test-execution>
303+
</properties>
304+
<activation>
305+
<activeByDefault>false</activeByDefault>
306+
</activation>
307+
<modules>
308+
<module>core</module>
309+
<module>installer</module>
310+
<module>system-test</module>
311+
</modules>
312+
</profile>
293313
</profiles>
294314
</project>

system-test/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
4-
The Universal Permissive License (UPL), Version 1.0
3+
Copyright (c) 2017, 2021, Oracle and/or its affiliates.
4+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
-->
66
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
77
<modelVersion>4.0.0</modelVersion>
@@ -75,6 +75,7 @@
7575
<configuration>
7676
<encoding>UTF-8</encoding>
7777
<failIfNoTests>false</failIfNoTests>
78+
<skipITs>${skip-system-test-execution}</skipITs>
7879
<argLine>
7980
-Xmx1024m -XX:MaxPermSize=256m
8081
</argLine>

0 commit comments

Comments
 (0)