You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2017/05/23 16:58:34 UTC
geode-native git commit: GEODE-2741: Update Linux build to JDK 8
update 131.
Repository: geode-native
Updated Branches:
refs/heads/develop cb9c4e21f -> 2796a8955
GEODE-2741: Update Linux build to JDK 8 update 131.
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/2796a895
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/2796a895
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/2796a895
Branch: refs/heads/develop
Commit: 2796a8955e2f23a908f696a083784ebf72fe7520
Parents: cb9c4e2
Author: Jacob Barrett <jb...@pivotal.io>
Authored: Tue May 23 09:58:05 2017 -0700
Committer: Jacob Barrett <jb...@pivotal.io>
Committed: Tue May 23 09:58:05 2017 -0700
----------------------------------------------------------------------
packer/rhel/install-jdk-1.8.sh | 2 +-
packer/windows/buildenv.bat | 28 ++++++++++++++--------------
packer/windows/sshd-recovery.bat | 28 ++++++++++++++--------------
3 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/2796a895/packer/rhel/install-jdk-1.8.sh
----------------------------------------------------------------------
diff --git a/packer/rhel/install-jdk-1.8.sh b/packer/rhel/install-jdk-1.8.sh
index 1a93b64..016ea05 100644
--- a/packer/rhel/install-jdk-1.8.sh
+++ b/packer/rhel/install-jdk-1.8.sh
@@ -20,7 +20,7 @@ set -x -e -o pipefail
tmp=`mktemp -d`
curl -o ${tmp}/jdk.rpm -v -j -k -L -H "Cookie: oraclelicense=accept-securebackup-cookie" \
- http://download.oracle.com/otn-pub/java/jdk/8u92-b14/jdk-8u92-linux-x64.rpm
+ http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.rpm
yum install -y ${tmp}/jdk.rpm
http://git-wip-us.apache.org/repos/asf/geode-native/blob/2796a895/packer/windows/buildenv.bat
----------------------------------------------------------------------
diff --git a/packer/windows/buildenv.bat b/packer/windows/buildenv.bat
index 029dc71..fa02cf3 100644
--- a/packer/windows/buildenv.bat
+++ b/packer/windows/buildenv.bat
@@ -1,17 +1,17 @@
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
+@rem Licensed to the Apache Software Foundation (ASF) under one or more
+@rem contributor license agreements. See the NOTICE file distributed with
+@rem this work for additional information regarding copyright ownership.
+@rem The ASF licenses this file to You under the Apache License, Version 2.0
+@rem (the "License"); you may not use this file except in compliance with
+@rem the License. You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
@rem Fixup ENV issues with SSH
set APPDATA=C:\Users\build\AppData\Roaming
http://git-wip-us.apache.org/repos/asf/geode-native/blob/2796a895/packer/windows/sshd-recovery.bat
----------------------------------------------------------------------
diff --git a/packer/windows/sshd-recovery.bat b/packer/windows/sshd-recovery.bat
index da49c7b..2b278f0 100644
--- a/packer/windows/sshd-recovery.bat
+++ b/packer/windows/sshd-recovery.bat
@@ -1,17 +1,17 @@
-rem Licensed to the Apache Software Foundation (ASF) under one or more
-rem contributor license agreements. See the NOTICE file distributed with
-rem this work for additional information regarding copyright ownership.
-rem The ASF licenses this file to You under the Apache License, Version 2.0
-rem (the "License"); you may not use this file except in compliance with
-rem the License. You may obtain a copy of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS,
-rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-rem See the License for the specific language governing permissions and
-rem limitations under the License.
+@rem Licensed to the Apache Software Foundation (ASF) under one or more
+@rem contributor license agreements. See the NOTICE file distributed with
+@rem this work for additional information regarding copyright ownership.
+@rem The ASF licenses this file to You under the Apache License, Version 2.0
+@rem (the "License"); you may not use this file except in compliance with
+@rem the License. You may obtain a copy of the License at
+@rem
+@rem http://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
net stop ssh-agent /y
net stop sshd /y