You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by st...@apache.org on 2017/04/03 11:10:03 UTC
maven-integration-testing git commit: Break environments by JDK as
well as OS
Repository: maven-integration-testing
Updated Branches:
refs/heads/master 09bc7b54c -> 244bbca03
Break environments by JDK as well as OS
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/244bbca0
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/244bbca0
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/244bbca0
Branch: refs/heads/master
Commit: 244bbca032ab40f9a2f545c99a2b6944cacc8bdc
Parents: 09bc7b5
Author: Stephen Connolly <st...@gmail.com>
Authored: Mon Apr 3 12:09:56 2017 +0100
Committer: Stephen Connolly <st...@gmail.com>
Committed: Mon Apr 3 12:09:56 2017 +0100
----------------------------------------------------------------------
environments/solaris-10-jdk7/.gitignore | 2 +
environments/solaris-10-jdk7/Makefile | 30 +++++++++++
environments/solaris-10-jdk7/Vagrantfile | 54 ++++++++++++++++++++
environments/solaris-10-jdk7/admin | 10 ++++
.../solaris-10-jdk7/apache-maven-3.3.9.patch | 22 ++++++++
environments/solaris-10/.gitignore | 2 -
environments/solaris-10/Makefile | 30 -----------
environments/solaris-10/Vagrantfile | 54 --------------------
environments/solaris-10/admin | 10 ----
.../solaris-10/apache-maven-3.3.9.patch | 22 --------
10 files changed, 118 insertions(+), 118 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10-jdk7/.gitignore
----------------------------------------------------------------------
diff --git a/environments/solaris-10-jdk7/.gitignore b/environments/solaris-10-jdk7/.gitignore
new file mode 100644
index 0000000..3b82691
--- /dev/null
+++ b/environments/solaris-10-jdk7/.gitignore
@@ -0,0 +1,2 @@
+*.Z
+*.gz
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10-jdk7/Makefile
----------------------------------------------------------------------
diff --git a/environments/solaris-10-jdk7/Makefile b/environments/solaris-10-jdk7/Makefile
new file mode 100644
index 0000000..35c6719
--- /dev/null
+++ b/environments/solaris-10-jdk7/Makefile
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clean:
+ rm -f jdk-7u80-solaris-i586.tar.Z jdk-7u80-solaris-x64.tar.Z apache-maven-3.3.9-bin.tar.gz
+
+jdk-7u80-solaris-i586.tar.Z:
+ wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-solaris-i586.tar.Z
+
+jdk-7u80-solaris-x64.tar.Z:
+ wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-solaris-x64.tar.Z
+
+apache-maven-3.3.9-bin.tar.gz:
+ wget --no-check-certificate https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+
+build: jdk-7u80-solaris-i586.tar.Z jdk-7u80-solaris-x64.tar.Z apache-maven-3.3.9-bin.tar.gz
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10-jdk7/Vagrantfile
----------------------------------------------------------------------
diff --git a/environments/solaris-10-jdk7/Vagrantfile b/environments/solaris-10-jdk7/Vagrantfile
new file mode 100644
index 0000000..893bd53
--- /dev/null
+++ b/environments/solaris-10-jdk7/Vagrantfile
@@ -0,0 +1,54 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+Vagrant.configure("2") do |config|
+ config.vm.box = "tnarik/solaris10-minimal"
+
+ config.vm.provider "virtualbox" do |v|
+ v.memory = 2048
+ v.cpus = 2
+ end
+
+ config.vm.provision "file", source:"jdk-7u80-solaris-i586.tar.Z", destination:"jdk-7u80-solaris-i586.tar.Z"
+ config.vm.provision "file", source:"jdk-7u80-solaris-x64.tar.Z", destination:"jdk-7u80-solaris-x64.tar.Z"
+ config.vm.provision "file", source:"apache-maven-3.3.9-bin.tar.gz", destination:"apache-maven-3.3.9-bin.tar.gz"
+ config.vm.provision "file", source:"apache-maven-3.3.9.patch", destination:"apache-maven-3.3.9.patch"
+ config.vm.provision "file", source:"admin", destination:"admin"
+ config.vm.provision "shell", inline: <<-SHELL
+ sudo pkgadd -d http://get.opencsw.org/now -a/export/home/vagrant/admin CSWpkgutil &&\
+ sudo /opt/csw/bin/pkgutil -U &&\
+ sudo /opt/csw/bin/pkgutil -y -i git &&\
+ zcat jdk-7u80-solaris-i586.tar.Z | tar xf - > /dev/null 2>&1 &&\
+ sudo pkgadd -n -a/export/home/vagrant/admin -d . SUNWj7rt SUNWj7dev SUNWj7cfg SUNWj7man > /dev/null 2>&1 &&\
+ zcat jdk-7u80-solaris-x64.tar.Z | tar xf - > /dev/null 2>&1 &&\
+ sudo pkgadd -n -a/export/home/vagrant/admin -d . SUNWj7rtx SUNWj7dvx > /dev/null 2>&1 &&\
+ rm -rf jdk-7u80-solaris-i586.tar.Z jdk-7u80-solaris-x64.tar.Z SUNWj7rt SUNWj7jmp SUNWj7dev SUNWj7cfg SUNWj7man SUNWj7rtx SUNWj7dvx SUNWj7dmx COPYRIGHT LICENSE README.html THIRDPARTYLICENSEREADME.txt admin > /dev/null 2>&1 &&\
+ gunzip -c apache-maven-3.3.9-bin.tar.gz | sudo sh -c "cd /opt; tar xf - " 2>&1 &&\
+ sudo patch -i apache-maven-3.3.9.patch /opt/apache-maven-3.3.9/bin/mvn &&\
+ sudo ln -s /opt/apache-maven-3.3.9/bin/mvn /usr/bin/mvn &&\
+ rm -rf apache-maven-3.3.9-bin.tar.gz apache-maven-3.3.9.patch &&\
+ sudo sh -c "echo JAVA_HOME= >> /etc/profile" &&\
+ sudo sh -c "echo export JAVA_HOME >> /etc/profile" &&\
+ sudo sh -c "echo MAVEN_HOME=/opt/apache-maven-3.3.9 >> /etc/profile" &&\
+ sudo sh -c "echo export MAVEN_HOME >> /etc/profile" &&\
+ sudo sh -c "echo PATH=${MAVEN_HOME}/bin:${PATH} >> /etc/profile" &&\
+ sudo sh -c "echo export PATH >> /etc/profile"
+ SHELL
+end
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10-jdk7/admin
----------------------------------------------------------------------
diff --git a/environments/solaris-10-jdk7/admin b/environments/solaris-10-jdk7/admin
new file mode 100644
index 0000000..07b56b2
--- /dev/null
+++ b/environments/solaris-10-jdk7/admin
@@ -0,0 +1,10 @@
+mail=overwrite
+partial=nocheck
+runlevel=nocheck
+idepend=nocheck
+rdepend=nocheck
+space=nocheck
+setuid=nocheck
+conflict=nocheck
+action=nocheck
+basedir=default
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10-jdk7/apache-maven-3.3.9.patch
----------------------------------------------------------------------
diff --git a/environments/solaris-10-jdk7/apache-maven-3.3.9.patch b/environments/solaris-10-jdk7/apache-maven-3.3.9.patch
new file mode 100644
index 0000000..e6d436c
--- /dev/null
+++ b/environments/solaris-10-jdk7/apache-maven-3.3.9.patch
@@ -0,0 +1,22 @@
+200,203c200,201
+< local basedir
+< local wdir
+< basedir="$(pwd)"
+< wdir="$(pwd)"
+---
+> basedir=`pwd`
+> wdir=`pwd`
+209c207
+< wdir="$(cd "$wdir/.."; pwd)"
+---
+> wdir=`cd "$wdir/.."; pwd`
+217c215
+< echo "$(tr -s '\n' ' ' < "$1")"
+---
+> echo "`tr -s '\n' ' ' < "$1"`"
+221,222c219,220
+< MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-$(find_maven_basedir)}"
+< MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+---
+> MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}"
+> MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10/.gitignore
----------------------------------------------------------------------
diff --git a/environments/solaris-10/.gitignore b/environments/solaris-10/.gitignore
deleted file mode 100644
index 3b82691..0000000
--- a/environments/solaris-10/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.Z
-*.gz
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10/Makefile
----------------------------------------------------------------------
diff --git a/environments/solaris-10/Makefile b/environments/solaris-10/Makefile
deleted file mode 100644
index 35c6719..0000000
--- a/environments/solaris-10/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clean:
- rm -f jdk-7u80-solaris-i586.tar.Z jdk-7u80-solaris-x64.tar.Z apache-maven-3.3.9-bin.tar.gz
-
-jdk-7u80-solaris-i586.tar.Z:
- wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-solaris-i586.tar.Z
-
-jdk-7u80-solaris-x64.tar.Z:
- wget --no-check-certificate --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jdk-7u80-solaris-x64.tar.Z
-
-apache-maven-3.3.9-bin.tar.gz:
- wget --no-check-certificate https://archive.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
-
-build: jdk-7u80-solaris-i586.tar.Z jdk-7u80-solaris-x64.tar.Z apache-maven-3.3.9-bin.tar.gz
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10/Vagrantfile
----------------------------------------------------------------------
diff --git a/environments/solaris-10/Vagrantfile b/environments/solaris-10/Vagrantfile
deleted file mode 100644
index 893bd53..0000000
--- a/environments/solaris-10/Vagrantfile
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-Vagrant.configure("2") do |config|
- config.vm.box = "tnarik/solaris10-minimal"
-
- config.vm.provider "virtualbox" do |v|
- v.memory = 2048
- v.cpus = 2
- end
-
- config.vm.provision "file", source:"jdk-7u80-solaris-i586.tar.Z", destination:"jdk-7u80-solaris-i586.tar.Z"
- config.vm.provision "file", source:"jdk-7u80-solaris-x64.tar.Z", destination:"jdk-7u80-solaris-x64.tar.Z"
- config.vm.provision "file", source:"apache-maven-3.3.9-bin.tar.gz", destination:"apache-maven-3.3.9-bin.tar.gz"
- config.vm.provision "file", source:"apache-maven-3.3.9.patch", destination:"apache-maven-3.3.9.patch"
- config.vm.provision "file", source:"admin", destination:"admin"
- config.vm.provision "shell", inline: <<-SHELL
- sudo pkgadd -d http://get.opencsw.org/now -a/export/home/vagrant/admin CSWpkgutil &&\
- sudo /opt/csw/bin/pkgutil -U &&\
- sudo /opt/csw/bin/pkgutil -y -i git &&\
- zcat jdk-7u80-solaris-i586.tar.Z | tar xf - > /dev/null 2>&1 &&\
- sudo pkgadd -n -a/export/home/vagrant/admin -d . SUNWj7rt SUNWj7dev SUNWj7cfg SUNWj7man > /dev/null 2>&1 &&\
- zcat jdk-7u80-solaris-x64.tar.Z | tar xf - > /dev/null 2>&1 &&\
- sudo pkgadd -n -a/export/home/vagrant/admin -d . SUNWj7rtx SUNWj7dvx > /dev/null 2>&1 &&\
- rm -rf jdk-7u80-solaris-i586.tar.Z jdk-7u80-solaris-x64.tar.Z SUNWj7rt SUNWj7jmp SUNWj7dev SUNWj7cfg SUNWj7man SUNWj7rtx SUNWj7dvx SUNWj7dmx COPYRIGHT LICENSE README.html THIRDPARTYLICENSEREADME.txt admin > /dev/null 2>&1 &&\
- gunzip -c apache-maven-3.3.9-bin.tar.gz | sudo sh -c "cd /opt; tar xf - " 2>&1 &&\
- sudo patch -i apache-maven-3.3.9.patch /opt/apache-maven-3.3.9/bin/mvn &&\
- sudo ln -s /opt/apache-maven-3.3.9/bin/mvn /usr/bin/mvn &&\
- rm -rf apache-maven-3.3.9-bin.tar.gz apache-maven-3.3.9.patch &&\
- sudo sh -c "echo JAVA_HOME= >> /etc/profile" &&\
- sudo sh -c "echo export JAVA_HOME >> /etc/profile" &&\
- sudo sh -c "echo MAVEN_HOME=/opt/apache-maven-3.3.9 >> /etc/profile" &&\
- sudo sh -c "echo export MAVEN_HOME >> /etc/profile" &&\
- sudo sh -c "echo PATH=${MAVEN_HOME}/bin:${PATH} >> /etc/profile" &&\
- sudo sh -c "echo export PATH >> /etc/profile"
- SHELL
-end
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10/admin
----------------------------------------------------------------------
diff --git a/environments/solaris-10/admin b/environments/solaris-10/admin
deleted file mode 100644
index 07b56b2..0000000
--- a/environments/solaris-10/admin
+++ /dev/null
@@ -1,10 +0,0 @@
-mail=overwrite
-partial=nocheck
-runlevel=nocheck
-idepend=nocheck
-rdepend=nocheck
-space=nocheck
-setuid=nocheck
-conflict=nocheck
-action=nocheck
-basedir=default
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/244bbca0/environments/solaris-10/apache-maven-3.3.9.patch
----------------------------------------------------------------------
diff --git a/environments/solaris-10/apache-maven-3.3.9.patch b/environments/solaris-10/apache-maven-3.3.9.patch
deleted file mode 100644
index e6d436c..0000000
--- a/environments/solaris-10/apache-maven-3.3.9.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-200,203c200,201
-< local basedir
-< local wdir
-< basedir="$(pwd)"
-< wdir="$(pwd)"
----
-> basedir=`pwd`
-> wdir=`pwd`
-209c207
-< wdir="$(cd "$wdir/.."; pwd)"
----
-> wdir=`cd "$wdir/.."; pwd`
-217c215
-< echo "$(tr -s '\n' ' ' < "$1")"
----
-> echo "`tr -s '\n' ' ' < "$1"`"
-221,222c219,220
-< MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-$(find_maven_basedir)}"
-< MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
----
-> MAVEN_PROJECTBASEDIR="${MAVEN_BASEDIR:-`find_maven_basedir`}"
-> MAVEN_OPTS="`concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config"` $MAVEN_OPTS"