Skip to content

Commit 99d684f

Browse files
rncrnc
authored
Merge pull request #516 from rnc/PME-DEPS
Update Atlas and PME
2 parents 6425695 + bb687ab commit 99d684f

86 files changed

Lines changed: 295 additions & 289 deletions

File tree

Some content is hidden

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

‎.github/workflows/gradle.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
fail-fast: false
5353
matrix:
54-
gradle: [4.10.3, "5.0", 5.1.1, 5.2.1, 5.3.1, 5.4.1, 5.5.1, 5.6.4, 6.0.1, 6.1.1, 6.2.2, 6.3, 6.4.1, 6.5.1, 6.6.1, 6.7.1, 6.8.3, 6.9.4, 7.0.2, 7.1.1, 7.2, 7.3.3, 7.4.2, 7.5.1, 7.6.3, 8.0.2, 8.1.1, 8.2.1]
54+
gradle: [4.10.3, "5.0", 5.1.1, 5.2.1, 5.3.1, 5.4.1, 5.5.1, 5.6.4, 6.0.1, 6.1.1, 6.2.2, 6.3, 6.4.1, 6.5.1, 6.6.1, 6.7.1, 6.8.3, 6.9.4, 7.0.2, 7.1.1, 7.2, 7.3.3, 7.4.2, 7.5.1, 7.6.6, 8.0.2, 8.1.1, 8.2.1]
5555
# https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idif
5656
if: github.repository == 'project-ncl/gradle-manipulator' && github.event_name == 'pull_request'
5757
runs-on: ubuntu-latest

‎CONTRIBUTING.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ Contributions to the project are very welcome! Please submit pull requests with
2121
* [Releasing SNAPSHOT version](#releasing-snapshot-version)
2222
<!-- TocDown End -->
2323

24+
### Requirements
25+
26+
Under the default Gradle version (currently 8.3) this requires JDK17 to build and JDK8 to run.
2427

2528
### Documentation
2629

@@ -30,7 +33,7 @@ The documentation for the project can be found [here](https://project-ncl.github
3033

3134
### IDE Config and Code Style
3235

33-
This project has a strictly enforced code style. Code formatting is done by the Eclipse code formatter, using the config files from https://github.com/project-ncl/ide-config/. By default, when you run `./gradlew build` the code will be formatted automatically.
36+
This project has a strictly enforced code style. Code formatting is done by Spotless, using the config files from https://github.com/project-ncl/ide-config/. By default, when you run `./gradlew build` the code will be formatted automatically.
3437

3538
#### IDEA Setup
3639

‎analyzer/build.gradle.kts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,30 @@ dependencies {
4848
implementation("com.fasterxml.jackson.core:jackson-annotations:${project.extra.get("jacksonVersion")}")
4949
implementation("com.fasterxml.jackson.core:jackson-core:${project.extra.get("jacksonVersion")}")
5050

51-
implementation("org.commonjava.maven.ext:pom-manipulation-core:${project.extra.get("pmeVersion")}") {
51+
implementation("org.jboss.pnc.maven-manipulator:pom-manipulation-core:${project.extra.get("pmeVersion")}") {
5252
exclude(group = "com.fasterxml.jackson.core", module = "jackson-core")
5353
exclude(group = "com.fasterxml.jackson.core", module = "jackson-annotations")
5454
exclude(group = "com.fasterxml.jackson.core", module = "jackson-databind")
55+
exclude(group = "ch.qos.logback")
5556
}
5657

57-
implementation("org.commonjava.maven.ext:pom-manipulation-io:${project.extra.get("pmeVersion")}") {
58+
implementation("org.jboss.pnc.maven-manipulator:pom-manipulation-io:${project.extra.get("pmeVersion")}") {
5859
exclude(group = "com.fasterxml.jackson.core", module = "jackson-core")
5960
exclude(group = "com.fasterxml.jackson.core", module = "jackson-annotations")
6061
exclude(group = "com.fasterxml.jackson.core", module = "jackson-databind")
62+
exclude(group = "ch.qos.logback")
6163
}
6264

63-
implementation("org.commonjava.maven.ext:pom-manipulation-common:${project.extra.get("pmeVersion")}") {
65+
implementation("org.jboss.pnc.maven-manipulator:pom-manipulation-common:${project.extra.get("pmeVersion")}") {
6466
exclude(group = "com.fasterxml.jackson.core", module = "jackson-core")
6567
exclude(group = "com.fasterxml.jackson.core", module = "jackson-annotations")
6668
exclude(group = "com.fasterxml.jackson.core", module = "jackson-databind")
69+
exclude(group = "ch.qos.logback")
6770
}
6871

69-
implementation("org.commonjava.maven.atlas:atlas-identities:${project.extra.get("atlasVersion")}")
72+
implementation("org.commonjava.atlas:atlas-identities:${project.extra.get("atlasVersion")}") {
73+
exclude(group = "ch.qos.logback")
74+
}
7075

7176
runtimeOnly("org.apache.maven:maven-artifact:${project.extra.get("mavenVersion")}")
7277
runtimeOnly("org.apache.maven:maven-core:${project.extra.get("mavenVersion")}")
@@ -82,7 +87,7 @@ dependencies {
8287
implementation("org.aeonbits.owner:owner-java8:${project.extra.get("ownerVersion")}")
8388

8489
testRuntimeOnly("commons-io:commons-io:${project.extra.get("commonsIOVersion")}")
85-
testImplementation("org.commonjava.maven.ext:pom-manipulation-common:${project.extra.get("pmeVersion")}")
90+
testImplementation("org.jboss.pnc.maven-manipulator:pom-manipulation-common:${project.extra.get("pmeVersion")}")
8691
testImplementation(project(path = ":common", configuration = "testFixturesCompile"))
8792
testImplementation(gradleTestKit())
8893
testImplementation("junit:junit:${project.extra.get("junitVersion")}")

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/CELProjectFunctionalTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
import java.util.Collection;
1616
import java.util.Collections;
1717
import org.apache.commons.io.FileUtils;
18-
import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef;
19-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
18+
import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
2019
import org.eclipse.jgit.api.Git;
2120
import org.eclipse.jgit.api.errors.GitAPIException;
2221
import org.gradle.util.GradleVersion;
2322
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
2423
import org.jboss.gm.common.Configuration;
24+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
2525
import org.junit.Before;
2626
import org.junit.Rule;
2727
import org.junit.Test;

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/ComplexProjectFunctionalTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
import org.apache.maven.settings.Settings;
2323
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
2424
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
25-
import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef;
26-
import org.commonjava.maven.ext.common.ManipulationException;
27-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
25+
import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
2826
import org.gradle.api.Project;
2927
import org.gradle.util.GradleVersion;
3028
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
3129
import org.jboss.gm.common.Configuration;
3230
import org.jboss.gm.common.utils.FileUtils;
31+
import org.jboss.pnc.mavenmanipulator.common.ManipulationException;
32+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
3333
import org.junit.Before;
3434
import org.junit.Rule;
3535
import org.junit.Test;

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/ComplexWithExistingManipulationProjectFunctionalTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
import java.io.IOException;
1515
import java.net.URISyntaxException;
1616
import java.util.Collection;
17-
import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef;
18-
import org.commonjava.maven.ext.common.ManipulationException;
19-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
17+
import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
2018
import org.gradle.api.Project;
2119
import org.gradle.util.GradleVersion;
2220
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
2321
import org.jboss.gm.common.Configuration;
2422
import org.jboss.gm.common.utils.FileUtils;
23+
import org.jboss.pnc.mavenmanipulator.common.ManipulationException;
24+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
2525
import org.junit.Before;
2626
import org.junit.Rule;
2727
import org.junit.Test;

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/CruiseControlFunctionalTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
import java.io.File;
1212
import java.io.IOException;
1313
import java.net.URISyntaxException;
14-
import org.commonjava.maven.ext.common.ManipulationException;
15-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
1614
import org.gradle.api.Project;
1715
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
1816
import org.jboss.gm.common.Configuration;
17+
import org.jboss.pnc.mavenmanipulator.common.ManipulationException;
18+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
1919
import org.junit.Before;
2020
import org.junit.Rule;
2121
import org.junit.Test;

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/DynamicWithLocksProjectFunctionalTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
import java.nio.file.Files;
1717
import java.nio.file.Paths;
1818
import java.util.Collection;
19-
import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef;
20-
import org.commonjava.maven.atlas.ident.ref.SimpleProjectVersionRef;
21-
import org.commonjava.maven.ext.common.ManipulationException;
22-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
19+
import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
20+
import org.commonjava.atlas.maven.ident.ref.SimpleProjectVersionRef;
2321
import org.gradle.api.Project;
2422
import org.gradle.util.GradleVersion;
2523
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
2624
import org.jboss.gm.analyzer.alignment.io.LockFileIO;
2725
import org.jboss.gm.common.Configuration;
2826
import org.jboss.gm.common.utils.FileUtils;
27+
import org.jboss.pnc.mavenmanipulator.common.ManipulationException;
28+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
2929
import org.junit.Before;
3030
import org.junit.Rule;
3131
import org.junit.Test;

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/GMEFunctionalTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import java.util.stream.Stream;
2222
import org.apache.commons.io.filefilter.DirectoryFileFilter;
2323
import org.apache.commons.io.filefilter.FileFilterUtils;
24-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
2524
import org.gradle.util.GradleVersion;
2625
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
2726
import org.jboss.gm.common.Configuration;
27+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
2828
import org.junit.Before;
2929
import org.junit.Rule;
3030
import org.junit.Test;

‎analyzer/src/functTest/java/org/jboss/gm/analyzer/alignment/GrpcLikeLayoutFunctionalTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
import java.util.Collections;
2424
import java.util.Map;
2525
import org.apache.commons.lang3.reflect.FieldUtils;
26-
import org.commonjava.maven.atlas.ident.ref.ProjectVersionRef;
27-
import org.commonjava.maven.ext.common.ManipulationException;
28-
import org.commonjava.maven.ext.common.ManipulationUncheckedException;
29-
import org.commonjava.maven.ext.io.rest.DefaultTranslator;
26+
import org.commonjava.atlas.maven.ident.ref.ProjectVersionRef;
3027
import org.gradle.api.Project;
3128
import org.gradle.api.internal.project.DefaultProject;
3229
import org.gradle.util.GradleVersion;
3330
import org.jboss.gm.analyzer.alignment.TestUtils.TestManipulationModel;
3431
import org.jboss.gm.common.Configuration;
3532
import org.jboss.gm.common.model.ManipulationModel;
3633
import org.jboss.gm.common.utils.FileUtils;
34+
import org.jboss.pnc.mavenmanipulator.common.ManipulationException;
35+
import org.jboss.pnc.mavenmanipulator.common.ManipulationUncheckedException;
36+
import org.jboss.pnc.mavenmanipulator.io.rest.DefaultTranslator;
3737
import org.junit.Before;
3838
import org.junit.Rule;
3939
import org.junit.Test;

0 commit comments

Comments
 (0)