You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2020/02/11 07:29:05 UTC
[logging-log4cxx] branch ghpr_14_replace-ant-build-with-cmake
updated (a630560 -> 8880c68)
This is an automated email from the ASF dual-hosted git repository.
tschoening pushed a change to branch ghpr_14_replace-ant-build-with-cmake
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git.
from a630560 Corrected tabs vs. spaces.
new 3775ffa Prevent socketservertestcase failures when using Maven to build and test
new 8880c68 Merge branch 'replace-ant-build-with-cmake' of https://github.com/stephen-webb/logging-log4cxx into ghpr_14_replace-ant-build-with-cmake
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 1 +
1 file changed, 1 insertion(+)
[logging-log4cxx] 02/02: Merge branch
'replace-ant-build-with-cmake' of
https://github.com/stephen-webb/logging-log4cxx into
ghpr_14_replace-ant-build-with-cmake
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tschoening pushed a commit to branch ghpr_14_replace-ant-build-with-cmake
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 8880c68f39fc35dbca559a7273e853e5cc4b3411
Merge: a630560 3775ffa
Author: Thorsten Schöning <ts...@am-soft.de>
AuthorDate: Tue Feb 11 08:28:58 2020 +0100
Merge branch 'replace-ant-build-with-cmake' of https://github.com/stephen-webb/logging-log4cxx into ghpr_14_replace-ant-build-with-cmake
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --cc pom.xml
index 6ea2332,5722ae9..7952eb0
--- a/pom.xml
+++ b/pom.xml
@@@ -180,61 -180,56 +180,62 @@@
<build>
<plugins>
- <plugin>
- <groupId>com.googlecode.cmake-maven-project</groupId>
- <artifactId>cmake-maven-plugin</artifactId>
- <version>3.16.3-b1</version>
- <executions>
- <execution>
- <id>cmake-generate</id>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <sourcePath>${project.basedir}</sourcePath>
- <targetPath>${project.build.directory}/${platform}</targetPath>
- <classifier>${cmake.classifier}</classifier>
- <options>${cmake.options}</options>
- <environmentVariables>
- <CMAKE_CLASSIFIER>${cmake.classifier}</CMAKE_CLASSIFIER>
- </environmentVariables>
- <downloadBinaries>${download.cmake}</downloadBinaries>
- </configuration>
- </execution>
- <execution>
- <id>cmake-compile</id>
- <phase>process-resources</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <projectDirectory>${project.build.directory}/${platform}</projectDirectory>
- <classifier>${cmake.classifier}</classifier>
- <config>${cmake.config}</config>
- <downloadBinaries>true</downloadBinaries>
- </configuration>
- </execution>
- <execution>
- <phase>test</phase>
- <id>cmake-run-tests</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <buildDirectory>${project.build.directory}/${platform}</buildDirectory>
- <testFailureIgnore>true</testFailureIgnore>
- <ctest.skip.tests>${maven.test.skip}</ctest.skip.tests>
- <config>${cmake.config}</config>
- <threadCount>1</threadCount>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>com.googlecode.cmake-maven-project</groupId>
+ <artifactId>cmake-maven-plugin</artifactId>
+ <version>3.16.3-b1</version>
+
+ <executions>
+ <execution>
+ <id>cmake-generate</id>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+
+ <configuration>
+ <sourcePath>${project.basedir}</sourcePath>
+ <targetPath>${project.build.directory}/${platform}</targetPath>
+ <classifier>${cmake.classifier}</classifier>
+ <options>${cmake.options}</options>
+ <environmentVariables>
+ <CMAKE_CLASSIFIER>${cmake.classifier}</CMAKE_CLASSIFIER>
+ </environmentVariables>
+ <downloadBinaries>${download.cmake}</downloadBinaries>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>cmake-compile</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+
+ <configuration>
+ <projectDirectory>${project.build.directory}/${platform}</projectDirectory>
+ <classifier>${cmake.classifier}</classifier>
+ <config>${cmake.config}</config>
+ <downloadBinaries>true</downloadBinaries>
+ </configuration>
+ </execution>
+
+ <execution>
+ <phase>test</phase>
+ <id>cmake-run-tests</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+
+ <configuration>
+ <buildDirectory>${project.build.directory}/${platform}</buildDirectory>
+ <testFailureIgnore>true</testFailureIgnore>
+ <ctest.skip.tests>${maven.test.skip}</ctest.skip.tests>
+ <config>${cmake.config}</config>
++ <threadCount>1</threadCount>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
[logging-log4cxx] 01/02: Prevent socketservertestcase failures when
using Maven to build and test
Posted by ts...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tschoening pushed a commit to branch ghpr_14_replace-ant-build-with-cmake
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit 3775ffa6cc806feb284e1863f95b698216e09d13
Author: Stephen Webb <sw...@gmail.com>
AuthorDate: Tue Feb 11 12:28:53 2020 +1100
Prevent socketservertestcase failures when using Maven to build and test
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index 9f9d562..5722ae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,6 +225,7 @@
<testFailureIgnore>true</testFailureIgnore>
<ctest.skip.tests>${maven.test.skip}</ctest.skip.tests>
<config>${cmake.config}</config>
+ <threadCount>1</threadCount>
</configuration>
</execution>
</executions>