Repository: activemq-6 Updated Branches: refs/heads/master cb24f3779 -> 59deb8558
ACTIVEMQ6-83 - make the build use Java 8 by default https://issues.apache.org/jira/browse/ACTIVEMQ6-83 upgrade to Java 8 minimum and change the default profile to build the distro. Also add enforcer rule for Java 8 Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/9d1959ed Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/9d1959ed Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/9d1959ed Branch: refs/heads/master Commit: 9d1959edef3d1df8ba0661339e7ff540bcf536da Parents: cb24f37 Author: Andy Taylor <[email protected]> Authored: Mon Feb 23 10:14:16 2015 +0000 Committer: Andy Taylor <[email protected]> Committed: Mon Feb 23 15:46:34 2015 +0000 ---------------------------------------------------------------------- pom.xml | 66 +++++++++++++++++++++++------------------------------------- 1 file changed, 25 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9d1959ed/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c821a4d..9611d29 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ <profiles> <profile> - <id>default</id> + <id>distro</id> <activation> <activeByDefault>true</activeByDefault> </activation> @@ -458,33 +458,6 @@ <module>activemq-server</module> <module>activemq-jms-client</module> <module>activemq-jms-server</module> - <module>activemq-journal</module> - <module>activemq-native</module> - <module>activemq-ra</module> - <module>activemq-rest</module> - <module>activemq-tools</module> - <module>activemq-service-extensions</module> - <module>activemq-maven-plugin</module> - <!-- <module>integration/activemq-jboss-as-integration</module> --> - <module>integration/activemq-spring-integration</module> - <module>integration/activemq-aerogear-integration</module> - <module>integration/activemq-vertx-integration</module> - <module>tests</module> - </modules> - </profile> - <profile> - <id>distro</id> - <modules> - <module>activemq-dto</module> - <module>activemq-web</module> - <module>activemq-website</module> - <module>activemq-bootstrap</module> - <module>activemq-commons</module> - <module>activemq-selector</module> - <module>activemq-core-client</module> - <module>activemq-server</module> - <module>activemq-jms-client</module> - <module>activemq-jms-server</module> <module>activemq-native</module> <module>activemq-journal</module> <module>activemq-ra</module> @@ -626,15 +599,6 @@ <skipTests>true</skipTests> </properties> </profile> - <profile> - <id>jdk8</id> - <activation> - <jdk>1.8</jdk> - </activation> - <properties> - <javadoc.opts>-Xdoclint:none</javadoc.opts> - </properties> - </profile> </profiles> <build> @@ -793,19 +757,39 @@ <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <id>enforce-java</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireJavaVersion> + <version>1.8.0</version> + </requireJavaVersion> + </rules> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <showWarnings>true</showWarnings> - <source>1.7</source> - <target>1.7</target> + <source>1.8</source> + <target>1.8</target> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <additionalparam>${javadoc.opts}</additionalparam> + <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> <plugin> @@ -993,7 +977,7 @@ <aggregate>true</aggregate> <excludePackageNames>com.restfully.*:org.jboss.resteasy.examples.*:org.jboss.resteasy.tests.* </excludePackageNames> - <additionalparam>${javadoc.opts}</additionalparam> + <additionalparam>-Xdoclint:none</additionalparam> </configuration> </plugin> <plugin>
