You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2017/06/10 13:58:05 UTC
tomee git commit: Define Java version and update Arquillian versions
Repository: tomee
Updated Branches:
refs/heads/master 41bb387bd -> fbe42a2fd
Define Java version and update Arquillian versions
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/fbe42a2f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/fbe42a2f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/fbe42a2f
Branch: refs/heads/master
Commit: fbe42a2fd9fc7c17d7710b2fa9e62b80243436fc
Parents: 41bb387
Author: Andy Gumbrecht <ag...@tomitribe.com>
Authored: Sat Jun 10 15:57:55 2017 +0200
Committer: Andy Gumbrecht <ag...@tomitribe.com>
Committed: Sat Jun 10 15:57:55 2017 +0200
----------------------------------------------------------------------
pom.xml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/fbe42a2f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d233f10..1ea4643 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,9 +92,12 @@
</scm>
<properties>
+
<tomee.version>${project.version}</tomee.version>
-
- <!-- to change easily the javaee api version -->
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+
+ <!-- To easily change the javaee api version -->
<version.javaee-api>7.0-1</version.javaee-api>
<openjpa.version>2.4.2</openjpa.version>
@@ -124,9 +127,9 @@
<batchee.version>0.4-incubating</batchee.version>
- <version.arquillian>1.1.11.Final</version.arquillian>
- <version.shrinkwrap.descriptor>2.0.0-alpha-7</version.shrinkwrap.descriptor>
- <version.shrinkwrap.shrinkwrap>1.2.2</version.shrinkwrap.shrinkwrap>
+ <version.arquillian>1.1.13.Final</version.arquillian>
+ <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
+ <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
<tomcat.version>8.5.15</tomcat.version>
@@ -200,6 +203,11 @@
<version>3.1.0</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.6.1</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
@@ -376,6 +384,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <failOnError>false</failOnError>
<supportedProjectTypes>
<supportedProjectType>bundle</supportedProjectType>
<supportedProjectType>jar</supportedProjectType>
@@ -395,7 +404,6 @@
<Implementation-Version>${project.version}</Implementation-Version>
<Include-Resource>{maven-resources}</Include-Resource>
</instructions>
- <failOnError>false</failOnError>
</configuration>
<executions>
<execution>