You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2017/11/01 05:13:50 UTC

[1/2] activemq-artemis git commit: NO-JIRA fix new example poms

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a44b9d5ed -> ac51c9057


NO-JIRA fix new example poms


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0413b8c4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0413b8c4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0413b8c4

Branch: refs/heads/master
Commit: 0413b8c4887077c8a229a0bd27cc97a977e2c132
Parents: a44b9d5
Author: Justin Bertram <jb...@apache.org>
Authored: Tue Oct 31 23:43:23 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Wed Nov 1 00:11:46 2017 -0500

----------------------------------------------------------------------
 .../artemis-jms-bridge/pom.xml                  | 30 +++++++++--------
 .../sub-modules/inter-broker-bridge/pom.xml     | 35 +++++++++++---------
 2 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0413b8c4/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
index d357bd5..1bbccfb 100644
--- a/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
+++ b/examples/features/sub-modules/inter-broker-bridge/artemis-jms-bridge/pom.xml
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed 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
+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
+  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.
+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.
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.artemis.examples</groupId>
-      <artifactId>inter-broker-bridge-parent</artifactId>
+      <groupId>org.apache.activemq.examples.modules</groupId>
+      <artifactId>inter-broker-bridge-pom</artifactId>
       <version>2.5.0-SNAPSHOT</version>
    </parent>
 
    <artifactId>artemis-jms-bridge</artifactId>
-
    <packaging>war</packaging>
-
    <name>Artemis JMS Bridge Example</name>
 
    <properties>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0413b8c4/examples/features/sub-modules/inter-broker-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/examples/features/sub-modules/inter-broker-bridge/pom.xml b/examples/features/sub-modules/inter-broker-bridge/pom.xml
index 3e1699f..f1909a7 100644
--- a/examples/features/sub-modules/inter-broker-bridge/pom.xml
+++ b/examples/features/sub-modules/inter-broker-bridge/pom.xml
@@ -1,17 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Licensed 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.
+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.
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
@@ -21,12 +27,9 @@ limitations under the License.
       <version>2.5.0-SNAPSHOT</version>
    </parent>
 
-   <groupId>org.apache.artemis.examples</groupId>
-   <artifactId>inter-broker-bridge-parent</artifactId>
-   <version>2.5.0-SNAPSHOT</version>
-
+   <groupId>org.apache.activemq.examples.modules</groupId>
+   <artifactId>inter-broker-bridge-pom</artifactId>
    <packaging>pom</packaging>
-
    <name>ActiveMQ Artemis Inter-broker Bridging Examples</name>
 
    <properties>


[2/2] activemq-artemis git commit: This closes #1627

Posted by jb...@apache.org.
This closes #1627


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ac51c905
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ac51c905
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ac51c905

Branch: refs/heads/master
Commit: ac51c90571d6b052ac842055b3a0d1ad43c51787
Parents: a44b9d5 0413b8c
Author: Justin Bertram <jb...@apache.org>
Authored: Wed Nov 1 00:13:37 2017 -0500
Committer: Justin Bertram <jb...@apache.org>
Committed: Wed Nov 1 00:13:37 2017 -0500

----------------------------------------------------------------------
 .../artemis-jms-bridge/pom.xml                  | 30 +++++++++--------
 .../sub-modules/inter-broker-bridge/pom.xml     | 35 +++++++++++---------
 2 files changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------