[MSHARED-1388] Bump org.apache.maven.shared:maven-shared-components f…

…rom 41 to 42 (#73) * Bump org.apache.maven.shared:maven-shared-components from 41 to 42 Bumps [org.apache.maven.shared:maven-shared-components](https://github.com/apache/maven-parent) from 41 to 42. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits) --- updated-dependencies: - dependency-name: org.apache.maven.shared:maven-shared-components dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Cleanups with new parent, fix tests --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Slawomir Jaranowski <[email protected]>
apache · May 3, 2024 · d0a2fa6 · d0a2fa6
1 parent 19886d8
commit d0a2fa6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 53 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven.shared</groupId>
     <artifactId>maven-shared-components</artifactId>
-    <version>41</version>
+    <version>42</version>
     <relativePath />
   </parent>
 
@@ -68,18 +68,6 @@ under the License.
     <project.build.outputTimestamp>2022-04-05T18:45:23Z</project.build.outputTimestamp>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.junit</groupId>
-        <artifactId>junit-bom</artifactId>
-        <version>5.10.2</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -99,6 +87,13 @@ under the License.
   </dependencies>
 
   <build>
+    <testResources>
+      <testResource>
+        <filtering>true</filtering>
+        <directory>${project.basedir}/src//test/resources</directory>
+      </testResource>
+    </testResources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -108,6 +103,7 @@ under the License.
           <systemPropertyVariables>
             <!-- required for maven-invoker to locate Maven installation -->
             <maven.home>${maven.home}</maven.home>
+            <maven.repo.local>${settings.localRepository}</maven.repo.local>
           </systemPropertyVariables>
           <excludes>
             <exclude>test-build-should*/**</exclude>
@@ -120,28 +116,4 @@ under the License.
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>maven-repo-local</id>
-      <activation>
-        <property>
-          <name>maven.repo.local</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <systemPropertyVariables combine.children="append">
-                <maven.repo.local>${maven.repo.local}</maven.repo.local>
-              </systemPropertyVariables>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
diff --git a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
@@ -242,10 +242,8 @@ private File getBasedirForBuild() throws URISyntaxException {
 
     private Properties getProperties() {
         Properties properties = new Properties();
-        if (!System.getProperty("java.version").startsWith("1.")) {
-            properties.put("maven.compiler.source", "1.7");
-            properties.put("maven.compiler.target", "1.7");
-        }
+        properties.put("maven.compiler.source", "1.8");
+        properties.put("maven.compiler.target", "1.8");
 
         String httpProtocols = System.getProperty("https.protocols");
         if (httpProtocols != null) {

diff --git a/src/test/resources/test-build-should-timeout/pom.xml b/src/test/resources/test-build-should-timeout/pom.xml
@@ -31,15 +31,4 @@ under the License.
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.2</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/src/test/resources/test-space-properties/pom.xml b/src/test/resources/test-space-properties/pom.xml
@@ -28,7 +28,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${version.maven-antrun-plugin}</version>
         <configuration>
           <target>
             <property name="prop0" value="${key}"/>