Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2724 from olivergondza/apt-maven-plugin-java8
[FIXED JENKINS-36872] Switch to com.mysema.maven:apt-maven-plugin for Java 8 support
  • Loading branch information
oleg-nenashev committed Feb 18, 2017
2 parents 4ab6938 + 23f5a98 commit 37d2e6a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 21 deletions.
12 changes: 0 additions & 12 deletions core/pom.xml
Expand Up @@ -847,18 +847,6 @@ THE SOFTWARE.
<id>release</id>
<build>
<plugins>
<plugin><!-- execute apt:process for "Extension points" Wiki page generation -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>apt-maven-plugin</artifactId>
<!-- version specified in grandparent pom -->
<executions>
<execution>
<goals>
<goal>process</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<!--
generate jelly taglib docs from src/main/resources.
Expand Down
13 changes: 4 additions & 9 deletions pom.xml
Expand Up @@ -160,7 +160,7 @@ THE SOFTWARE.
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
</dependency>

<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
Expand Down Expand Up @@ -494,11 +494,6 @@ THE SOFTWARE.
<artifactId>antlr-maven-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>apt-maven-plugin</artifactId>
<version>1.0-alpha-5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
Expand Down Expand Up @@ -665,7 +660,7 @@ THE SOFTWARE.
<configuration>
<source>1.${java.level}</source>
<target>1.${java.level}</target>
<!-- default reuseCreated is more performant
<!-- default reuseCreated is more performant
feel free to uncomment if you have any issues on your platform
<compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
-->
Expand Down Expand Up @@ -760,8 +755,8 @@ THE SOFTWARE.
</execution>
</executions>
</plugin>


</plugins>

<extensions>
Expand Down

0 comments on commit 37d2e6a

Please sign in to comment.