You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/05/01 17:58:38 UTC
[1/3] activemq-artemis git commit: This closes #2055
Repository: activemq-artemis
Updated Branches:
refs/heads/master d5be6111e -> 9e2eb8e25
This closes #2055
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9e2eb8e2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9e2eb8e2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9e2eb8e2
Branch: refs/heads/master
Commit: 9e2eb8e257fd5116a40c5e6d38f72f71c3083a69
Parents: d5be611 67ee34d
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue May 1 13:58:29 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 1 13:58:29 2018 -0400
----------------------------------------------------------------------
.../cli/commands/bin/artemis-service.xml | 1 -
.../artemis/cli/commands/etc/artemis.profile | 2 +-
.../cli/commands/etc/artemis.profile.cmd | 2 +-
artemis-distribution/src/main/assembly/dep.xml | 4 ++
.../src/main/resources/bin/artemis | 2 +-
.../src/main/resources/bin/artemis.cmd | 2 +-
artemis-dto/pom.xml | 48 +++++++++++---------
docs/user-manual/en/perf-tuning.md | 2 +-
examples/common/config/server.properties | 2 +-
9 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
[3/3] activemq-artemis git commit: ARTEMIS-1449 Add the classes JRE
11 will remove as explicit dependencies
Posted by cl...@apache.org.
ARTEMIS-1449 Add the classes JRE 11 will remove as explicit dependencies
Since the classes in question are marked for removal, using the
``--add-modules java.xml.bind` JVM option would be only a temporary
solution. Pulling them as dependencies from repo1.maven.org and
distributing them with Artemis should be more permanent one.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/94c34b7e
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/94c34b7e
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/94c34b7e
Branch: refs/heads/master
Commit: 94c34b7ed9345a4be4948a52ff3a177b270cd0e6
Parents: d5be611
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue May 1 08:15:51 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 1 13:58:29 2018 -0400
----------------------------------------------------------------------
artemis-distribution/src/main/assembly/dep.xml | 4 ++
artemis-dto/pom.xml | 48 +++++++++++----------
2 files changed, 30 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94c34b7e/artemis-distribution/src/main/assembly/dep.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index aad4ab1..0987425 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -99,6 +99,10 @@
<include>org.apache.geronimo.specs:geronimo-json_1.0_spec</include>
<include>org.apache.johnzon:johnzon-core</include>
<include>org.hdrhistogram:HdrHistogram</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>com.sun.xml.bind:jaxb-impl</include>
+ <include>com.sun.xml.bind:jaxb-core</include>
+ <include>javax.activation:activation</include>
</includes>
<!--excludes>
<exclude>org.apache.activemq:artemis-website</exclude>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/94c34b7e/artemis-dto/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-dto/pom.xml b/artemis-dto/pom.xml
index 1ed1b7e..bf4a608 100644
--- a/artemis-dto/pom.xml
+++ b/artemis-dto/pom.xml
@@ -28,6 +28,9 @@
<name>ActiveMQ Artemis DTO</name>
<properties>
+ <version.activation>1.1.1</version.activation>
+ <version.jaxb>2.2.7</version.jaxb>
+
<activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties>
@@ -37,6 +40,26 @@
<artifactId>artemis-commons</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${version.jaxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${version.jaxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-jxc</artifactId>
+ <version>${version.jaxb}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${version.activation}</version>
+ </dependency>
</dependencies>
<build>
@@ -90,17 +113,17 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.7</version>
+ <version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.2.7</version>
+ <version>${version.jaxb}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-jxc</artifactId>
- <version>2.2.7</version>
+ <version>${version.jaxb}</version>
</dependency>
</dependencies>
</plugin>
@@ -138,25 +161,6 @@
<profiles>
<profile>
- <id>jdk-1.5</id>
- <activation>
- <jdk>1.5</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb-api-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb-version}</version>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>ibmjdk</id>
<activation>
<file>
[2/3] activemq-artemis git commit: ARTEMIS-1449 Remove deprecated
-XX:+UseFastAccessorMethods JVM option
Posted by cl...@apache.org.
ARTEMIS-1449 Remove deprecated -XX:+UseFastAccessorMethods JVM option
This option was removed in JRE 10 and its presence causes error on startup.
Artemis still does not compile on JDK 9 and up, so what I tried was
to compile on JDK 1.8 and then start Artemis on 1.8 and 10.
That now works for me.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/67ee34d4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/67ee34d4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/67ee34d4
Branch: refs/heads/master
Commit: 67ee34d4d94efd9e139ed99376faccb2529e007d
Parents: 94c34b7
Author: Jiri Danek <jd...@redhat.com>
Authored: Tue May 1 08:27:20 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue May 1 13:58:29 2018 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/cli/commands/bin/artemis-service.xml | 1 -
.../org/apache/activemq/artemis/cli/commands/etc/artemis.profile | 2 +-
.../apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd | 2 +-
artemis-distribution/src/main/resources/bin/artemis | 2 +-
artemis-distribution/src/main/resources/bin/artemis.cmd | 2 +-
docs/user-manual/en/perf-tuning.md | 2 +-
examples/common/config/server.properties | 2 +-
7 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 395e041..9bb77e8 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -36,7 +36,6 @@
<argument>-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager}</argument>
<argument>-XX:+UseParallelGC</argument>
<argument>-XX:+AggressiveOpts</argument>
- <argument>-XX:+UseFastAccessorMethods</argument>
<argument>-Xms512M</argument>
<argument>-Xmx1024M</argument>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 7f53c99..5f83be8 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -30,7 +30,7 @@ ARTEMIS_INSTANCE_ETC_URI='${artemis.instance.etc.uri}'
# Java Opts
-JAVA_ARGS="${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx2G -Dhawtio.realm=activemq -Dhawtio.offline="true" -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=${ARTEMIS_INSTANCE_ETC_URI}jolokia-access.xml"
+JAVA_ARGS="${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -Xms512M -Xmx2G -Dhawtio.realm=activemq -Dhawtio.offline="true" -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=${ARTEMIS_INSTANCE_ETC_URI}jolokia-access.xml"
#
# There might be options that you only want to enable on specifc commands, like setting a JMX port
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index 6b95afc..5d579c3 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -32,7 +32,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be
rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
rem Java Opts
-set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config -Dhawtio.offline="true" -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%
+set JAVA_ARGS=${java-opts} -XX:+PrintClassHistogram -XX:+UseG1GC -XX:+AggressiveOpts -Xms512M -Xmx1024M -Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} -Djava.security.auth.login.config=%ARTEMIS_INSTANCE_ETC%\login.config -Dhawtio.offline="true" -Dhawtio.realm=activemq -Dhawtio.role=${role} -Dhawtio.rolePrincipalClasses=org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal -Djolokia.policyLocation=%ARTEMIS_INSTANCE_ETC_URI%\jolokia-access.xml -Dartemis.instance=%ARTEMIS_INSTANCE%
rem There might be options that you only want to enable on specifc commands, like setting a JMX port
rem See https://issues.apache.org/jira/browse/ARTEMIS-318
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/artemis-distribution/src/main/resources/bin/artemis
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index c53c6f9..a7eeade 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -45,7 +45,7 @@ if [ -z "$ARTEMIS_HOME" ] ; then
fi
# Set Defaults Properties
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -Xms512M -Xmx1024M"
CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
# OS specific support.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/artemis-distribution/src/main/resources/bin/artemis.cmd
----------------------------------------------------------------------
diff --git a/artemis-distribution/src/main/resources/bin/artemis.cmd b/artemis-distribution/src/main/resources/bin/artemis.cmd
index 9c82085..24b8c9e 100755
--- a/artemis-distribution/src/main/resources/bin/artemis.cmd
+++ b/artemis-distribution/src/main/resources/bin/artemis.cmd
@@ -45,7 +45,7 @@ echo.
:RUN_JAVA
rem "Set Defaults."
-set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M
+set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -Xms512M -Xmx1024M
rem "Create full JVM Args"
set JVM_ARGS=%JAVA_ARGS%
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/docs/user-manual/en/perf-tuning.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/perf-tuning.md b/docs/user-manual/en/perf-tuning.md
index 6177384..81f1f44 100644
--- a/docs/user-manual/en/perf-tuning.md
+++ b/docs/user-manual/en/perf-tuning.md
@@ -224,7 +224,7 @@ tunings won't apply to JDKs from other providers (e.g. IBM or JRockit)
tuning parameters, for the Sun Hotspot JVM the full list of options
is available
[here](http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html).
- We recommend at least using `-XX:+AggressiveOpts` and `-XX:+UseFastAccessorMethods`.
+ We recommend at least using `-XX:+AggressiveOpts`.
You may get some mileage with the other tuning parameters depending
on your OS platform and application usage patterns.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/67ee34d4/examples/common/config/server.properties
----------------------------------------------------------------------
diff --git a/examples/common/config/server.properties b/examples/common/config/server.properties
index cff66e2..345f389 100644
--- a/examples/common/config/server.properties
+++ b/examples/common/config/server.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory
+server.args=-XX:+UseParallelGC -Xms256M -Xmx256M -XX:+AggressiveOpts -Dcom.sun.management.jmxremote -Djava.util.logging.config.file=${imported.basedir}/config/logging.properties -Djava.naming.factory.initial=org.apache.activemq.artemis.jndi.ActiveMQInitialContextFactory