You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2021/04/26 09:44:09 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
SLING-10331 : Remove dependency to Maven Model
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new b7377fe SLING-10331 : Remove dependency to Maven Model
b7377fe is described below
commit b7377fee51e8a3209f6a3ec99bd64d2947494634
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 26 11:43:56 2021 +0200
SLING-10331 : Remove dependency to Maven Model
---
pom.xml | 11 --------
.../LocalMavenRepositoryArtifactsDeployer.java | 3 +-
.../artifacts/MavenPomSupplierWriter.java | 33 +++++++++++-----------
3 files changed, 19 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 182f6b0..5b026f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,6 @@
<org.apache.jackrabbit.vault.version>3.2.8</org.apache.jackrabbit.vault.version>
<jackrabbit-api.version>2.18.4</jackrabbit-api.version>
<jackrabbit-spi-commons.version>2.18.4</jackrabbit-spi-commons.version>
- <maven-model.version>3.6.3</maven-model.version>
<mockito-core.version>3.2.0</mockito-core.version>
<license-maven-plugin.version>1.16</license-maven-plugin.version>
<appassembler-maven-plugin.version>2.0.0</appassembler-maven-plugin.version>
@@ -189,16 +188,6 @@
</dependency>
<!--
- | POM model
- -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-model</artifactId>
- <version>${maven-model.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!--
| Test only dependencies
-->
<dependency>
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/artifacts/LocalMavenRepositoryArtifactsDeployer.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/LocalMavenRepositoryArtifactsDeployer.java
index 3ddd1d9..04becb6 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/artifacts/LocalMavenRepositoryArtifactsDeployer.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/LocalMavenRepositoryArtifactsDeployer.java
@@ -20,6 +20,7 @@ import static java.util.Objects.requireNonNull;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FileWriter;
import java.io.IOException;
import java.util.StringTokenizer;
@@ -86,7 +87,7 @@ public final class LocalMavenRepositoryArtifactsDeployer implements ArtifactsDep
// If a POM already exists then there is not need to overwrite it as either the entire POM is lost
// or if its the a file previously generated here it must be the same
if(!targetFile.exists()) {
- try (FileOutputStream targetStream = new FileOutputStream(targetFile)) {
+ try (FileWriter targetStream = new FileWriter(targetFile)) {
new MavenPomSupplierWriter(id).write(targetStream);
}
}
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java
index 9ff7348..08a6ba0 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/artifacts/MavenPomSupplierWriter.java
@@ -16,15 +16,13 @@
*/
package org.apache.sling.feature.cpconverter.artifacts;
+import java.io.FileWriter;
import java.io.IOException;
-import java.io.OutputStream;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.sling.feature.ArtifactId;
import org.jetbrains.annotations.NotNull;
-public final class MavenPomSupplierWriter implements ArtifactWriter {
+public final class MavenPomSupplierWriter {
private final ArtifactId id;
@@ -32,17 +30,20 @@ public final class MavenPomSupplierWriter implements ArtifactWriter {
this.id = id;
}
- @Override
- public void write(@NotNull OutputStream outputStream) throws IOException {
- Model model = new Model();
- // Maven complains if Model Version is not set
- model.setModelVersion("4.0.0");
- model.setGroupId(id.getGroupId());
- model.setArtifactId(id.getArtifactId());
- model.setVersion(id.getVersion());
- model.setPackaging(id.getType());
-
- new MavenXpp3Writer().write(outputStream, model);
+ public void write(@NotNull FileWriter writer) throws IOException {
+ writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+ writer.write("<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\"\n");
+ writer.write(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n");
+ writer.write(" <modelVersion>4.0.0</modelVersion>\n");
+ writer.write(" <groupId>");
+ writer.write(id.getGroupId());
+ writer.write("</groupId>\n");
+ writer.write(" <artifactId>");
+ writer.write(id.getArtifactId());
+ writer.write("</artifactId>\n");
+ writer.write(" <version>");
+ writer.write(id.getVersion());
+ writer.write("</version>\n");
+ writer.write("</project>\n");
}
-
}