Skip to content
Permalink
Browse files
Merge remote-tracking branch 'apache-git/master'
  • Loading branch information
ahgittin committed Sep 15, 2021
2 parents 09a51f4 + 8d71f00 commit 7fdccd260164293e0ebfe51a4d428aca1c717e2d
Showing 9 changed files with 18 additions and 8 deletions.
@@ -26,7 +26,6 @@ FROM maven:3.5.4-jdk-8
RUN apt-get update && apt-get install -y \
git-core \
procps \
golang-go \
rpm \
dpkg \
libpng-dev \
@@ -45,6 +44,16 @@ RUN apt-get update && apt-get install -y \
tar \
zip

RUN cd /tmp \
&& curl -O https://dl.google.com/go/go1.15.8.linux-amd64.tar.gz \
&& CKSUM=$(sha256sum go1.15.8.linux-amd64.tar.gz | awk '{print $1}') \
&& [ ${CKSUM} = "d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b" ] \
&& tar xf go1.15.8.linux-amd64.tar.gz \
&& rm go1.15.8.linux-amd64.tar.gz \
&& chown -R root:root ./go \
&& mv go /usr/local

ENV PATH="${PATH}:/usr/local/go/bin"
# Make sure the /.config && /.npm (for UI module builds) is writable for all users
RUN mkdir -p /.config && chmod -R 777 /.config
RUN mkdir -p /.npm && chmod -R 777 /.npm
@@ -63,7 +63,7 @@ node(label: 'ubuntu') {
if (env.CHANGE_ID == null) {
stage('Deploy artifacts') {
environmentDockerImage.inside('-i --name brooklyn-${DOCKER_TAG} -v ${WORKSPACE}/.m2:/var/maven/.m2 --mount type=bind,source="${HOME}/.m2/settings.xml",target=/var/maven/.m2/settings.xml,readonly -v ${WORKSPACE}:/usr/build -w /usr/build') {
sh 'mvn deploy -Prpm -Pdeb -Pclient -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
sh 'mvn deploy -Prpm -Pdeb -DskipTests -Duser.home=/var/maven -Duser.name=jenkins'
}
}
}
Submodule brooklyn-client updated 87 files
+1 −0 .gitignore
+15 −2 Dockerfile
+0 −48 cli/Gopkg.lock
+0 −32 cli/Gopkg.toml
+13 −47 cli/README.md
+0 −138 cli/README.md.bak
+27 −27 cli/app/app.go
+0 −185 cli/app/app.go.bak
+8 −0 cli/build.xml
+1 −1 cli/command/command.go
+1 −1 cli/command_metadata/command_metadata.go
+1 −1 cli/command_runner/runner.go
+1 −1 cli/commands/access.go
+1 −1 cli/commands/activity-stream.go
+2 −2 cli/commands/activity.go
+1 −1 cli/commands/add-catalog.go
+1 −1 cli/commands/add-children.go
+1 −1 cli/commands/add-policy.go
+1 −1 cli/commands/application.go
+4 −4 cli/commands/catalog-add.go
+15 −15 cli/commands/catalog-delete.go
+5 −5 cli/commands/catalog-list.go
+2 −2 cli/commands/catalog-show.go
+5 −4 cli/commands/catalog-show_test.go
+12 −11 cli/commands/catalog.go
+1 −1 cli/commands/config.go
+1 −1 cli/commands/delete.go
+1 −1 cli/commands/deploy.go
+1 −1 cli/commands/destroy-policy.go
+1 −1 cli/commands/effector.go
+2 −2 cli/commands/entity.go
+5 −5 cli/commands/invoke.go
+5 −5 cli/commands/list.go
+1 −1 cli/commands/locations.go
+3 −3 cli/commands/login.go
+1 −1 cli/commands/logout.go
+1 −1 cli/commands/policy.go
+1 −1 cli/commands/rename.go
+1 −1 cli/commands/sensor.go
+2 −2 cli/commands/server.go
+1 −1 cli/commands/set.go
+1 −1 cli/commands/spec.go
+1 −1 cli/commands/start-policy.go
+1 −1 cli/commands/stop-policy.go
+1 −1 cli/commands/tree.go
+1 −1 cli/commands/version.go
+27 −0 cli/go.mod
+31 −0 cli/go.sum
+5 −5 cli/models/catalog.go
+14 −3 cli/pom.xml
+0 −112 cli/pom.xml.bak
+19 −26 cli/release/build.sh
+0 −24 cli/vendor/github.com/matryer/is/.gitignore
+0 −19 cli/vendor/github.com/matryer/is/.travis.yml
+0 −21 cli/vendor/github.com/matryer/is/LICENSE
+0 −38 cli/vendor/github.com/matryer/is/README.md
+0 −401 cli/vendor/github.com/matryer/is/is.go
+0 −19 cli/vendor/github.com/urfave/cli/.travis.yml
+0 −21 cli/vendor/github.com/urfave/cli/LICENSE
+0 −352 cli/vendor/github.com/urfave/cli/README.md
+0 −349 cli/vendor/github.com/urfave/cli/app.go
+0 −16 cli/vendor/github.com/urfave/cli/appveyor.yml
+0 −40 cli/vendor/github.com/urfave/cli/cli.go
+0 −250 cli/vendor/github.com/urfave/cli/command.go
+0 −388 cli/vendor/github.com/urfave/cli/context.go
+0 −546 cli/vendor/github.com/urfave/cli/flag.go
+0 −248 cli/vendor/github.com/urfave/cli/help.go
+0 −3 cli/vendor/golang.org/x/crypto/AUTHORS
+0 −3 cli/vendor/golang.org/x/crypto/CONTRIBUTORS
+0 −27 cli/vendor/golang.org/x/crypto/LICENSE
+0 −22 cli/vendor/golang.org/x/crypto/PATENTS
+0 −892 cli/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
+0 −128 cli/vendor/golang.org/x/crypto/ssh/terminal/util.go
+0 −12 cli/vendor/golang.org/x/crypto/ssh/terminal/util_bsd.go
+0 −11 cli/vendor/golang.org/x/crypto/ssh/terminal/util_linux.go
+0 −174 cli/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
+0 −202 cli/vendor/k8s.io/client-go/LICENSE
+0 −94 cli/vendor/k8s.io/client-go/third_party/forked/golang/template/exec.go
+0 −599 cli/vendor/k8s.io/client-go/third_party/forked/golang/template/funcs.go
+0 −20 cli/vendor/k8s.io/client-go/util/jsonpath/doc.go
+0 −525 cli/vendor/k8s.io/client-go/util/jsonpath/jsonpath.go
+0 −256 cli/vendor/k8s.io/client-go/util/jsonpath/node.go
+0 −526 cli/vendor/k8s.io/client-go/util/jsonpath/parser.go
+0 −704 java/pom.xml.bak
+23 −3 java/src/test/java/org/apache/brooklyn/rest/client/BrooklynApiRestClientTest.java
+1 −1 pom.xml
+0 −91 pom.xml.bak
Submodule brooklyn-dist updated 30 files
+1 −1 archetypes/quickstart/pom.xml
+1 −1 archetypes/quickstart/src/brooklyn-sample/pom.xml
+1 −1 dist/licensing/generate-all.sh
+4 −3 dist/licensing/generate-license-and-notice.sh
+1 −1 downstream-parent/pom.xml
+19 −68 karaf/apache-brooklyn/pom.xml
+0 −62 karaf/apache-brooklyn/src/main/resources/etc/org.apache.karaf.features.xml
+0 −136 karaf/apache-brooklyn/src/main/resources/etc/system.properties
+68 −43 karaf/features/pom.xml
+38 −3 karaf/features/src/main/feature/feature.xml
+0 −0 karaf/features/src/main/filtered-resources/resources/etc/branding.properties
+241 −0 karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml
+0 −0 karaf/features/src/main/resources/resources/LICENSE
+0 −0 karaf/features/src/main/resources/resources/NOTICE
+0 −0 karaf/features/src/main/resources/resources/bin/generate-password.sh
+0 −0 karaf/features/src/main/resources/resources/bin/runbrooklyn
+3 −3 karaf/features/src/main/resources/resources/bin/setenv
+0 −0 karaf/features/src/main/resources/resources/bin/setenv.bat
+32 −0 karaf/features/src/main/resources/resources/etc/brooklyn.cfg
+193 −0 karaf/features/src/main/resources/resources/etc/custom.properties
+11 −7 karaf/features/src/main/resources/resources/etc/custom.system.properties
+0 −0 karaf/features/src/main/resources/resources/etc/default.catalog.bom
+0 −0 karaf/features/src/main/resources/resources/etc/org.apache.karaf.shell.cfg
+7 −0 karaf/features/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+0 −0 karaf/features/src/main/resources/resources/etc/org.ops4j.pax.url.mvn.repositories.cfg
+0 −0 karaf/features/src/main/resources/resources/etc/org.ops4j.pax.web.cfg
+1 −1 karaf/itest/pom.xml
+1 −1 karaf/pom.xml
+1 −1 pom.xml
+1 −1 release/change-version.sh
Submodule brooklyn-docs updated 442 files
Submodule brooklyn-server updated 481 files
Submodule brooklyn-ui updated 166 files
@@ -107,6 +107,7 @@
</profiles>

<build>
<defaultGoal>clean install</defaultGoal>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->

0 comments on commit 7fdccd2

Please sign in to comment.