iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved Conflicts with master

This commit is contained in:
Greg Martin 2020-04-27 18:58:15 -04:00
parent 71fb667478
commit ac794a722f
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libraries-3/pom.xml
View File

@ -70,7 +70,6 @@
<artifactId>velocity-engine-core</artifactId> <artifactId>velocity-engine-core</artifactId>
<version>${velocity-engine-core.version}</version> <version>${velocity-engine-core.version}</version>
</dependency> </dependency>
<<<<<<< HEAD
<dependency> <dependency>
<groupId>com.uber.nullaway</groupId> <groupId>com.uber.nullaway</groupId>
<artifactId>nullaway</artifactId> <artifactId>nullaway</artifactId>
@ -88,25 +87,6 @@
<artifactId>error_prone_core</artifactId> <artifactId>error_prone_core</artifactId>
<version>2.1.3</version> <version>2.1.3</version>
</dependency> </dependency>
=======
<dependency>
<groupId>com.uber.nullaway</groupId>
<artifactId>nullaway</artifactId>
<version>0.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-javac-errorprone</artifactId>
<version>2.8</version>
</dependency>
<!-- override plexus-compiler-javac-errorprone's dependency on
Error Prone with the latest version -->
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_core</artifactId>
<version>2.1.3</version>
</dependency>
>>>>>>> upstream/master
</dependencies> </dependencies>
<repositories> <repositories>
@ -143,20 +123,11 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
<<<<<<< HEAD
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.5</version> <version>3.5</version>
<configuration> <configuration>
=======
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5</version>
<configuration>
>>>>>>> upstream/master
<compilerId>javac-with-errorprone</compilerId> <compilerId>javac-with-errorprone</compilerId>
<forceJavacCompilerUse>true</forceJavacCompilerUse> <forceJavacCompilerUse>true</forceJavacCompilerUse>
<source>1.8</source> <source>1.8</source>
@ -172,11 +143,7 @@
<compilerArgs> <compilerArgs>
<!-- NullAway will warn by default, uncomment the next line to make the build fail --> <!-- NullAway will warn by default, uncomment the next line to make the build fail -->
<!-- <arg>-Xep:NullAway:ERROR</arg> --> <!-- <arg>-Xep:NullAway:ERROR</arg> -->
<<<<<<< HEAD
<arg>-XepExcludedPaths:(.*)/test/.*|(.*)/streamex/.*|(.*)/jcabi/.*</arg>
=======
<arg>-XepExcludedPaths:(.*)/test/.*|(.*)/jcabi/.*</arg> <arg>-XepExcludedPaths:(.*)/test/.*|(.*)/jcabi/.*</arg>
>>>>>>> upstream/master
<arg>-XepOpt:NullAway:AnnotatedPackages=com.baeldung.nullaway</arg> <arg>-XepOpt:NullAway:AnnotatedPackages=com.baeldung.nullaway</arg>
</compilerArgs> </compilerArgs>
</configuration> </configuration>