From c6f6f75cf558a3e4a3753efd6c4c2eb9a12aef59 Mon Sep 17 00:00:00 2001 From: Aldrin Leal Date: Tue, 21 Feb 2023 15:59:15 -0500 Subject: [PATCH] Bumps POM Operator to 0.0.2 --- .gitignore | 2 ++ languages/java/build.gradle.kts | 2 +- .../openpixee/java/protections/DependencyInjectingVisitor.java | 2 +- .../openpixee/java/protections/DependencyGAVInjectingTest.java | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 25286c221..178b0d282 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,5 @@ crashlytics.properties crashlytics-build.properties fabric.properties +# env +.env* diff --git a/languages/java/build.gradle.kts b/languages/java/build.gradle.kts index 94b153df0..4b7f125f6 100644 --- a/languages/java/build.gradle.kts +++ b/languages/java/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { implementation(libs.logback.classic) implementation(libs.maven.model) implementation("io.openpixee:java-jdbc-parameterizer:0.0.7") // TODO bring into monorepo - implementation("io.openpixee.maven:pom-operator:0.0.1") // TODO bring into monorepo + implementation("io.openpixee.maven:pom-operator:0.0.2") // TODO bring into monorepo implementation(libs.openpixee.toolkit) implementation(libs.openpixee.toolkit.xstream) implementation(libs.picocli) diff --git a/languages/java/src/main/java/io/openpixee/java/protections/DependencyInjectingVisitor.java b/languages/java/src/main/java/io/openpixee/java/protections/DependencyInjectingVisitor.java index 5ca9e1fd4..3dd46254b 100644 --- a/languages/java/src/main/java/io/openpixee/java/protections/DependencyInjectingVisitor.java +++ b/languages/java/src/main/java/io/openpixee/java/protections/DependencyInjectingVisitor.java @@ -159,7 +159,7 @@ ChangedFile transformPomIfNeeded(final File file, final Set depen if (result) { try { - IOUtils.write(projectModel.getResultPom().asXML(), new FileOutputStream(lastPomFile)); + IOUtils.write(projectModel.getResultPomBytes(), new FileOutputStream(lastPomFile)); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/languages/java/src/test/java/io/openpixee/java/protections/DependencyGAVInjectingTest.java b/languages/java/src/test/java/io/openpixee/java/protections/DependencyGAVInjectingTest.java index a3c678eee..b98c222e4 100644 --- a/languages/java/src/test/java/io/openpixee/java/protections/DependencyGAVInjectingTest.java +++ b/languages/java/src/test/java/io/openpixee/java/protections/DependencyGAVInjectingTest.java @@ -14,7 +14,6 @@ import io.openpixee.maven.operator.QueryType; import java.io.File; import java.util.Collection; -import java.util.List; import java.util.Optional; import java.util.Set; import org.junit.jupiter.api.BeforeEach; @@ -77,7 +76,7 @@ private void assertHasDependencies(File pom, DependencyGAV... dependencies) { ProjectModel projectModel = ProjectModelFactory.load(pom).withQueryType(QueryType.UNSAFE).build(); - Collection foundDependencies = POMOperator.queryDependency(projectModel, List.of()); + Collection foundDependencies = POMOperator.queryDependency(projectModel); for (DependencyGAV dependency : dependencies) { Optional foundDependency =