You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/08/07 18:42:35 UTC
[1/2] git commit: SM-2359: Upgrade to Pax Exam 4.1.0
Repository: servicemix
Updated Branches:
refs/heads/master 2bcfe6afd -> 86ca1c54a
SM-2359: Upgrade to Pax Exam 4.1.0
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/5ea4412e
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5ea4412e
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5ea4412e
Branch: refs/heads/master
Commit: 5ea4412e1869aae2f6aa389f55dfba49f5b7702e
Parents: 2bcfe6a
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Aug 7 18:34:58 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Aug 7 18:34:58 2014 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5ea4412e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 28ccc84..2e248d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
<xerces.version>2.11.0</xerces.version>
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.1</xalan.version>
- <pax.exam.version>3.5.0</pax.exam.version>
+ <pax.exam.version>4.1.0</pax.exam.version>
<pax.url.version>1.3.7</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
<slf4j.version>1.7.5</slf4j.version>
[2/2] git commit: SM-2362: Require JDK 7 for build
Posted by ks...@apache.org.
SM-2362: Require JDK 7 for build
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/86ca1c54
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/86ca1c54
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/86ca1c54
Branch: refs/heads/master
Commit: 86ca1c54a58f545e0dd9d389c158b8f0a54ed453
Parents: 5ea4412
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Thu Aug 7 18:40:00 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Thu Aug 7 18:40:00 2014 +0200
----------------------------------------------------------------------
pom.xml | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/86ca1c54/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2e248d9..4970a4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,7 @@
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
<maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
<cobertura-maven-plugin.version>2.2</cobertura-maven-plugin.version>
+ <maven-enforcer-plugin.version>1.3.1</maven-enforcer-plugin.version>
<exec-maven-plugin.version>1.1.1</exec-maven-plugin.version>
<build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
<maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
@@ -266,6 +267,11 @@
<version>${depends-maven-plugin.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
@@ -436,6 +442,28 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-maven</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[3,4)</version>
+ </requireMavenVersion>
+ <requireJavaVersion>
+ <version>[1.7,1.9)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<executions>
<execution>