Force RPM to use Java 1.7, not newer versions

* CentOS now installs 1.8 by default, which breaks ODL
* Bumps RPM version to 0.2.3-2

Change-Id: If9bce5f5eb4a4d5cbfdf7e981a379ffdcb3acc89
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/packaging/rpm/README.md b/packaging/rpm/README.md
index ba5eb24fdc28011fb48a749264d0510b75cf399e..df15edf5c0ac96f017dfb72a8d30daac929395b6 100644 (file)
--- a/packaging/rpm/README.md
+++ b/packaging/rpm/README.md
@@ -20,19 +20,19 @@ build.sh  connect.sh  install.sh  opendaylight.spec  README.md  Vagrantfile
 
 ## Building the RPM
 
-The `build.sh` script is a helper for building the RPM. 
+The `build.sh` script is a helper for building the RPM.
 
 ```
 SRPM built!
-Location: /home/vagrant/rpmbuild/SRPMS/opendaylight-0.2.3-1.fc20.src.rpm
+Location: /home/vagrant/rpmbuild/SRPMS/opendaylight-0.2.3-2.fc20.src.rpm
 Assuming you want to move RPM off Vagrant box
 Also renaming RPM, not actually tagged as for FC20 target OS
-cp /home/vagrant/rpmbuild/SRPMS/opendaylight-0.2.3-1.fc20.src.rpm /vagrant/opendaylight-0.2.3-1.src.rpm
+cp /home/vagrant/rpmbuild/SRPMS/opendaylight-0.2.3-2.fc20.src.rpm /vagrant/opendaylight-0.2.3-2.src.rpm
 RPM built!
-Location: /home/vagrant/rpmbuild/RPMS/noarch/opendaylight-0.2.3-1.fc20.noarch.rpm
+Location: /home/vagrant/rpmbuild/RPMS/noarch/opendaylight-0.2.3-2.fc20.noarch.rpm
 Assuming you want to move RPM off Vagrant box
 Also renaming RPM, not actually tagged as for FC20 target OS
-cp /home/vagrant/rpmbuild/RPMS/noarch/opendaylight-0.2.3-1.fc20.noarch.rpm /vagrant/opendaylight-0.2.3-1.noarch.rpm
+cp /home/vagrant/rpmbuild/RPMS/noarch/opendaylight-0.2.3-2.fc20.noarch.rpm /vagrant/opendaylight-0.2.3-2.noarch.rpm
 ```
 
 ## Working with the ODL RPM
@@ -45,7 +45,7 @@ The `install.sh` script is a helper for doing the install.
 
 ```
 [vagrant@localhost vagrant]$ ./install.sh
-Installing ODL from ./opendaylight-0.2.3-1.noarch.rpm
+Installing ODL from ./opendaylight-0.2.3-2.noarch.rpm
 ```
 
 Here's a manual walk-through of the install and the resulting system changes.
@@ -58,7 +58,7 @@ Here's a manual walk-through of the install and the resulting system changes.
 # If you want to test the install in the provided build env, install Java
 [vagrant@localhost vagrant]$ sudo yum install -y java
 # Install the ODL RPM
-[vagrant@localhost vagrant]$ sudo rpm -i opendaylight-0.2.3-1.noarch.rpm
+[vagrant@localhost vagrant]$ sudo rpm -i opendaylight-0.2.3-2.noarch.rpm
 # Note that ODL is now installed in /opt
 [vagrant@localhost vagrant]$ ls /opt/
 opendaylight

diff --git a/packaging/rpm/build.sh b/packaging/rpm/build.sh
index b945cab354047a93d095a6fb17b386a52fe118d5..b0efd7a54b64960fc1f20edb5f7be14d559d90a6 100755 (executable)
--- a/packaging/rpm/build.sh
+++ b/packaging/rpm/build.sh
@@ -2,7 +2,7 @@
 
 # Common paths used in this script
 # NB: Name will need to be updated for both ODL and RMP version bumps
-version=1
+version=2
 rpm_name="opendaylight-0.2.3-$version.noarch.rpm"
 rpm_out_path="$HOME/rpmbuild/RPMS/noarch/opendaylight-0.2.3-$version.fc20.noarch.rpm"
 srpm_name="opendaylight-0.2.3-$version.src.rpm"

diff --git a/packaging/rpm/install.sh b/packaging/rpm/install.sh
index 1374b02a6355732538126214dac02f1f1c64f9cf..2c5869b885719140dddcea1b190ffebfbcc3f3bd 100755 (executable)
--- a/packaging/rpm/install.sh
+++ b/packaging/rpm/install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 # Update version/path if needed
-rpm_path="./opendaylight-0.2.3-1.noarch.rpm"
+rpm_path="./opendaylight-0.2.3-2.noarch.rpm"
 
 # Install ODL
 echo "Installing ODL from $rpm_path"

diff --git a/packaging/rpm/opendaylight.spec b/packaging/rpm/opendaylight.spec
index 5573c45bb0e4f75e9e2b8c84c554ebddacf42652..92671141464b42b9f42d1f95a0c32491495daa7c 100644 (file)
--- a/packaging/rpm/opendaylight.spec
+++ b/packaging/rpm/opendaylight.spec
@@ -7,7 +7,7 @@
 
 Name:       opendaylight
 Version:    0.2.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    OpenDaylight SDN Controller
 
 Group:      Applications/Communications
@@ -19,7 +19,7 @@ Source1:    https://github.com/dfarrell07/opendaylight-systemd/archive/%{shortco
 Buildroot:  /tmp
 
 # Required for ODL at run time
-Requires:   java >= 1:1.7.0
+Requires:   java = 1:1.7.0
 # Required for creating odl group
 Requires(pre): shadow-utils
 # Required for configuring systemd
@@ -65,6 +65,8 @@ rm -rf $RPM_BUILD_ROOT/opt/%name
 
 
 %changelog
+* Thu Apr 16 2015 Daniel Farrell <dfarrell@redhat.com> - 0.2.3-2
+- Force Java version 1.7
 * Mon Mar 23 2015 Daniel Farrell <dfarrell@redhat.com> - 0.2.3-1
 - Upgrade from Helium SR2 to Helium SR3
 * Sun Mar 15 2015 Daniel Farrell <dfarrell@redhat.com> - 0.2.2-4