Skip to content

Commit fa6c3db

Browse files
michael-omichael-o
committed
[MRELEASE-1145] Upgrade to Maven 3.6.3
This closes #217
1 parent 167db81 commit fa6c3db

File tree

69 files changed

+101
-101
lines changed

Some content is hidden

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

69 files changed

+101
-101
lines changed

‎maven-release-api/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
<artifactId>maven-scm-api</artifactId>
5757
</dependency>
5858
<dependency>
59-
<groupId>org.eclipse.aether</groupId>
60-
<artifactId>aether-api</artifactId>
59+
<groupId>org.apache.maven.resolver</groupId>
60+
<artifactId>maven-resolver-api</artifactId>
6161
</dependency>
6262
<dependency>
63-
<groupId>org.eclipse.aether</groupId>
64-
<artifactId>aether-util</artifactId>
63+
<groupId>org.apache.maven.resolver</groupId>
64+
<artifactId>maven-resolver-util</artifactId>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.codehaus.plexus</groupId>

‎maven-release-manager/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@
118118
<version>3.14.0</version>
119119
</dependency>
120120

121-
<dependency>
122-
<groupId>org.eclipse.aether</groupId>
123-
<artifactId>aether-api</artifactId>
124-
</dependency>
125-
126121
<!-- scm dependencies -->
127122
<dependency>
128123
<groupId>org.apache.maven.scm</groupId>
@@ -196,28 +191,33 @@
196191
<scope>test</scope>
197192
</dependency>
198193
<dependency>
199-
<groupId>org.eclipse.aether</groupId>
200-
<artifactId>aether-util</artifactId>
194+
<groupId>org.apache.maven.resolver</groupId>
195+
<artifactId>maven-resolver-api</artifactId>
196+
<scope>test</scope>
197+
</dependency>
198+
<dependency>
199+
<groupId>org.apache.maven.resolver</groupId>
200+
<artifactId>maven-resolver-util</artifactId>
201201
<scope>test</scope>
202202
</dependency>
203203
<dependency>
204-
<groupId>org.eclipse.aether</groupId>
205-
<artifactId>aether-impl</artifactId>
204+
<groupId>org.apache.maven.resolver</groupId>
205+
<artifactId>maven-resolver-impl</artifactId>
206206
<scope>test</scope>
207207
</dependency>
208208
<dependency>
209-
<groupId>org.eclipse.aether</groupId>
210-
<artifactId>aether-connector-basic</artifactId>
209+
<groupId>org.apache.maven.resolver</groupId>
210+
<artifactId>maven-resolver-connector-basic</artifactId>
211211
<scope>test</scope>
212212
</dependency>
213213
<dependency>
214-
<groupId>org.eclipse.aether</groupId>
215-
<artifactId>aether-transport-file</artifactId>
214+
<groupId>org.apache.maven.resolver</groupId>
215+
<artifactId>maven-resolver-transport-file</artifactId>
216216
<scope>test</scope>
217217
</dependency>
218218
<dependency>
219-
<groupId>org.eclipse.aether</groupId>
220-
<artifactId>aether-transport-wagon</artifactId>
219+
<groupId>org.apache.maven.resolver</groupId>
220+
<artifactId>maven-resolver-transport-wagon</artifactId>
221221
<scope>test</scope>
222222
</dependency>
223223
<dependency>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-entities/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
1717
specific language governing permissions and limitations
1818
under the License.
1919
-->
20-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
20+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2121
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2222
<modelVersion>4.0.0</modelVersion>
2323
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-namespace/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom-with-encoding/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom-with-schema.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/basic-pom/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject1/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

‎maven-release-manager/src/test/resources/projects/generate-release-poms/cdata-around-values/subproject2/expected-release-pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
1919
under the License.
2020
-->
2121

22-
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
22+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
2323
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2424
<modelVersion>4.0.0</modelVersion>
2525
<groupId>groupId</groupId>

0 commit comments

Comments
 (0)