oleewere closed pull request #3: AMBARI-24739. Add support to JDK8 build by
makefile and add contribution guide to Log Search
URL: https://github.com/apache/ambari-logsearch/pull/3
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/Makefile b/Makefile
index e101e3f821..6eb4b2283e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,38 @@ rpm:
deb:
$(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests
+update-version:
+ $(MAVEN_BINARY) versions:set -DnewVersion=$(new-version)
-DgenerateBackupPoms=false
+
+package-jdk8:
+ $(MAVEN_BINARY) clean package -Djdk.version=1.8
+
+install-jdk8:
+ $(MAVEN_BINARY) clean install -DskipTests -Djdk.version=1.8
+
+be-jdk8:
+ $(MAVEN_BINARY) clean package -Pbe -Djdk.version=1.8
+
+fe-jdk8:
+ $(MAVEN_BINARY) clean package -Pfe -Djdk.version=1.8
+
+test-jdk8:
+ $(MAVEN_BINARY) clean test -Djdk.version=1.8
+
+rpm-jdk8:
+ $(MAVEN_BINARY) clean package -Dbuild-rpm -DskipTests -Djdk.version=1.8
+
+deb-jdk8:
+ $(MAVEN_BINARY) clean package -Dbuild-deb -DskipTests -Djdk.version=1.8
+
docker-build:
$(MAVEN_BINARY) clean package docker:build -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
docker-push:
$(MAVEN_BINARY) clean package docker:build docker:push -DskipTests
-Dlogsearch.docker.tag=$(LOGSEARCH_BUILD_DOCKER_TAG)
+
+docker-dev-start:
+ cd docker && docker-compose up -d
+
+docker-dev-build-and-start:
+ $(MAVEN_BINARY) clean package && cd docker && docker-compose up -d
diff --git a/README.md b/README.md
index 3bab2c3c57..a2fc3e8961 100644
--- a/README.md
+++ b/README.md
@@ -48,15 +48,17 @@ In case if you started the containers separately and if you
would like to access
1. Check out the code from GIT repository
-2. On the logsearch root folder (ambari/ambari-logsearch), please execute the
following Maven command to build RPM/DPKG:
+2. On the logsearch root folder (ambari/ambari-logsearch), please execute the
following make command to build RPM/DPKG:
```bash
-# for building with jdk 8, use -Djdk.version=1.8
-mvn -Dbuild-rpm clean package
+make rpm
+# or for jdk8
+make rpm-jdk8
```
or
```bash
-# for building with jdk 8, use -Djdk.version=1.8
-mvn -Dbuild-deb clean package
+make deb
+# or for jdk8
+make deb-jdk8
```
3. Generated RPM/DPKG files will be found in ambari-logsearch-assembly/target
folder
@@ -75,7 +77,20 @@ mvn clean integration-test -Dselenium-tests failsafe:verify
```
Also you can run from the IDE, but make sure all of the ambari logsearch
modules are built.
+
+## Update version (for release or specific builds)
+
+```bash
+make set-version new-version="2.8.0.0-11"
+```
+
+## Contributing
+
+https://cwiki.apache.org/confluence/display/AMBARI/How+to+Contribute
+
+(That is the ambari contribution guide, everything is the same here except use
ambari-logsearch repository instead of ambari)
+
## License
-- http://ambari.apache.org/license.html
+- http://ambari.apache.org/license.html
- See more at [Ambari repository](https://github.com/apache/ambari)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
