You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/09/18 16:02:13 UTC
[2/2] incubator-juneau git commit: juneau-distrib should create
correctly-named OSGi modules.
juneau-distrib should create correctly-named OSGi modules.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/45e2eb34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/45e2eb34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/45e2eb34
Branch: refs/heads/master
Commit: 45e2eb344a70366fabe3e45fc1e14c3cadd8aea5
Parents: c6dd8cf
Author: JamesBognar <ja...@apache.org>
Authored: Mon Sep 18 12:02:09 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Mon Sep 18 12:02:09 2017 -0400
----------------------------------------------------------------------
juneau-releng/juneau-distrib/pom.xml | 107 ++++++++++++++++++++++++------
1 file changed, 85 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/45e2eb34/juneau-releng/juneau-distrib/pom.xml
----------------------------------------------------------------------
diff --git a/juneau-releng/juneau-distrib/pom.xml b/juneau-releng/juneau-distrib/pom.xml
index 10cadf8..b6a0261 100644
--- a/juneau-releng/juneau-distrib/pom.xml
+++ b/juneau-releng/juneau-distrib/pom.xml
@@ -44,22 +44,22 @@
<artifactItems>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin</outputDirectory>
+ <outputDirectory>${project.build.directory}/src</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-all</artifactId>
<version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-all</artifactId>
<version>${project.version}</version>
- <type>jar</type>
- <classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
@@ -67,14 +67,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-marshall</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.marshall_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall-rdf</artifactId>
<version>${project.version}</version>
@@ -82,14 +89,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-marshall-rdf</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-marshall-rdf</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.marshall.rdf_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-svl</artifactId>
<version>${project.version}</version>
@@ -97,14 +111,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-svl</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-svl</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.svl_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-config</artifactId>
<version>${project.version}</version>
@@ -112,14 +133,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-config</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-config</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.config_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-dto</artifactId>
<version>${project.version}</version>
@@ -127,14 +155,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-dto</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-dto</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.dto_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
@@ -142,14 +177,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-server</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.rest.server_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server-jaxrs</artifactId>
<version>${project.version}</version>
@@ -157,14 +199,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-server-jaxrs</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-server-jaxrs</artifactId>
<version>${project.version}</version>
+ <destFileName>org.apache.juneau.rest.server.jaxrs_${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-client</artifactId>
<version>${project.version}</version>
@@ -172,14 +221,21 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-rest-client</artifactId>
<version>${project.version}</version>
</artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-rest-client</artifactId>
+ <version>${project.version}</version>
+ <destFileName>org.apache.juneau.rest.client_${project.version}.jar</destFileName>
+ </artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/src/lib</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-microservice-server</artifactId>
<version>${project.version}</version>
@@ -187,10 +243,17 @@
<classifier>sources</classifier>
</artifactItem>
<artifactItem>
- <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory>
+ <outputDirectory>${project.build.directory}/bin/lib</outputDirectory>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-microservice-server</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ <artifactItem>
+ <outputDirectory>${project.build.directory}/bin/osgi</outputDirectory>
<groupId>org.apache.juneau</groupId>
<artifactId>juneau-microservice-server</artifactId>
<version>${project.version}</version>
+ <destFileName>org.apache.juneau.microservice-server_${project.version}.jar</destFileName>
</artifactItem>
<artifactItem>