Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3518 Upgrade karaf version to 4.3.3

This commit is contained in:
Domenico Francesco Bruscino 2021-10-06 10:56:06 +02:00 committed by Bruscino Domenico Francesco
parent 7109d0d45f
commit 452d3dfc15
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artemis-features/pom.xml
View File

@ -91,6 +91,7 @@
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>mvn:org.apache.karaf.features/specs/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor> <descriptor>mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features</descriptor>
<descriptor>file:${project.build.directory}/classes/features.xml</descriptor> <descriptor>file:${project.build.directory}/classes/features.xml</descriptor>

2
pom.xml
View File

@ -82,7 +82,7 @@
<logging.config>logging.properties</logging.config> <logging.config>logging.properties</logging.config>
<activemq-artemis-native-version>1.0.2</activemq-artemis-native-version> <activemq-artemis-native-version>1.0.2</activemq-artemis-native-version>
<karaf.version>4.3.1</karaf.version> <karaf.version>4.3.3</karaf.version>
<pax.exam.version>4.13.4</pax.exam.version> <pax.exam.version>4.13.4</pax.exam.version>
<commons.config.version>2.7</commons.config.version> <commons.config.version>2.7</commons.config.version>
<commons.lang.version>3.12.0</commons.lang.version> <commons.lang.version>3.12.0</commons.lang.version>

7
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java
View File

@ -95,8 +95,8 @@ public class ArtemisFeatureTest extends Assert {
public static final long ASSERTION_TIMEOUT = 30000L; public static final long ASSERTION_TIMEOUT = 30000L;
public static final long COMMAND_TIMEOUT = 30000L; public static final long COMMAND_TIMEOUT = 30000L;
public static final String USER = "karaf"; public static final String USER = "artemis";
public static final String PASSWORD = "karaf"; public static final String PASSWORD = "artemis";
@ProbeBuilder @ProbeBuilder
public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) { public TestProbeBuilder probeConfiguration(TestProbeBuilder probe) {
@ -117,6 +117,8 @@ public class ArtemisFeatureTest extends Assert {
Option[] options = new Option[]{karafDistributionConfiguration().frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()).unpackDirectory(new File("target/paxexam/unpack/")), Option[] options = new Option[]{karafDistributionConfiguration().frameworkUrl(maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("tar.gz").versionAsInProject()).unpackDirectory(new File("target/paxexam/unpack/")),
KarafDistributionOption.keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.INFO), editConfigurationFilePut("etc/config.properties", "karaf.startlevel.bundle", "50"), KarafDistributionOption.keepRuntimeFolder(), logLevel(LogLevelOption.LogLevel.INFO), editConfigurationFilePut("etc/config.properties", "karaf.startlevel.bundle", "50"),
// add artemis user
editConfigurationFilePut("etc/users.properties", USER, PASSWORD + ",manager"),
// [KARAF-6600] Use https URL for Maven Central // [KARAF-6600] Use https URL for Maven Central
editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", "https://repo1.maven.org/maven2@id=central, https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases"), editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg", "org.ops4j.pax.url.mvn.repositories", "https://repo1.maven.org/maven2@id=central, https://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases"),
// uncomment this to debug it. // uncomment this to debug it.
@ -202,7 +204,6 @@ public class ArtemisFeatureTest extends Assert {
final PrintStream printStream = new PrintStream(byteArrayOutputStream); final PrintStream printStream = new PrintStream(byteArrayOutputStream);
final Session commandSession = sessionFactory.create(System.in, printStream, printStream); final Session commandSession = sessionFactory.create(System.in, printStream, printStream);
commandSession.put("APPLICATION", System.getProperty("karaf.name", "root")); commandSession.put("APPLICATION", System.getProperty("karaf.name", "root"));
commandSession.put("USER", USER);
FutureTask<String> commandFuture = new FutureTask<>(new Callable<String>() { FutureTask<String> commandFuture = new FutureTask<>(new Callable<String>() {
@Override @Override
public String call() { public String call() {