Skip to content

Commit 6aa2861

Browse files
robertpatrickrobertpatrick
committed
Maven build cleanup
1 parent 73fbe76 commit 6aa2861

File tree

4 files changed

+41
-33
lines changed

4 files changed

+41
-33
lines changed

‎alias-test/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<modelVersion>4.0.0</modelVersion>
88

99
<artifactId>weblogic-deploy-alias-test</artifactId>
10+
<packaging>pom</packaging>
1011

1112
<parent>
1213
<artifactId>weblogic-deploy</artifactId>
1314
<groupId>com.oracle.weblogic.lifecycle</groupId>
14-
<version>1.9.7-SNAPSHOT</version>
15+
<version>2.0.0-SNAPSHOT</version>
1516
</parent>
1617

1718
<properties>
@@ -22,6 +23,7 @@
2223
<dependency>
2324
<groupId>junit</groupId>
2425
<artifactId>junit</artifactId>
26+
<version>4.13.1</version>
2527
<scope>test</scope>
2628
</dependency>
2729
<dependency>
@@ -32,7 +34,6 @@
3234
<dependency>
3335
<groupId>commons-io</groupId>
3436
<artifactId>commons-io</artifactId>
35-
<version>2.7</version>
3637
<scope>test</scope>
3738
</dependency>
3839
</dependencies>
@@ -50,6 +51,7 @@
5051
<goal>testCompile</goal>
5152
</goals>
5253
<configuration>
54+
<skip>${alias-test-skipITs}</skip>
5355
</configuration>
5456
</execution>
5557
</executions>
@@ -64,18 +66,21 @@
6466
<goals>
6567
<goal>testResources</goal>
6668
</goals>
69+
<configuration>
70+
<skip>${alias-test-skipITs}</skip>
71+
</configuration>
6772
</execution>
6873
</executions>
6974
</plugin>
7075
<plugin>
7176
<groupId>org.apache.maven.plugins</groupId>
7277
<artifactId>maven-failsafe-plugin</artifactId>
73-
<version>3.0.0-M3</version>
7478
<configuration>
79+
<skip>${alias-test-skipITs}</skip>
7580
<encoding>UTF-8</encoding>
7681
<failIfNoTests>false</failIfNoTests>
7782
<argLine>
78-
-Xmx1024m -XX:MaxPermSize=256m
83+
-Xmx1024m
7984
</argLine>
8085
<systemProperties>
8186
<property>

‎core/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,6 @@
5151
<dependency>
5252
<groupId>org.easymock</groupId>
5353
<artifactId>easymock</artifactId>
54-
<version>3.6</version>
55-
<scope>test</scope>
56-
</dependency>
57-
<dependency>
58-
<groupId>org.powermock</groupId>
59-
<artifactId>powermock-api-easymock</artifactId>
60-
<version>2.0.9</version>
61-
<scope>test</scope>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.powermock</groupId>
65-
<artifactId>powermock-module-junit4</artifactId>
66-
<version>2.0.9</version>
6754
<scope>test</scope>
6855
</dependency>
6956
</dependencies>

‎pom.xml

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
4545
<weblogic-deploy-installer-name>weblogic-deploy</weblogic-deploy-installer-name>
4646
<skipTests>false</skipTests>
47-
<antlr.version>4.7.2</antlr.version>
47+
<antlr.version>4.9.3</antlr.version>
4848
<snakeyaml.version>1.29</snakeyaml.version>
4949

5050
<sonar.sources>src/main</sonar.sources>
@@ -53,6 +53,7 @@
5353
<sonar.test.exclusions>src/test/**</sonar.test.exclusions>
5454
<unit-test-wlst-dir>${env.WLST_DIR}</unit-test-wlst-dir>
5555
<skipITs>true</skipITs>
56+
<alias-test-skipITs>true</alias-test-skipITs>
5657
</properties>
5758

5859
<dependencyManagement>
@@ -77,16 +78,26 @@
7778
<artifactId>junit-jupiter-engine</artifactId>
7879
<version>5.8.1</version>
7980
</dependency>
81+
<dependency>
82+
<groupId>org.easymock</groupId>
83+
<artifactId>easymock</artifactId>
84+
<version>4.3</version>
85+
</dependency>
8086
<dependency>
8187
<groupId>com.google.guava</groupId>
8288
<artifactId>guava</artifactId>
83-
<version>29.0-jre</version>
89+
<version>31.0.1-jre</version>
8490
</dependency>
8591
<dependency>
8692
<groupId>javax.xml.bind</groupId>
8793
<artifactId>jaxb-api</artifactId>
8894
<version>2.3.1</version>
8995
</dependency>
96+
<dependency>
97+
<groupId>commons-io</groupId>
98+
<artifactId>commons-io</artifactId>
99+
<version>2.11.0</version>
100+
</dependency>
90101
</dependencies>
91102
</dependencyManagement>
92103

@@ -96,17 +107,22 @@
96107
<plugin>
97108
<groupId>org.apache.maven.plugins</groupId>
98109
<artifactId>maven-assembly-plugin</artifactId>
99-
<version>3.1.0</version>
110+
<version>3.3.0</version>
100111
</plugin>
101112
<plugin>
102113
<groupId>org.apache.maven.plugins</groupId>
103114
<artifactId>maven-enforcer-plugin</artifactId>
104-
<version>3.0.0-M1</version>
115+
<version>3.0.0</version>
116+
</plugin>
117+
<plugin>
118+
<groupId>org.apache.maven.plugins</groupId>
119+
<artifactId>maven-failsafe-plugin</artifactId>
120+
<version>3.0.0-M5</version>
105121
</plugin>
106122
<plugin>
107123
<groupId>org.apache.maven.plugins</groupId>
108124
<artifactId>maven-jar-plugin</artifactId>
109-
<version>3.0.2</version>
125+
<version>3.2.0</version>
110126
<configuration>
111127
<archive>
112128
<manifestEntries>
@@ -124,12 +140,12 @@
124140
<plugin>
125141
<groupId>org.apache.maven.plugins</groupId>
126142
<artifactId>maven-release-plugin</artifactId>
127-
<version>3.0.0-M1</version>
143+
<version>3.0.0-M4</version>
128144
</plugin>
129145
<plugin>
130146
<groupId>org.apache.maven.plugins</groupId>
131147
<artifactId>maven-surefire-plugin</artifactId>
132-
<version>2.22.2</version>
148+
<version>3.0.0-M5</version>
133149
<configuration>
134150
<!-- Created by jacoco plugin (inherited configuration) -->
135151
<argLine>${surefireArgLine}</argLine>
@@ -138,7 +154,7 @@
138154
<plugin>
139155
<groupId>io.rhpatrick.mojo</groupId>
140156
<artifactId>wlst-test-maven-plugin</artifactId>
141-
<version>1.0.4</version>
157+
<version>1.0.5</version>
142158
</plugin>
143159
<plugin>
144160
<groupId>org.antlr</groupId>
@@ -148,17 +164,17 @@
148164
<plugin>
149165
<groupId>org.codehaus.mojo</groupId>
150166
<artifactId>build-helper-maven-plugin</artifactId>
151-
<version>3.0.0</version>
167+
<version>3.2.0</version>
152168
</plugin>
153169
<plugin>
154170
<groupId>org.codehaus.mojo</groupId>
155171
<artifactId>flatten-maven-plugin</artifactId>
156-
<version>1.0.1</version>
172+
<version>1.2.7</version>
157173
</plugin>
158174
<plugin>
159175
<groupId>org.jacoco</groupId>
160176
<artifactId>jacoco-maven-plugin</artifactId>
161-
<version>0.8.6</version>
177+
<version>0.8.7</version>
162178
<executions>
163179
<execution>
164180
<id>pre-unit-test</id>
@@ -186,7 +202,7 @@
186202
<plugin>
187203
<groupId>org.sonarsource.scanner.maven</groupId>
188204
<artifactId>sonar-maven-plugin</artifactId>
189-
<version>3.4.0.905</version>
205+
<version>3.9.1.2184</version>
190206
</plugin>
191207
<plugin>
192208
<groupId>ru.concerteza.buildnumber</groupId>
@@ -208,12 +224,12 @@
208224
<plugin>
209225
<groupId>org.apache.maven.plugins</groupId>
210226
<artifactId>maven-resources-plugin</artifactId>
211-
<version>2.6</version>
227+
<version>3.2.0</version>
212228
</plugin>
213229
<plugin>
214230
<groupId>org.apache.maven.plugins</groupId>
215231
<artifactId>maven-compiler-plugin</artifactId>
216-
<version>3.7.0</version>
232+
<version>3.8.1</version>
217233
</plugin>
218234
</plugins>
219235
</pluginManagement>
@@ -308,5 +324,6 @@
308324
<module>core</module>
309325
<module>installer</module>
310326
<module>system-test</module>
327+
<module>alias-test</module>
311328
</modules>
312329
</project>

‎system-test/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,11 @@
7272
<plugin>
7373
<groupId>org.apache.maven.plugins</groupId>
7474
<artifactId>maven-failsafe-plugin</artifactId>
75-
<version>3.0.0-M3</version>
7675
<configuration>
7776
<encoding>UTF-8</encoding>
7877
<failIfNoTests>false</failIfNoTests>
7978
<argLine>
80-
-Xmx1024m -XX:MaxPermSize=256m
79+
-Xmx1024m
8180
</argLine>
8281
<systemProperties>
8382
<property>

0 commit comments

Comments
 (0)