This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch cloudbreak in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git
commit 31d3ca18795a0104d578d494080a61a42ce078a2 Author: Olivér Szabó <oleew...@gmail.com> AuthorDate: Wed Oct 24 15:46:17 2018 +0200 Update maven versioning (#11) --- Makefile | 2 +- README.md | 2 +- ambari-logsearch-appender/pom.xml | 2 +- ambari-logsearch-assembly/pom.xml | 2 +- ambari-logsearch-config-api/pom.xml | 2 +- ambari-logsearch-config-json/pom.xml | 2 +- ambari-logsearch-config-local/pom.xml | 2 +- ambari-logsearch-config-solr/pom.xml | 2 +- ambari-logsearch-config-zookeeper/pom.xml | 2 +- ambari-logsearch-it/pom.xml | 2 +- ambari-logsearch-log4j2-appender/pom.xml | 2 +- ambari-logsearch-logfeeder-container-registry/pom.xml | 2 +- ambari-logsearch-logfeeder-plugin-api/pom.xml | 2 +- ambari-logsearch-logfeeder/pom.xml | 2 +- ambari-logsearch-server/pom.xml | 2 +- ambari-logsearch-web/pom.xml | 4 +--- pom.xml | 5 +++-- 17 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 6ad38e4..5f9c8b0 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ deb: $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests -Djdk.version=$(LOGSEARCH_JAVA_VERSION) update-version: - $(MAVEN_BINARY) versions:set -DnewVersion=$(new-version) -DgenerateBackupPoms=false + $(MAVEN_BINARY) versions:set-property -Dproperty=revision -DnewVersion=$(new-version) -DgenerateBackupPoms=false docker-build: $(MAVEN_BINARY) clean package docker:build -DskipTests -Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG) -Djdk.version=$(LOGSEARCH_JAVA_VERSION) diff --git a/README.md b/README.md index 07309a1..47d09a1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Log Search is a sub-project of [Apache Ambari](https://github.com/apache/ambari) ## Development -Requires JDK 8 (JDK 11 is recommended) +Requires JDK 8 (JDK 11 is recommended) and Maven 3.5.x ### Prerequisites diff --git a/ambari-logsearch-appender/pom.xml b/ambari-logsearch-appender/pom.xml index f83ada8..92f68b9 100644 --- a/ambari-logsearch-appender/pom.xml +++ b/ambari-logsearch-appender/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <artifactId>ambari-logsearch-appender</artifactId> diff --git a/ambari-logsearch-assembly/pom.xml b/ambari-logsearch-assembly/pom.xml index 19c3d90..21cb491 100644 --- a/ambari-logsearch-assembly/pom.xml +++ b/ambari-logsearch-assembly/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <name>Ambari Logsearch Assembly</name> <url>http://maven.apache.org</url> diff --git a/ambari-logsearch-config-api/pom.xml b/ambari-logsearch-config-api/pom.xml index add7ddf..75e1840 100644 --- a/ambari-logsearch-config-api/pom.xml +++ b/ambari-logsearch-config-api/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-config-json/pom.xml b/ambari-logsearch-config-json/pom.xml index 05565bd..cf65c33 100644 --- a/ambari-logsearch-config-json/pom.xml +++ b/ambari-logsearch-config-json/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-config-local/pom.xml b/ambari-logsearch-config-local/pom.xml index 7e50f7c..c8cf081 100644 --- a/ambari-logsearch-config-local/pom.xml +++ b/ambari-logsearch-config-local/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-config-solr/pom.xml b/ambari-logsearch-config-solr/pom.xml index f47fd75..27be12d 100644 --- a/ambari-logsearch-config-solr/pom.xml +++ b/ambari-logsearch-config-solr/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-config-zookeeper/pom.xml b/ambari-logsearch-config-zookeeper/pom.xml index 343971e..5b5fc8a 100644 --- a/ambari-logsearch-config-zookeeper/pom.xml +++ b/ambari-logsearch-config-zookeeper/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-it/pom.xml b/ambari-logsearch-it/pom.xml index a4e160f..eda11d8 100644 --- a/ambari-logsearch-it/pom.xml +++ b/ambari-logsearch-it/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-log4j2-appender/pom.xml b/ambari-logsearch-log4j2-appender/pom.xml index 2035e63..1fe477c 100644 --- a/ambari-logsearch-log4j2-appender/pom.xml +++ b/ambari-logsearch-log4j2-appender/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-logfeeder-container-registry/pom.xml b/ambari-logsearch-logfeeder-container-registry/pom.xml index 6983d09..e39c489 100644 --- a/ambari-logsearch-logfeeder-container-registry/pom.xml +++ b/ambari-logsearch-logfeeder-container-registry/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <packaging>jar</packaging> diff --git a/ambari-logsearch-logfeeder-plugin-api/pom.xml b/ambari-logsearch-logfeeder-plugin-api/pom.xml index a944e83..1e19710 100644 --- a/ambari-logsearch-logfeeder-plugin-api/pom.xml +++ b/ambari-logsearch-logfeeder-plugin-api/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch-logfeeder/pom.xml index d2efc79..94af44f 100644 --- a/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch-logfeeder/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/ambari-logsearch-server/pom.xml b/ambari-logsearch-server/pom.xml index 8c955ae..3349482 100755 --- a/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch-server/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-logsearch-server</artifactId> diff --git a/ambari-logsearch-web/pom.xml b/ambari-logsearch-web/pom.xml index 953f0df..05da929 100644 --- a/ambari-logsearch-web/pom.xml +++ b/ambari-logsearch-web/pom.xml @@ -18,13 +18,11 @@ <parent> <artifactId>ambari-logsearch</artifactId> <groupId>org.apache.ambari</groupId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-logsearch-web</artifactId> <name>Ambari Logsearch Web</name> - <version>2.0.0.0-SNAPSHOT</version> - <groupId>org.apache.ambari</groupId> <description>Ambari Logsearch Web</description> <properties> diff --git a/pom.xml b/pom.xml index 7630919..21d236c 100644 --- a/pom.xml +++ b/pom.xml @@ -19,9 +19,9 @@ <groupId>org.apache.ambari</groupId> <modelVersion>4.0.0</modelVersion> <artifactId>ambari-logsearch</artifactId> - <version>2.0.0.0-SNAPSHOT</version> + <version>${revision}</version> <packaging>pom</packaging> - + <name>Ambari Logsearch Parent</name> <url>http://maven.apache.org</url> <profiles> <profile> @@ -76,6 +76,7 @@ </profile> </profiles> <properties> + <revision>3.0.0.0-SNAPSHOT</revision> <jdk.version>1.8</jdk.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <python.ver>python >= 2.6</python.ver>