Skip to content

Commit 903d316

Browse files
agibsoncccagibsonccc
authored
Merge pull request #1009 from eclipse/ag_encoding_compilation_fixes
Fix compilation errors/encoding issues
2 parents 9eb3c96 + 252049a commit 903d316

File tree

11 files changed

+293
-278
lines changed

11 files changed

+293
-278
lines changed

‎arbiter-examples/pom.xml‎

Lines changed: 88 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
2323

24-
<groupId>org.deeplearning4j</groupId>
25-
<artifactId>examples-arbiter</artifactId>
26-
<version>1.0.0-beta7</version>
27-
<name>Arbiter Examples</name>
28-
<description>Working with Arbiter</description>
24+
<groupId>org.deeplearning4j</groupId>
25+
<artifactId>examples-arbiter</artifactId>
26+
<version>1.0.0-beta7</version>
27+
<name>Arbiter Examples</name>
28+
<description>Working with Arbiter</description>
2929

3030
<properties>
3131
<dl4j-master.version>1.0.0-beta7</dl4j-master.version>
@@ -35,15 +35,16 @@
3535
<java.version>1.8</java.version>
3636
<maven-compiler-plugin.version>3.6.1</maven-compiler-plugin.version>
3737
<maven.minimum.version>3.3.1</maven.minimum.version>
38-
<logback.version>1.1.7</logback.version>
38+
<logback.version>1.1.7</logback.version>
39+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3940
</properties>
4041

41-
<dependencies>
42-
<dependency>
43-
<groupId>org.nd4j</groupId>
44-
<artifactId>${nd4j.backend}</artifactId>
45-
<version>${dl4j-master.version}</version>
46-
</dependency>
42+
<dependencies>
43+
<dependency>
44+
<groupId>org.nd4j</groupId>
45+
<artifactId>${nd4j.backend}</artifactId>
46+
<version>${dl4j-master.version}</version>
47+
</dependency>
4748
<!-- Arbiter - used for hyperparameter optimization (grid/random search) -->
4849
<dependency>
4950
<groupId>org.deeplearning4j</groupId>
@@ -55,36 +56,36 @@
5556
<artifactId>arbiter-ui</artifactId>
5657
<version>${dl4j-master.version}</version>
5758
</dependency>
58-
<dependency>
59-
<groupId>ch.qos.logback</groupId>
60-
<artifactId>logback-classic</artifactId>
61-
<version>${logback.version}</version>
62-
</dependency>
63-
</dependencies>
59+
<dependency>
60+
<groupId>ch.qos.logback</groupId>
61+
<artifactId>logback-classic</artifactId>
62+
<version>${logback.version}</version>
63+
</dependency>
64+
</dependencies>
6465

6566
<!-- Maven Enforcer: Ensures user has an up to date version of Maven before building -->
6667
<build>
6768
<plugins>
68-
<plugin>
69-
<artifactId>maven-enforcer-plugin</artifactId>
70-
<version>1.0.1</version>
71-
<executions>
72-
<execution>
73-
<id>enforce-default</id>
74-
<goals>
75-
<goal>enforce</goal>
76-
</goals>
77-
<configuration>
78-
<rules>
79-
<requireMavenVersion>
69+
<plugin>
70+
<artifactId>maven-enforcer-plugin</artifactId>
71+
<version>1.0.1</version>
72+
<executions>
73+
<execution>
74+
<id>enforce-default</id>
75+
<goals>
76+
<goal>enforce</goal>
77+
</goals>
78+
<configuration>
79+
<rules>
80+
<requireMavenVersion>
8081
<version>[${maven.minimum.version},)</version>
8182
<message>********** Minimum Maven Version is ${maven.minimum.version}. Please upgrade Maven before continuing (run "mvn --version" to check). **********</message>
82-
</requireMavenVersion>
83-
</rules>
84-
</configuration>
85-
</execution>
86-
</executions>
87-
</plugin>
83+
</requireMavenVersion>
84+
</rules>
85+
</configuration>
86+
</execution>
87+
</executions>
88+
</plugin>
8889
<plugin>
8990
<groupId>org.apache.maven.plugins</groupId>
9091
<artifactId>maven-compiler-plugin</artifactId>
@@ -94,58 +95,58 @@
9495
<target>1.8</target>
9596
</configuration>
9697
</plugin>
97-
<plugin>
98-
<groupId>com.lewisd</groupId>
99-
<artifactId>lint-maven-plugin</artifactId>
100-
<version>0.0.11</version>
101-
<configuration>
102-
<failOnViolation>true</failOnViolation>
103-
<onlyRunRules>
104-
<rule>DuplicateDep</rule>
105-
<rule>RedundantPluginVersion</rule>
106-
<!-- Rules incompatible with Java 9
107-
<rule>VersionProp</rule>
108-
<rule>DotVersionProperty</rule> -->
109-
</onlyRunRules>
110-
</configuration>
111-
<executions>
112-
<execution>
113-
<id>pom-lint</id>
114-
<phase>validate</phase>
115-
<goals>
116-
<goal>check</goal>
117-
</goals>
118-
</execution>
119-
</executions>
120-
</plugin>
98+
<plugin>
99+
<groupId>com.lewisd</groupId>
100+
<artifactId>lint-maven-plugin</artifactId>
101+
<version>0.0.11</version>
102+
<configuration>
103+
<failOnViolation>true</failOnViolation>
104+
<onlyRunRules>
105+
<rule>DuplicateDep</rule>
106+
<rule>RedundantPluginVersion</rule>
107+
<!-- Rules incompatible with Java 9
108+
<rule>VersionProp</rule>
109+
<rule>DotVersionProperty</rule> -->
110+
</onlyRunRules>
111+
</configuration>
112+
<executions>
113+
<execution>
114+
<id>pom-lint</id>
115+
<phase>validate</phase>
116+
<goals>
117+
<goal>check</goal>
118+
</goals>
119+
</execution>
120+
</executions>
121+
</plugin>
121122
</plugins>
122-
<pluginManagement>
123-
<plugins>
124-
<plugin>
125-
<groupId>org.eclipse.m2e</groupId>
126-
<artifactId>lifecycle-mapping</artifactId>
127-
<version>1.0.0</version>
128-
<configuration>
129-
<lifecycleMappingMetadata>
130-
<pluginExecutions>
131-
<pluginExecution>
132-
<pluginExecutionFilter>
133-
<groupId>com.lewisd</groupId>
123+
<pluginManagement>
124+
<plugins>
125+
<plugin>
126+
<groupId>org.eclipse.m2e</groupId>
127+
<artifactId>lifecycle-mapping</artifactId>
128+
<version>1.0.0</version>
129+
<configuration>
130+
<lifecycleMappingMetadata>
131+
<pluginExecutions>
132+
<pluginExecution>
133+
<pluginExecutionFilter>
134+
<groupId>com.lewisd</groupId>
134135
<artifactId>lint-maven-plugin</artifactId>
135-
<versionRange>[0.0.11,)</versionRange>
136-
<goals>
137-
<goal>check</goal>
138-
</goals>
139-
</pluginExecutionFilter>
140-
<action>
141-
<ignore/>
142-
</action>
143-
</pluginExecution>
144-
</pluginExecutions>
145-
</lifecycleMappingMetadata>
146-
</configuration>
147-
</plugin>
148-
</plugins>
149-
</pluginManagement>
136+
<versionRange>[0.0.11,)</versionRange>
137+
<goals>
138+
<goal>check</goal>
139+
</goals>
140+
</pluginExecutionFilter>
141+
<action>
142+
<ignore/>
143+
</action>
144+
</pluginExecution>
145+
</pluginExecutions>
146+
</lifecycleMappingMetadata>
147+
</configuration>
148+
</plugin>
149+
</plugins>
150+
</pluginManagement>
150151
</build>
151152
</project>

‎cuda-specific-examples/pom.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,19 @@
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2222
<modelVersion>4.0.0</modelVersion>
23-
<groupId>org.deeplearning4j</groupId>
23+
<groupId>org.deeplearning4j</groupId>
2424
<artifactId>dl4j-cuda-specific-examples</artifactId>
2525
<version>1.0.0-beta7</version>
2626
<name>DeepLearning4j CUDA special examples</name>
2727
<properties>
28-
<dl4j-master.version>1.0.0-beta7</dl4j-master.version>
28+
<dl4j-master.version>1.0.0-beta7</dl4j-master.version>
2929
<nd4j.backend>nd4j-cuda-10.2</nd4j.backend>
30-
<java.version>1.8</java.version>
31-
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
32-
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
33-
<jcommon.version>1.0.23</jcommon.version>
34-
<logback.version>1.1.7</logback.version>
30+
<java.version>1.8</java.version>
31+
<exec-maven-plugin.version>1.4.0</exec-maven-plugin.version>
32+
<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
33+
<jcommon.version>1.0.23</jcommon.version>
34+
<logback.version>1.1.7</logback.version>
35+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3536
</properties>
3637

3738
<dependencyManagement>

0 commit comments

Comments
 (0)