Skip to content

Commit 4989b87

Browse files
committed
ST6RI-844 Fixes for minor build issues
- Projects were updated to explicitly specify UTF-8 character encoding - Some redundant configuration was removed from Maven - A deprecated field usage was updated - Unused (and deprecated) UpdateSiteNature was removed from site project
1 parent 92acb6c commit 4989b87

8 files changed

Lines changed: 13 additions & 15 deletions

File tree

org.omg.sysml.jupyter.jupyterlab/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<plugin>
127127
<groupId>org.apache.maven.plugins</groupId>
128128
<artifactId>maven-clean-plugin</artifactId>
129-
<version>${maven-clean-plugin.version}</version>
130129
<configuration>
131130
<filesets>
132131
<fileset>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

org.omg.sysml.site/.project

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,4 @@
44
<comment></comment>
55
<projects>
66
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.pde.UpdateSiteBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
</buildSpec>
14-
<natures>
15-
<nature>org.eclipse.pde.UpdateSiteNature</nature>
16-
</natures>
177
</projectDescription>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
eclipse.preferences.version=1
2+
encoding/<project>=UTF-8

org.omg.sysml.xtext/src/org/omg/sysml/xtext/InternalParserSplitterFragment.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
package org.omg.sysml.xtext;
2525

2626
import java.io.IOException;
27+
import java.nio.charset.StandardCharsets;
2728
import java.nio.file.Files;
2829
import java.nio.file.Path;
2930
import java.nio.file.Paths;
@@ -33,8 +34,6 @@
3334
import org.apache.log4j.Logger;
3435
import org.eclipse.xtext.xtext.generator.AbstractXtextGeneratorFragment;
3536

36-
import com.google.common.base.Charsets;
37-
3837
public class InternalParserSplitterFragment extends AbstractXtextGeneratorFragment {
3938

4039
private final static Logger LOGGER = Logger.getLogger(InternalParserSplitterFragment.class);
@@ -162,7 +161,7 @@ public void readInput() {
162161
String inputPath = inputDirectory + "/" + originalClassName + ".java";
163162
LOGGER.info("Reading " + inputPath);
164163
try {
165-
content = Files.readString(Paths.get(inputPath), Charsets.UTF_8);
164+
content = Files.readString(Paths.get(inputPath), StandardCharsets.UTF_8);
166165
} catch (Exception e) {
167166
LOGGER.error(e);
168167
}
@@ -178,7 +177,7 @@ protected void writeOutput(String fileName, String output) throws IOException {
178177
LOGGER.info("Writing " + outputPath);
179178
Path outputFile = Paths.get(outputPath);
180179
try {
181-
Files.writeString(outputFile, output, Charsets.UTF_8);
180+
Files.writeString(outputFile, output, StandardCharsets.UTF_8);
182181
} catch (Exception e) {
183182
LOGGER.error(e);
184183
throw e;

0 commit comments

Comments
 (0)