Skip to content

Commit da8c1d9

Browse files
vrnskyvrnsky
committed
feat: Убрано использование TestNG + корректировка семантической версии
1 parent c6927a3 commit da8c1d9

File tree

104 files changed

+361
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+361
-334
lines changed

‎chapter1/arrays/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter1.arrays</groupId>
44
<artifactId>arrays</artifactId>
55
<name>arrays</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter1</groupId>
1111
<artifactId>chapter1</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
</project>

‎chapter1/calculator/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
<groupId>ru.evrnsky.chapter1.calculator</groupId>
44
<artifactId>calculator</artifactId>
55
<name>calculator</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter1</groupId>
1111
<artifactId>chapter1</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>ru.evrnsky.chapter2.start</groupId>
1818
<artifactId>start</artifactId>
19-
<version>1.0</version>
19+
<version>1.0.0</version>
2020
</dependency>
2121
</dependencies>
2222

‎chapter1/calculatorEight/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
<groupId>ru.evrnsky.chapter1.calculatorEight</groupId>
44
<artifactId>calculatorEight</artifactId>
55
<name>calculatorEight</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter1</groupId>
1111
<artifactId>chapter1</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<dependencies>
1616
<dependency>
1717
<groupId>ru.evrnsky.chapter2.start</groupId>
1818
<artifactId>start</artifactId>
19-
<version>1.0</version>
19+
<version>1.0.0</version>
2020
</dependency>
2121
</dependencies>
2222
</project>

‎chapter1/geometry/pom.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
<artifactId>geometry</artifactId>
55
<name>geometry</name>
66
<dependencies>
7-
<dependency>
8-
<groupId>org.testng</groupId>
9-
<artifactId>testng</artifactId>
10-
<version>7.1.0</version>
11-
<scope>test</scope>
12-
</dependency>
7+
<dependency>
8+
<groupId>org.junit.jupiter</groupId>
9+
<artifactId>junit-jupiter-api</artifactId>
10+
<scope>test</scope>
11+
</dependency>
12+
<dependency>
13+
<groupId>org.junit.jupiter</groupId>
14+
<artifactId>junit-jupiter-engine</artifactId>
15+
<scope>test</scope>
16+
</dependency>
1317
</dependencies>
14-
<version>1.0</version>
18+
<version>1.0.0</version>
1519
<packaging>jar</packaging>
1620

1721
<parent>
1822
<groupId>ru.evrnsky.chapter1</groupId>
1923
<artifactId>chapter1</artifactId>
20-
<version>1.0</version>
24+
<version>1.0.0</version>
2125
</parent>
2226
</project>

‎chapter1/geometry/src/test/java/ru/evrnsky/geometry/TriangleTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package ru.evrnsky.geometry;
22

3-
import org.testng.annotations.Test;
3+
4+
import org.junit.jupiter.api.Test;
45

56
import static org.hamcrest.MatcherAssert.assertThat;
67
import static org.hamcrest.Matchers.is;
@@ -29,7 +30,7 @@ void whenCreateCorrectTriangleShouldGetItsArea() {
2930
}
3031

3132
/**
32-
* When try create correct triangle with other sides should check that all is ok.
33+
* When try to create correct triangle with other sides should check that all is ok.
3334
*/
3435
@Test
3536
void whenCreateCorrectTriangleWithOtherSidesShouldCheckFinest() {

‎chapter1/loops/pom.xml

+12-8
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
<artifactId>loops</artifactId>
55
<name>loops</name>
66
<dependencies>
7-
<dependency>
8-
<groupId>org.testng</groupId>
9-
<artifactId>testng</artifactId>
10-
<version>7.1.0</version>
11-
<scope>test</scope>
12-
</dependency>
7+
<dependency>
8+
<groupId>org.junit.jupiter</groupId>
9+
<artifactId>junit-jupiter-api</artifactId>
10+
<scope>test</scope>
11+
</dependency>
12+
<dependency>
13+
<groupId>org.junit.jupiter</groupId>
14+
<artifactId>junit-jupiter-engine</artifactId>
15+
<scope>test</scope>
16+
</dependency>
1317
</dependencies>
14-
<version>1.0</version>
18+
<version>1.0.0</version>
1519
<packaging>jar</packaging>
1620

1721
<parent>
1822
<groupId>ru.evrnsky.chapter1</groupId>
1923
<artifactId>chapter1</artifactId>
20-
<version>1.0</version>
24+
<version>1.0.0</version>
2125
</parent>
2226
</project>

‎chapter1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter1</groupId>
44
<artifactId>chapter1</artifactId>
55
<name>chapter1</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>pom</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky</groupId>
1111
<artifactId>tracker</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<modules>

‎chapter1/task/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter1.task</groupId>
44
<artifactId>task</artifactId>
55
<name>task</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter1</groupId>
1111
<artifactId>chapter1</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
</project>

‎chapter10/Algo/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter10.Algo</groupId>
44
<artifactId>Algo</artifactId>
55
<name>Algo</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter10</groupId>
1111
<artifactId>chapter10</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
</project>

‎chapter10/Annotations/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter10.Annotations</groupId>
44
<artifactId>Annotations</artifactId>
55
<name>Annotations</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>war</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter10</groupId>
1111
<artifactId>chapter10</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<dependencies>

‎chapter10/Config/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter10.Config</groupId>
44
<artifactId>Config</artifactId>
55
<name>Config</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>war</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter10</groupId>
1111
<artifactId>chapter10</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<dependencies>

‎chapter10/HQL/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<groupId>ru.evrnsky.chapter10.HQL</groupId>
44
<artifactId>HQL</artifactId>
55
<name>HQL</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter10</groupId>
1111
<artifactId>chapter10</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414
</project>

‎chapter10/Integration/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<groupId>ru.evrnsky.chapter10.Integration</groupId>
44
<artifactId>Integration</artifactId>
55
<name>Integration</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter10</groupId>
1111
<artifactId>chapter10</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414
</project>

‎chapter10/Mapping/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter10.Mapping</groupId>
44
<artifactId>Mapping</artifactId>
55
<name>Mapping</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>war</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter10</groupId>
1111
<artifactId>chapter10</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<dependencies>

‎chapter10/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter10</groupId>
44
<artifactId>chapter10</artifactId>
55
<name>chapter10</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>pom</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky</groupId>
1111
<artifactId>tracker</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<modules>

‎chapter11/Boot/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<groupId>ru.evrnsky.chapter11.Boost</groupId>
44
<artifactId>Boot</artifactId>
55
<name>Boot</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter11</groupId>
1111
<artifactId>chapter11</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414
</project>

‎chapter11/IoC/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter11.IoC</groupId>
44
<artifactId>IoC</artifactId>
55
<name>IoC</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter11</groupId>
1111
<artifactId>chapter11</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<properties>

‎chapter11/IoC/src/test/java/beans/JdbcStorageTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* This unit test for JdbcStorage.java.
1616
* @author vrnsky.
17-
* @version 1.0
17+
* @version 1.0.0
1818
*/
1919
class JdbcStorageTest {
2020

‎chapter11/IoC/src/test/java/beans/UserStorageTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* This unit test for UserStorage class.
1616
*
1717
* @author vrnsky
18-
* @version 1.0
18+
* @version 1.0.0
1919
*/
2020
class UserStorageTest {
2121

‎chapter11/MVC/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter11.MVC</groupId>
44
<artifactId>MVC</artifactId>
55
<name>MVC</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>war</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter11</groupId>
1111
<artifactId>chapter11</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<dependencies>

‎chapter11/Security/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter11.Security</groupId>
44
<artifactId>Security</artifactId>
55
<name>Security</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter11</groupId>
1111
<artifactId>chapter11</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<build>

‎chapter11/TemplateAndData/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<groupId>ru.evrnsky.chapter11.TemplateAndData</groupId>
44
<artifactId>TemplateAndData</artifactId>
55
<name>TemplateAndData</name>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
88

99
<parent>
1010
<groupId>ru.evrnsky.chapter11</groupId>
1111
<artifactId>chapter11</artifactId>
12-
<version>1.0</version>
12+
<version>1.0.0</version>
1313
</parent>
1414

1515
<build>

0 commit comments

Comments
 (0)