Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Java 8 Compilation Fixes

Browse Source 
Added in profiles to disable the doclint in Java 8 compilations,
which will cause the build to error on javadoc issues.

Change-Id: Id9e50ca35034ea086195855f6d1515381213dd2f
This commit is contained in:
Fredric Silberberg
2014-03-20 19:17:16 -04:00
parent 4546abc8c5
commit 33134bef1d
3 changed files with 155 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
wpilibj/wpilibJava/pom.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wpi.first.wpilibj</groupId>
<artifactId>wpilibJava</artifactId>
@@ -14,42 +14,63 @@
<relativePath>../../maven-utilities/athena/library-jar</relativePath>
</parent>
<profiles>
<profile>
<id>docline-java8-disable</id>
<activation>
<jdk>[1.8,</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<repositories>
<!-- repository>
<id>sonatype</id>
<name>Sonatype OSS Snapshots Repository</name>
<url>http://oss.sonatype.org/content/groups/public</url>
</repository -->
<id>sonatype</id>
<name>Sonatype OSS Snapshots Repository</name>
<url>http://oss.sonatype.org/content/groups/public</url>
</repository -->
<!-- For old snapshots, please use groupId `com.jnaerator` and the following repo -->
<!-- repository>
<id>nativelibs4java-repo</id>
<url>http://nativelibs4java.sourceforge.net/maven</url>
</repository -->
<id>nativelibs4java-repo</id>
<url>http://nativelibs4java.sourceforge.net/maven</url>
</repository -->
</repositories>
<dependencies>
<!-- dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>4.0.0</version>
</dependency -->
<!-- dependency>
<groupId>com.nativelibs4java</groupId>
<artifactId>jnaerator-runtime</artifactId>
<version>0.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency -->
<!-- dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>4.0.0</version>
</dependency -->
<!-- dependency>
<groupId>com.nativelibs4java</groupId>
<artifactId>jnaerator-runtime</artifactId>
<version>0.12-SNAPSHOT</version>
<scope>compile</scope>
</dependency -->
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>edu.wpi.first.wpilib.networktables.java</groupId>
<artifactId>NetworkTables</artifactId>
<version>0.1.0-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -57,68 +78,68 @@
<configuration>
<source>1.7</source>
<target>1.7</target>
<excludes>
<exclude>edu/wpi/first/wpilibj/image/</exclude>
<exclude>edu/wpi/first/wpilibj/camera/</exclude>
<exclude>edu/wpi/first/wpilibj/visa/</exclude>
<exclude>edu/wpi/first/wpilibj/SerialPort.java</exclude>
<exclude>edu/wpi/first/wpilibj/Kinect.java</exclude>
<exclude>edu/wpi/first/wpilibj/KinectStick.java</exclude>
<exclude>edu/wpi/first/wpilibj/DriverStationEnhancedIO.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/DigitalIOButton.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/AnalogIOButton.java</exclude>
</excludes>
<excludes>
<exclude>edu/wpi/first/wpilibj/image/</exclude>
<exclude>edu/wpi/first/wpilibj/camera/</exclude>
<exclude>edu/wpi/first/wpilibj/visa/</exclude>
<exclude>edu/wpi/first/wpilibj/SerialPort.java</exclude>
<exclude>edu/wpi/first/wpilibj/Kinect.java</exclude>
<exclude>edu/wpi/first/wpilibj/KinectStick.java</exclude>
<exclude>edu/wpi/first/wpilibj/DriverStationEnhancedIO.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/DigitalIOButton.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/AnalogIOButton.java</exclude>
</excludes>
</configuration>
</plugin>
<!-- plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<id>fetch-dependencies</id>
<phase>compile</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>edu.wpi.first.wpilib.hal</groupId>
<artifactId>libHALAthenaJava</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>so</type>
<destFileName>libHALAthenaJava.so</destFileName>
<outputDirectory>${project.build.directory}/classes/linux-arm</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin -->
<plugin>
<!-- plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<executions>
<execution>
<id>fetch-dependencies</id>
<phase>compile</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>edu.wpi.first.wpilib.hal</groupId>
<artifactId>libHALAthenaJava</artifactId>
<version>0.1.0-SNAPSHOT</version>
<type>so</type>
<destFileName>libHALAthenaJava.so</destFileName>
<outputDirectory>${project.build.directory}/classes/linux-arm</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<sourceFileExcludes>
<exclude>edu/wpi/first/wpilibj/image/</exclude>
<exclude>edu/wpi/first/wpilibj/camera/</exclude>
<exclude>edu/wpi/first/wpilibj/visa/</exclude>
<exclude>edu/wpi/first/wpilibj/SerialPort.java</exclude>
<exclude>edu/wpi/first/wpilibj/Kinect.java</exclude>
<exclude>edu/wpi/first/wpilibj/KinectStick.java</exclude>
<exclude>edu/wpi/first/wpilibj/DriverStationEnhancedIO.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/DigitalIOButton.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/AnalogIOButton.java</exclude>
</sourceFileExcludes>
<sourceFileExcludes>
<exclude>edu/wpi/first/wpilibj/image/</exclude>
<exclude>edu/wpi/first/wpilibj/camera/</exclude>
<exclude>edu/wpi/first/wpilibj/visa/</exclude>
<exclude>edu/wpi/first/wpilibj/SerialPort.java</exclude>
<exclude>edu/wpi/first/wpilibj/Kinect.java</exclude>
<exclude>edu/wpi/first/wpilibj/KinectStick.java</exclude>
<exclude>edu/wpi/first/wpilibj/DriverStationEnhancedIO.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/DigitalIOButton.java</exclude>
<exclude>edu/wpi/first/wpilibj/buttons/AnalogIOButton.java</exclude>
</sourceFileExcludes>
</configuration>
</plugin>
</plugins>
</plugin>
</plugins>
</build>
</project>