Skip to content

Commit b56474b

Browse files
committed
34: Prepare MR1
Task-Url: unitsofmeasurement/unit-tck#34
1 parent 0b89e37 commit b56474b

3 files changed

Lines changed: 33 additions & 24 deletions

File tree

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
clean:
88
docker:
99
# specify the version you desire here
10-
- image: circleci/openjdk:11.0-jdk-buster-node-browsers-legacy
10+
- image: circleci/openjdk:9.0.4
1111

1212
working_directory: ~/repo
1313

@@ -23,7 +23,7 @@ jobs:
2323
deployment:
2424
docker:
2525
# specify the version you desire here
26-
- image: circleci/openjdk:11.0-jdk-buster-node-browsers-legacy
26+
- image: circleci/openjdk:9.0.4
2727

2828
working_directory: ~/repo
2929

@@ -39,7 +39,7 @@ jobs:
3939
build:
4040
docker:
4141
# specify the version you desire here
42-
- image: circleci/openjdk:11.0-jdk-buster-node-browsers-legacy
42+
- image: circleci/openjdk:9.0.4
4343

4444
working_directory: ~/repo
4545

pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<maven.site.version>3.9.1</maven.site.version>
7979
<maven.jar.version>3.2.0</maven.jar.version>
8080
<maven.javadoc.version>3.2.0</maven.javadoc.version>
81+
<maven.source.version>3.2.0</maven.source.version>
8182
<maven.surefire.version>2.22.2</maven.surefire.version>
8283
<maven.surefire-report.version>2.22.2</maven.surefire-report.version>
8384
<jacoco.plugin.version>0.8.6</jacoco.plugin.version>
@@ -545,7 +546,7 @@
545546
<plugin>
546547
<groupId>org.apache.maven.plugins</groupId>
547548
<artifactId>maven-source-plugin</artifactId>
548-
<version>3.2.0</version>
549+
<version>${maven.source.version}</version>
549550
<executions>
550551
<execution>
551552
<id>attach-sources</id>
@@ -1127,6 +1128,14 @@
11271128
<sonar.projectKey>${env.SONARCLOUD_PROJECT_KEY}</sonar.projectKey>
11281129
<sonar.login>${env.SONARCLOUD_LOGIN}</sonar.login>
11291130
<sonar.organization>${env.SONARCLOUD_ORG}</sonar.organization>
1131+
<sourceEncoding>UTF-8</sourceEncoding> <!-- in Maven 3. -->
1132+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1133+
<project.reporting.outputEncoding>${sourceEncoding}</project.reporting.outputEncoding>
1134+
<jdkVersion>8</jdkVersion>
1135+
<jdkOptionalVersion>9</jdkOptionalVersion>
1136+
<project.build.javaVersion>${jdkVersion}</project.build.javaVersion>
1137+
<maven.compile.targetLevel>${jdkVersion}</maven.compile.targetLevel>
1138+
<maven.compile.sourceLevel>${jdkVersion}</maven.compile.sourceLevel>
11301139
</properties>
11311140
</profile>
11321141
</profiles>
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
3-
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
4-
<stringAttribute key="M2_GOALS" value="clean install"/>
5-
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
6-
<booleanAttribute key="M2_OFFLINE" value="false"/>
7-
<stringAttribute key="M2_PROFILES" value=""/>
8-
<listAttribute key="M2_PROPERTIES"/>
9-
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
10-
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
11-
<intAttribute key="M2_THREADS" value="1"/>
12-
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
13-
<stringAttribute key="M2_USER_SETTINGS" value=""/>
14-
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
15-
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
16-
<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
17-
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
18-
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
19-
</listAttribute>
20-
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
21-
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
22-
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/unit-api}"/>
3+
<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
4+
<stringAttribute key="M2_GOALS" value="clean install"/>
5+
<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
6+
<booleanAttribute key="M2_OFFLINE" value="false"/>
7+
<stringAttribute key="M2_PROFILES" value=""/>
8+
<listAttribute key="M2_PROPERTIES"/>
9+
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
10+
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
11+
<intAttribute key="M2_THREADS" value="1"/>
12+
<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
13+
<stringAttribute key="M2_USER_SETTINGS" value=""/>
14+
<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
15+
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
16+
<stringAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_ENCODING" value="UTF-8"/>
17+
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
18+
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
19+
</listAttribute>
20+
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
21+
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9"/>
22+
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/unit-api}"/>
2323
</launchConfiguration>

0 commit comments

Comments
 (0)