Skip to content

Commit 22f01b8

Browse files
committed
updates and fixes
1 parent 84f0884 commit 22f01b8

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

api/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
<groupId>org.slf4j</groupId>
2323
<artifactId>slf4j-api</artifactId>
2424
</dependency>
25+
<dependency>
26+
<groupId>org.mockito</groupId>
27+
<artifactId>mockito-junit-jupiter</artifactId>
28+
<scope>test</scope>
29+
</dependency>
2530
</dependencies>
2631

2732
</project>

java/impl/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<executable>mvn</executable>
6565
<workingDirectory>${maven.test.path}</workingDirectory>
6666
<arguments>
67+
<argument>-X</argument>
6768
<argument>install</argument>
6869
</arguments>
6970
</configuration>

java/impl/src/test/java/io/github/mmm/code/impl/java/JavaExtendedContextWithMavenAndSourceCodeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void testBasics() {
6161
assertThat(source.getSource()).isSameAs(source);
6262

6363
List<? extends CodeSource> dependencies = source.getDependencies().getDeclared();
64-
assertThat(dependencies).hasSize(5);
64+
assertThat(dependencies).hasSize(4);
6565
CodeSource compileDependency = dependencies.get(0);
6666
verifyDependency(compileDependency, "target/classes", "src/main/java", "compile");
6767
assertThat(source.getParent()).isSameAs(compileDependency);

java/maven/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@
1313
<name>${project.artifactId}</name>
1414
<description>Integration with Maven.</description>
1515

16-
<properties>
17-
<maven.version>3.6.1</maven.version>
18-
</properties>
19-
2016
<dependencies>
2117
<dependency>
2218
<groupId>org.apache.maven</groupId>
2319
<artifactId>maven-core</artifactId>
24-
<version>${maven.version}</version>
2520
</dependency>
2621
<dependency>
2722
<groupId>${project.groupId}</groupId>

java/maven/src/test/java/io/github/mmm/code/java/maven/impl/MavenBridgeImplTest.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void testReadModel() {
5050
assertThat(model.getParent().getGroupId()).isEqualTo(groupId);
5151
assertThat(model.getParent().getVersion()).isEqualTo("${revision}");
5252
verifyDependencies(model, DependencyHelper.create(PROJECT_GROUP_ID, "mmm-code-base", null),
53-
DependencyHelper.create("org.apache.maven", "maven-core", "${maven.version}"));
53+
DependencyHelper.create("org.apache.maven", "maven-core", null));
5454
}
5555

5656
/**
@@ -89,11 +89,10 @@ public void testReadProject() {
8989
assertThat(model.getGroupId()).isEqualTo(groupId);
9090
assertThat(model.getVersion()).matches(VERSION_PATTERN);
9191
verifyDependencies(model, DependencyHelper.create(groupId, "mmm-code-base", "*"),
92-
DependencyHelper.create("org.apache.maven", "maven-core", "3.6.1"),
93-
DependencyHelper.create("org.assertj", "assertj-core", "3.24.2", SCOPE_TEST),
94-
DependencyHelper.create("org.junit.jupiter", "junit-jupiter", "5.9.3", SCOPE_TEST),
95-
DependencyHelper.create("org.mockito", "mockito-junit-jupiter", "4.9.0", SCOPE_TEST),
96-
DependencyHelper.create("ch.qos.logback", "logback-classic", "1.4.5", SCOPE_TEST));
92+
DependencyHelper.create("org.apache.maven", "maven-core", "3.9.6"),
93+
DependencyHelper.create("org.assertj", "assertj-core", "3.25.3", SCOPE_TEST),
94+
DependencyHelper.create("org.junit.jupiter", "junit-jupiter", "5.10.2", SCOPE_TEST),
95+
DependencyHelper.create("ch.qos.logback", "logback-classic", "1.4.14", SCOPE_TEST));
9796
}
9897

9998
private void verifyDependencies(Model model, Dependency... dependencies) {

pom.xml

+11-9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<properties>
1717
<java.version>17</java.version>
1818
<mmm.repository>code</mmm.repository>
19+
<maven.version>3.9.6</maven.version>
1920
</properties>
2021

2122
<modules>
@@ -24,14 +25,6 @@
2425
<module>java</module>
2526
</modules>
2627

27-
<dependencies>
28-
<dependency>
29-
<groupId>org.mockito</groupId>
30-
<artifactId>mockito-junit-jupiter</artifactId>
31-
<version>4.9.0</version>
32-
<scope>test</scope>
33-
</dependency>
34-
</dependencies>
3528
<dependencyManagement>
3629
<dependencies>
3730
<!-- BOM of mmm-scanner -->
@@ -42,7 +35,16 @@
4235
<type>pom</type>
4336
<scope>import</scope>
4437
</dependency>
45-
38+
<dependency>
39+
<groupId>org.apache.maven</groupId>
40+
<artifactId>maven-core</artifactId>
41+
<version>${maven.version}</version>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.mockito</groupId>
45+
<artifactId>mockito-junit-jupiter</artifactId>
46+
<version>5.10.0</version>
47+
</dependency>
4648
<!-- Internal dependencies -->
4749
<dependency>
4850
<groupId>${project.groupId}</groupId>

0 commit comments

Comments
 (0)