Skip to content

Commit 6043a6b

Browse files
committed
updated ignore patterns; upgraded source/target to 1.7; fixed javadoc generation when using Java 8
1 parent d550290 commit 6043a6b

File tree

6 files changed

+22
-8
lines changed

6 files changed

+22
-8
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/target/
2+
.idea
3+
*.iml
4+
*~
5+
*.bak
6+

moa/.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/target/
2-
<<<<<<< HEAD
3-
=======
42
/dumpClustering.csv
53
/SeaAnomaliesUnsupervised.txt
6-
>>>>>>> 764cc6bacfbb36387569e5e8fd26dc9e0605530b
4+
.idea
5+
*.iml
6+
*~
7+
*.bak
8+

moa/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<groupId>org.apache.maven.plugins</groupId>
7979
<artifactId>maven-compiler-plugin</artifactId>
8080
<configuration>
81-
<source>1.6</source>
82-
<target>1.6</target>
81+
<source>1.7</source>
82+
<target>1.7</target>
8383
</configuration>
8484
</plugin>
8585

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@
195195
<artifactId>maven-compiler-plugin</artifactId>
196196
<version>2.0.2</version>
197197
<configuration>
198-
<source>1.6</source>
199-
<target>1.6</target>
198+
<source>1.7</source>
199+
<target>1.7</target>
200200
</configuration>
201201
</plugin>
202202

@@ -258,6 +258,7 @@
258258
<nohelp>true</nohelp>
259259
<!-- avoids "-SNAPSHOT" in title when using the release.xml configuration -->
260260
<doctitle>${project.name}</doctitle>
261+
<additionalparam>-Xdoclint:none</additionalparam>
261262
</configuration>
262263
</plugin>
263264

weka-package/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
/target/
2+
.idea
3+
*.iml
4+
*~
5+
*.bak
6+

weka-package/build_package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
optimize="${optimization}"
6363
debug="${debug}"
6464
deprecation="${deprecation}"
65-
source="1.6" target="1.6">
65+
source="1.7" target="1.7">
6666

6767
<classpath refid="project.class.path" />
6868
</javac>

0 commit comments

Comments
 (0)