Skip to content

Commit c9c4d31

Browse files
authored
Build for Java 8; upgrade dependencies and plugins (#60)
1 parent 520e15f commit c9c4d31

File tree

7 files changed

+20
-438
lines changed

7 files changed

+20
-438
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ plugins {
66
id 'jacoco'
77
id 'signing'
88
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
9-
id 'pl.allegro.tech.build.axion-release' version '1.13.6'
9+
id 'pl.allegro.tech.build.axion-release' version '1.13.14'
1010
}
1111

1212
group = 'com.nordstrom.tools'
1313
description = 'TestNG Foundation'
1414

1515
if (!project.hasProperty('profile')) {
16-
ext.profile = 'java7'
16+
ext.profile = 'java8'
1717
} else {
18-
assert ['java7', 'java8'].contains(profile)
18+
assert ['java8'].contains(profile)
1919
}
2020

2121
apply from: "${profile}Deps.gradle"
@@ -48,7 +48,7 @@ clean {
4848
}
4949

5050
jacoco {
51-
toolVersion = '0.8.5'
51+
toolVersion = '0.8.8'
5252
reportsDirectory = file("${buildDir}/customJacocoReportDir")
5353
}
5454

@@ -194,8 +194,8 @@ repositories {
194194

195195
dependencies {
196196
constraints {
197-
api 'com.nordstrom.tools:java-utils:2.2.0'
198-
api 'com.nordstrom.tools:settings:2.3.11'
197+
api 'com.nordstrom.tools:java-utils:3.0.0'
198+
api 'com.nordstrom.tools:settings:3.0.0'
199199
}
200200
api 'com.nordstrom.tools:java-utils'
201201
api 'com.nordstrom.tools:settings'

java7Deps.gradle

Lines changed: 0 additions & 31 deletions
This file was deleted.

java8Deps.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ sourceSets {
2626
dependencies {
2727
constraints {
2828
api 'org.testng:testng:7.5'
29-
api 'org.apache.ant:ant:1.10.11'
29+
api 'org.apache.ant:ant:1.10.12'
3030
}
3131
api 'org.testng:testng'
3232
api 'org.apache.ant:ant'

pom.xml

Lines changed: 13 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@
3030
<revision>@projectVersion@</revision>
3131
<timestamp>@projectTimestamp@</timestamp>
3232
<java-version>@javaVersion@</java-version>
33-
<compiler-plugin.version>3.8.1</compiler-plugin.version>
34-
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
33+
<compiler-plugin.version>3.10.1</compiler-plugin.version>
34+
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
3535
<source-plugin.version>3.2.1</source-plugin.version>
36-
<javadoc-plugin.version>3.3.0</javadoc-plugin.version>
37-
<java-utils.version>2.2.0</java-utils.version>
38-
<settings.version>2.3.11</settings.version>
36+
<javadoc-plugin.version>3.4.0</javadoc-plugin.version>
37+
<java-utils.version>3.0.0</java-utils.version>
38+
<settings.version>3.0.0</settings.version>
3939
<sonar.language>java</sonar.language>
40-
<jacoco.version>0.8.7</jacoco.version>
40+
<jacoco.version>0.8.8</jacoco.version>
4141
<gpg-plugin.version>3.0.1</gpg-plugin.version>
42-
<staging-plugin.version>1.6.8</staging-plugin.version>
43-
<release-plugin.version>3.0.0-M4</release-plugin.version>
44-
<build-helper-plugin.version>3.2.0</build-helper-plugin.version>
42+
<staging-plugin.version>1.6.13</staging-plugin.version>
43+
<release-plugin.version>3.0.0-M6</release-plugin.version>
44+
<build-helper-plugin.version>3.3.0</build-helper-plugin.version>
4545
<skipSigning>true</skipSigning>
4646
</properties>
4747

@@ -238,67 +238,15 @@
238238
</build>
239239

240240
<profiles>
241-
<profile>
242-
<id>java7</id>
243-
<properties>
244-
<maven.compiler.release>7</maven.compiler.release>
245-
<testng.version>6.10</testng.version>
246-
</properties>
247-
<dependencyManagement>
248-
<dependencies>
249-
<dependency>
250-
<groupId>org.testng</groupId>
251-
<artifactId>testng</artifactId>
252-
<version>${testng.version}</version>
253-
</dependency>
254-
</dependencies>
255-
</dependencyManagement>
256-
<dependencies>
257-
<dependency>
258-
<groupId>org.testng</groupId>
259-
<artifactId>testng</artifactId>
260-
</dependency>
261-
</dependencies>
262-
<build>
263-
<directory>target-j7</directory>
264-
<plugins>
265-
<plugin>
266-
<groupId>org.codehaus.mojo</groupId>
267-
<artifactId>build-helper-maven-plugin</artifactId>
268-
<executions>
269-
<execution>
270-
<id>add-source</id>
271-
<goals>
272-
<goal>add-source</goal>
273-
</goals>
274-
<configuration>
275-
<sources>
276-
<source>src/main-j7/java</source>
277-
</sources>
278-
</configuration>
279-
</execution>
280-
<execution>
281-
<id>add-test-source</id>
282-
<goals>
283-
<goal>add-test-source</goal>
284-
</goals>
285-
<configuration>
286-
<sources>
287-
<source>src/test-j7/java</source>
288-
</sources>
289-
</configuration>
290-
</execution>
291-
</executions>
292-
</plugin>
293-
</plugins>
294-
</build>
295-
</profile>
296241
<profile>
297242
<id>java8</id>
243+
<activation>
244+
<activeByDefault>true</activeByDefault>
245+
</activation>
298246
<properties>
299247
<maven.compiler.release>8</maven.compiler.release>
300248
<testng.version>7.5</testng.version>
301-
<ant.version>1.10.11</ant.version>
249+
<ant.version>1.10.12</ant.version>
302250
</properties>
303251
<dependencyManagement>
304252
<dependencies>

0 commit comments

Comments
 (0)