[brooklyn-library] branch master updated: Add Apache ActiveMQ Artemis catalog item
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git The following commit(s) were added to refs/heads/master by this push: new 3927fb7 Add Apache ActiveMQ Artemis catalog item new c7b9aa6 Merge pull request #134 from bostko/add-artemis 3927fb7 is described below commit 3927fb716345b1e906e0ffbc3aeb9b796e4af8ce Author: Valentin Aitken AuthorDate: Mon Oct 9 16:09:11 2017 +0300 Add Apache ActiveMQ Artemis catalog item Catalog item is visible in Apache Brooklyn karaf build BROOKLYN-541 --- software/messaging/src/main/resources/catalog.bom | 51 +++ 1 file changed, 51 insertions(+) diff --git a/software/messaging/src/main/resources/catalog.bom b/software/messaging/src/main/resources/catalog.bom index 9ac06fb..d63335b 100644 --- a/software/messaging/src/main/resources/catalog.bom +++ b/software/messaging/src/main/resources/catalog.bom @@ -25,6 +25,57 @@ brooklyn.catalog: type: org.apache.brooklyn.entity.messaging.activemq.ActiveMQBroker name: ActiveMQ Broker description: ActiveMQ is an open source message broker which fully implements the Java Message Service 1.1 (JMS) +- id: org.apache.brooklyn.entity.messaging.activemq-artemis + iconUrl: https://activemq.apache.org/artemis/images/activemq-logo.png + version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION + item: +type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess +name: ActiveMQ Artemis +itemType: entity +description: Apache ActiveMQ Artemis has a proven non blocking architecture. It delivers outstanding performance. JMS 2.0 and 1.1 support. +brooklyn.parameters: +- name: rest.api.port + type: integer + default: 8161 +brooklyn.config: + version: '2.3.0' # sets install.version + installFile: $brooklyn:formatString("apache-artemis-%1$s-bin.tar.gz", config("install.version")) + brokerName: broker1 + installSourceDirectory: $brooklyn:formatString("apache-artemis-%1$s", config("install.version")) + downloadUrl: $brooklyn:formatString("http://apache.cbox.biz/activemq/activemq-artemis/%1$s/apache-artemis-%1$s-bin.tar.gz",config("install.version"), config("installFile")) # sets download.url + install.command: +$brooklyn:formatString("tar zxf %2$s", config("download.url"), config("installFile")) + customize.command: +$brooklyn:formatString: + - "%1$s/%2$s/bin/artemis create %3$s --user '%4$s' --password '%5$s' --require-login --name '%3$s' --addresses '%6$s' --http-port %7$s" + - $brooklyn:attributeWhenReady("expandedinstall.dir") + - $brooklyn:config("installSourceDirectory") + - $brooklyn:config("brokerName") + - $brooklyn:attributeWhenReady("user") + - $brooklyn:attributeWhenReady("password") + - $brooklyn:attributeWhenReady("host.name") + - $brooklyn:config("rest.api.port") + launch.command: +$brooklyn:formatString("%1$s/bin/artemis-service start", config("brokerName")) + checkRunning.command: +ps aux | grep '' | grep org.apache.activemq.artemis.boot.Artemis > /dev/null + stop.command: +$brooklyn:formatString("%1$s/bin/artemis-service stop", config("brokerName")) +brooklyn.initializers: +- type: org.apache.brooklyn.core.sensor.password.CreatePasswordSensor + brooklyn.config: +name: password +password.length: 12 +- type: org.apache.brooklyn.core.sensor.StaticSensor + brooklyn.config: +name: user +static.value: br0kerusEr +- type: org.apache.brooklyn.core.sensor.StaticSensor + brooklyn.config: +name: main.uri +static.value: + $brooklyn:formatString("http://%s:%s";, attributeWhenReady("host.name"), config("rest.api.port")) + - id: org.apache.brooklyn.entity.messaging.qpid.QpidBroker iconUrl: classpath:///qpid-logo.jpeg item:
[brooklyn-server] branch master updated: Add Flaky retry analyser to more tests which will retry tests 3 tests if necessary
This is an automated email from the ASF dual-hosted git repository. tbouron pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git The following commit(s) were added to refs/heads/master by this push: new f3991df Add Flaky retry analyser to more tests which will retry tests 3 tests if necessary new 4c88c63 Merge pull request #1058 from tbouron/fix/flaky-tests-retry f3991df is described below commit f3991dfc2c34a3b6a30729b99edeb7385a5367b5 Author: Thomas Bouron AuthorDate: Wed Mar 20 09:17:56 2019 + Add Flaky retry analyser to more tests which will retry tests 3 tests if necessary --- .../brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java | 3 ++- .../org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java | 3 ++- .../entity/software/base/SoftwareProcessStopsDuringStartTest.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java index b200491..09267fc 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/test/policy/failover/ElectPrimaryTest.java @@ -47,6 +47,7 @@ import org.apache.brooklyn.policy.failover.ElectPrimaryConfig.PrimaryDefaultSens import org.apache.brooklyn.policy.failover.ElectPrimaryConfig.SelectionMode; import org.apache.brooklyn.policy.failover.ElectPrimaryEffector; import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.test.support.FlakyRetryAnalyser; import org.apache.brooklyn.test.support.LoggingVerboseReporter; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.core.config.ConfigBag; @@ -278,7 +279,7 @@ public class ElectPrimaryTest extends AbstractYamlRebindTest { // TODO tests for timeout configurability -@Test +@Test(retryAnalyzer = FlakyRetryAnalyser.class) public void testSelectionModeStrictReelectWithPreference() throws Exception { runSelectionModeTest(SelectionMode.STRICT, false); } diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java index 6362a14..57a7316 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.sensor.Feed; import org.apache.brooklyn.core.entity.EntityAsserts; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; +import org.apache.brooklyn.test.support.FlakyRetryAnalyser; import org.apache.brooklyn.util.core.http.BetterMockWebServer; import org.apache.brooklyn.util.core.task.BasicExecutionManager; import org.apache.brooklyn.util.repeat.Repeater; @@ -83,7 +84,7 @@ public class RebindFeedWithHaTest extends RebindTestFixtureWithApp { return super.createApp(); } -@Test +@Test(retryAnalyzer = FlakyRetryAnalyser.class) public void testHttpFeedCleansUpAfterHaDisabledAndRunsAtFailover() throws Exception { TestEntity origEntity = origApp.createAndManageChild(EntitySpec.create(TestEntity.class).impl(RebindFeedTest.MyEntityWithHttpFeedImpl.class) .configure(RebindFeedTest.MyEntityWithHttpFeedImpl.BASE_URL, baseUrl)); diff --git a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java index 3c8c100..420f05f 100644 --- a/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java +++ b/software/base/src/test/java/org/apache/brooklyn/entity/software/base/SoftwareProcessStopsDuringStartTest.java @@ -51,6 +51,7 @@ import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.LogWatcher; import org.apache.brooklyn.test.LogWatcher.EventPredicates; +import org.apache.brooklyn.test.support.FlakyRetryAnalyser; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool; import org.apache.brooklyn.util.exceptions.Exceptions; @@ -140,7 +141,7 @@ public class SoftwareProcessStopsDuringStartTest extends BrooklynAppUnitTestSupp assertEquals(loc.getCalls(), ImmutableList.of("obtain", "release", "obtain", "release")); } -@Test +@Test(retryAnalyzer = FlakyRetryAnalyser.class) public void
[brooklyn-server] branch master updated: Bumps karaf version to 4.2.7 (latest)
This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git The following commit(s) were added to refs/heads/master by this push: new c4b8dbc Bumps karaf version to 4.2.7 (latest) new 02732b8 Merge pull request #1068 from nakomis/bump-karaf-version c4b8dbc is described below commit c4b8dbc60698828bd78a38315b4877ecc3829de2 Author: Martin Harris AuthorDate: Wed Nov 27 16:00:00 2019 + Bumps karaf version to 4.2.7 (latest) --- api/pom.xml | 1 + pom.xml | 8 rest/rest-resources/pom.xml | 12 utils/common/pom.xml| 1 + 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0d8db30..63bd7ec 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -44,6 +44,7 @@ org.osgi org.osgi.core +${org.osgi.core.version} provided diff --git a/pom.xml b/pom.xml index 4e87d29..396bd41 100644 --- a/pom.xml +++ b/pom.xml @@ -168,12 +168,12 @@ 1.4.27 -4.2.2 +4.2.7 ${karaf.version} -9.4.14.v20181114 +9.4.20.v20190813 3.2.2 -7.2.5 -2.3.0 +7.2.11 +2.3.2 4.1.0 diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml index b7eebc5..de08210 100644 --- a/rest/rest-resources/pom.xml +++ b/rest/rest-resources/pom.xml @@ -107,6 +107,12 @@ org.eclipse.jetty jetty-http + + +org.eclipse.jetty +jetty-io + + org.eclipse.jetty @@ -182,6 +188,12 @@ org.apache.cxf cxf-rt-transports-http-jetty test + + +org.eclipse.jetty +jetty-io + + org.apache.cxf diff --git a/utils/common/pom.xml b/utils/common/pom.xml index 302fa3a..ba4865b 100644 --- a/utils/common/pom.xml +++ b/utils/common/pom.xml @@ -114,6 +114,7 @@ org.osgi org.osgi.core +${org.osgi.core.version} org.assertj