You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/02/05 14:18:53 UTC
[1/5] qpid-jms git commit: dont deploy the examples
Repository: qpid-jms
Updated Branches:
refs/heads/master 1a3b19f8f -> 05e4db558
dont deploy the examples
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/49d83b02
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/49d83b02
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/49d83b02
Branch: refs/heads/master
Commit: 49d83b0259673052d7a311a9be75f209734367d0
Parents: 1a3b19f
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Feb 5 11:36:26 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Feb 5 11:36:26 2015 +0000
----------------------------------------------------------------------
qpid-jms-examples/pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/49d83b02/qpid-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index 8b19141..7aa322a 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -38,4 +38,19 @@
<artifactId>qpid-jms-client</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <!-- Skip deploying the examples, the source is what is
+ useful and will be bundled with the main assembly -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/5] qpid-jms git commit: dont try to include a jar that doesnt exist
Posted by ro...@apache.org.
dont try to include a jar that doesnt exist
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5a592b00
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5a592b00
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5a592b00
Branch: refs/heads/master
Commit: 5a592b0003b3b76bb0eed2d0dc87da75aa1274ef
Parents: d437af9
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Feb 5 12:18:07 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Feb 5 12:18:07 2015 +0000
----------------------------------------------------------------------
qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5a592b00/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml b/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
index b6873c2..23382f0 100644
--- a/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
+++ b/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
@@ -43,7 +43,7 @@
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
- <useProjectArtifact>true</useProjectArtifact>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/5] qpid-jms git commit: create an archive of the examples src we
can use to include them in the release assembly
Posted by ro...@apache.org.
create an archive of the examples src we can use to include them in the release assembly
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/d437af9b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d437af9b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d437af9b
Branch: refs/heads/master
Commit: d437af9b8da7a5f60da85d1adf539fe7aa7a57c6
Parents: 49d83b0
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Feb 5 11:58:11 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Feb 5 11:58:11 2015 +0000
----------------------------------------------------------------------
qpid-jms-examples/pom.xml | 18 ++++++++
.../src/main/assembly/qpid-jms-examples-src.xml | 48 ++++++++++++++++++++
2 files changed, 66 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d437af9b/qpid-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index 7aa322a..b5c61a4 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -50,6 +50,24 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/qpid-jms-examples-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/d437af9b/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml b/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml
new file mode 100644
index 0000000..eabed50
--- /dev/null
+++ b/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0'?>
+<!--
+
+ 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.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>qpid-jms-examples-${project.version}</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src</directory>
+ <outputDirectory>src</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>README.txt</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
+</assembly>
+
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/5] qpid-jms git commit: remove defunct config
Posted by ro...@apache.org.
remove defunct config
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/05e4db55
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/05e4db55
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/05e4db55
Branch: refs/heads/master
Commit: 05e4db5587f0d8a57756739e934e8f4d3edfcbda
Parents: 77bfaa2
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Feb 5 13:06:09 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Feb 5 13:06:09 2015 +0000
----------------------------------------------------------------------
qpid-jms-examples/pom.xml | 20 --------
.../src/main/assembly/qpid-jms-examples-src.xml | 48 --------------------
2 files changed, 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/05e4db55/qpid-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index d517567..7aa322a 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -50,26 +50,6 @@
<skip>true</skip>
</configuration>
</plugin>
-<!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/qpid-jms-examples-src.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
--->
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/05e4db55/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml b/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml
deleted file mode 100644
index eabed50..0000000
--- a/qpid-jms-examples/src/main/assembly/qpid-jms-examples-src.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version='1.0'?>
-<!--
-
- 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.
-
--->
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <baseDirectory>qpid-jms-examples-${project.version}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>src</directory>
- <outputDirectory>src</outputDirectory>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>README.txt</include>
- </includes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
-</assembly>
-
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/5] qpid-jms git commit: use a moduleSet to include the examples in
the main assembly
Posted by ro...@apache.org.
use a moduleSet to include the examples in the main assembly
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/77bfaa22
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/77bfaa22
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/77bfaa22
Branch: refs/heads/master
Commit: 77bfaa2291b1fbc97fcf998d7412be644ecaefec
Parents: 5a592b0
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Feb 5 12:55:56 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Feb 5 12:55:56 2015 +0000
----------------------------------------------------------------------
.../qpid-jms/src/main/assembly/qpid-jms-bin.xml | 28 ++++++++++++++++++++
qpid-jms-examples/pom.xml | 2 ++
2 files changed, 30 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/77bfaa22/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml b/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
index 23382f0..046ac3d 100644
--- a/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
+++ b/qpid-jms-assemblies/qpid-jms/src/main/assembly/qpid-jms-bin.xml
@@ -46,5 +46,33 @@
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.apache.qpid:qpid-jms-examples</include>
+ </includes>
+ <sources>
+ <includeModuleDirectory>false</includeModuleDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src</directory>
+ <outputDirectory>examples/src</outputDirectory>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <outputDirectory>examples/</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>README.txt</include>
+ </includes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
+ </moduleSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/77bfaa22/qpid-jms-examples/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-jms-examples/pom.xml b/qpid-jms-examples/pom.xml
index b5c61a4..d517567 100644
--- a/qpid-jms-examples/pom.xml
+++ b/qpid-jms-examples/pom.xml
@@ -50,6 +50,7 @@
<skip>true</skip>
</configuration>
</plugin>
+<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -68,6 +69,7 @@
</execution>
</executions>
</plugin>
+-->
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org