Skip to content

Commit

Permalink
Merge branch 'working'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
savageautomate committed Aug 21, 2019
2 parents b6a9ef5 + 13c9c3d commit 89dbc65
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,13 @@
<version>${s3-upload-maven-plugin.version}</version>
</plugin>

<!-- ENFORCER PLUGIN -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>

</plugins>
</pluginManagement>

Expand Down Expand Up @@ -666,6 +673,25 @@
</executions>
<inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>${java.version}</version>
</requireJavaVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down

0 comments on commit 89dbc65

Please sign in to comment.