You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/07/10 17:09:50 UTC
activemq-cpp git commit: Update build tools with newer versions for
dependencies.
Repository: activemq-cpp
Updated Branches:
refs/heads/master 1a71973ec -> 9a656c844
Update build tools with newer versions for dependencies.
Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/9a656c84
Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/9a656c84
Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/9a656c84
Branch: refs/heads/master
Commit: 9a656c844e4455ebe6ff3b5b7269beddfed5a073
Parents: 1a71973
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Jul 10 11:09:41 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Jul 10 11:09:41 2015 -0400
----------------------------------------------------------------------
activemq-cpp-openwire-generator/pom.xml | 19 +++-----------
activemq-cpp/build.sh | 4 +--
activemq-cpp/pom.xml | 5 ++--
maven-cpptools-plugin/pom.xml | 39 ++++++++++------------------
pom.xml | 32 ++++++++++++++++++-----
5 files changed, 47 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9a656c84/activemq-cpp-openwire-generator/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-cpp-openwire-generator/pom.xml b/activemq-cpp-openwire-generator/pom.xml
index a65091e..a5097d8 100644
--- a/activemq-cpp-openwire-generator/pom.xml
+++ b/activemq-cpp-openwire-generator/pom.xml
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
+ <artifactId>activemq-client</artifactId>
<version>${activemq-version}</version>
</dependency>
</dependencies>
@@ -50,14 +50,14 @@
<activation>
<property>
<name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
+ <value>Oracle Corporation</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
- <version>1.4.2</version>
+ <version>1.5</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
@@ -65,17 +65,4 @@
</profile>
</profiles>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
</project>
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9a656c84/activemq-cpp/build.sh
----------------------------------------------------------------------
diff --git a/activemq-cpp/build.sh b/activemq-cpp/build.sh
index d2543c8..f323226 100755
--- a/activemq-cpp/build.sh
+++ b/activemq-cpp/build.sh
@@ -122,7 +122,7 @@ run_Clean() {
run_Make() {
check_Configure
pushd $AMQCPP_BUILD_DIR
- make -j4
+ make -j 8
popd
exit
}
@@ -130,7 +130,7 @@ run_Make() {
run_Check() {
check_Configure
pushd $AMQCPP_BUILD_DIR
- make check -j4
+ make check -j 8
popd
exit
}
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9a656c84/activemq-cpp/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-cpp/pom.xml b/activemq-cpp/pom.xml
index 65b2e33..cd7ab75 100644
--- a/activemq-cpp/pom.xml
+++ b/activemq-cpp/pom.xml
@@ -36,7 +36,6 @@
<dependency>
<groupId>org.apache.activemq-cpp</groupId>
<artifactId>activemq-cpp-openwire-generator</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -215,7 +214,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
+ <version>${maven-exec-version}</version>
<executions>
<execution>
<id>Configure</id>
@@ -286,7 +285,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>${maven-exec-version}</version>
<executions>
<execution>
<phase>compile</phase>
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9a656c84/maven-cpptools-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-cpptools-plugin/pom.xml b/maven-cpptools-plugin/pom.xml
index 069ff20..e113321 100644
--- a/maven-cpptools-plugin/pom.xml
+++ b/maven-cpptools-plugin/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.0</version>
+ <version>3.3.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -45,25 +45,25 @@
<dependency>
<groupId>org.codehaus.mojo.natives</groupId>
<artifactId>maven-native-api</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0-alpha-8</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <exclusions>
- <exclusion>
- <!-- xom is an optional dependency of xstream. Its also
- LGPL, so its really not ASF compatible. -->
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
+ <version>${xstream-version}</version>
+ <exclusions>
+ <exclusion>
+ <!-- xom is an optional dependency of xstream. Its also
+ LGPL, so its really not ASF compatible. -->
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>${junit-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -72,25 +72,14 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
<configuration>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
</links>
<linksource>true</linksource>
<maxmemory>900m</maxmemory>
- <source>1.6</source>
+ <source>1.7</source>
</configuration>
</plugin>
<plugin>
http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/9a656c84/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 607dc5d..9c384ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>9</version>
+ <version>15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -32,7 +32,7 @@
<name>ActiveMQ-CPP Project</name>
<inceptionYear>2007</inceptionYear>
<prerequisites>
- <maven>2.0.9</maven>
+ <maven>3.1.1</maven>
</prerequisites>
<organization>
@@ -60,14 +60,20 @@
</mailingLists>
<properties>
- <activemq-version>5.7.0</activemq-version>
+ <source-version>1.7</source-version>
+ <target-version>1.7</target-version>
+
+ <activemq-version>5.11.1</activemq-version>
<siteId>activemq-cpp-${activemq-version}</siteId>
<projectName>Apache ActiveMQ-CPP</projectName>
<annogen-version>0.1.0</annogen-version>
<ant-version>1.7.0</ant-version>
- <xstream-version>1.4.1</xstream-version>
+ <xstream-version>1.4.8</xstream-version>
<activemq-client-dir>${ACTIVEMQ_SRC_HOME}/activemq-client/</activemq-client-dir>
<activemq-cpp-openwire-generator-version>2.0</activemq-cpp-openwire-generator-version>
+ <junit-version>4.12</junit-version>
+ <assembly-plugin-version>2.4</assembly-plugin-version>
+ <maven-exec-version>1.4.0</maven-exec-version>
</properties>
<modules>
@@ -107,6 +113,7 @@
</dependencyManagement>
<build>
+ <defaultGoal>test</defaultGoal>
<pluginManagement>
<plugins>
<plugin>
@@ -117,7 +124,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
+ <version>${assembly-plugin-version}</version>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -169,6 +176,20 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>${source-version}</source>
+ <target>${target-version}</target>
+ <optimize>true</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<profiles>
@@ -180,7 +201,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.4</version>
<inherited>true</inherited>
<configuration>
<passphrase>${gpg.passphrase}</passphrase>