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 2016/11/12 15:46:46 UTC
svn commit: r1769390 - in /sling/trunk/installer/factories/model: pom.xml
src/main/java/org/apache/sling/installer/factory/model/impl/RepositoryAccess.java
Author: cziegeler
Date: Sat Nov 12 15:46:45 2016
New Revision: 1769390
URL: http://svn.apache.org/viewvc?rev=1769390&view=rev
Log:
Use java 7 as base
Modified:
sling/trunk/installer/factories/model/pom.xml
sling/trunk/installer/factories/model/src/main/java/org/apache/sling/installer/factory/model/impl/RepositoryAccess.java
Modified: sling/trunk/installer/factories/model/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/model/pom.xml?rev=1769390&r1=1769389&r2=1769390&view=diff
==============================================================================
--- sling/trunk/installer/factories/model/pom.xml (original)
+++ sling/trunk/installer/factories/model/pom.xml Sat Nov 12 15:46:45 2016
@@ -35,10 +35,6 @@
Provides support for the provisioning model to the Apache Sling OSGi installer
</description>
- <properties>
- <sling.java.version>8</sling.java.version>
- </properties>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/model</connection>
<developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/model</developerConnection>
Modified: sling/trunk/installer/factories/model/src/main/java/org/apache/sling/installer/factory/model/impl/RepositoryAccess.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/factories/model/src/main/java/org/apache/sling/installer/factory/model/impl/RepositoryAccess.java?rev=1769390&r1=1769389&r2=1769390&view=diff
==============================================================================
--- sling/trunk/installer/factories/model/src/main/java/org/apache/sling/installer/factory/model/impl/RepositoryAccess.java (original)
+++ sling/trunk/installer/factories/model/src/main/java/org/apache/sling/installer/factory/model/impl/RepositoryAccess.java Sat Nov 12 15:46:45 2016
@@ -21,6 +21,7 @@ package org.apache.sling.installer.facto
import java.io.File;
import java.io.IOException;
import java.lang.ProcessBuilder.Redirect;
+import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
@@ -123,7 +124,7 @@ public class RepositoryAccess {
lines.add(" </dependencies>");
lines.add("</project>");
logger.info("Writing pom to {}", dir);
- Files.write(dir.resolve("pom.xml"), lines);
+ Files.write(dir.resolve("pom.xml"), lines, Charset.forName("UTF-8"));
final File output = dir.resolve("output.txt").toFile();
final File error = dir.resolve("error.txt").toFile();