Repository: incubator-juneau Updated Branches: refs/heads/master 3c3abb55d -> 3baf69464
JUNEAU-11 Fixed some parent coordinates. Updated assembly. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/3baf6946 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/3baf6946 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/3baf6946 Branch: refs/heads/master Commit: 3baf69464eddae89d503e290fe206cbf7398ae67 Parents: 3c3abb5 Author: John D. Ament <[email protected]> Authored: Mon Aug 8 21:11:31 2016 -0400 Committer: John D. Ament <[email protected]> Committed: Mon Aug 8 21:11:31 2016 -0400 ---------------------------------------------------------------------- org.apache.juneau.distrib/src/assembly/all.xml | 25 +++++++------------- org.apache.juneau.microservice.template/pom.xml | 10 +++++--- org.apache.juneau.server.test/pom.xml | 9 +++++-- 3 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3baf6946/org.apache.juneau.distrib/src/assembly/all.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.distrib/src/assembly/all.xml b/org.apache.juneau.distrib/src/assembly/all.xml index 50e23d0..ee99166 100644 --- a/org.apache.juneau.distrib/src/assembly/all.xml +++ b/org.apache.juneau.distrib/src/assembly/all.xml @@ -22,21 +22,12 @@ <format>zip</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - <moduleSets> - <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - <includes> - <include>org.apache.juneau:juneau-core</include> - <include>org.apache.juneau:juneau-client</include> - <include>org.apache.juneau:juneau-server</include> - <include>org.apache.juneau:juneau-microservice</include> - </includes> - <binaries> - <outputDirectory>/</outputDirectory> - <unpack>false</unpack> - </binaries> - <sources> - </sources> - </moduleSet> - </moduleSets> + <dependencySets> + <dependencySet> + <includes> + <include>*</include> + </includes> + <outputDirectory>/</outputDirectory> + </dependencySet> + </dependencySets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3baf6946/org.apache.juneau.microservice.template/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.microservice.template/pom.xml b/org.apache.juneau.microservice.template/pom.xml index a90dbc2..fc747c6 100644 --- a/org.apache.juneau.microservice.template/pom.xml +++ b/org.apache.juneau.microservice.template/pom.xml @@ -15,9 +15,13 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.juneau</groupId> + <parent> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <artifactId>juneau-microservice-template</artifactId> - <version>6.0.0-SNAPSHOT</version> <name>Apache Juneau Microservice Template</name> <description>A template project developers use to start with to create a microservice.</description> <properties> @@ -27,7 +31,7 @@ <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-microservice</artifactId> - <version>6.0.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/3baf6946/org.apache.juneau.server.test/pom.xml ---------------------------------------------------------------------- diff --git a/org.apache.juneau.server.test/pom.xml b/org.apache.juneau.server.test/pom.xml index f6dbb60..2ae1261 100644 --- a/org.apache.juneau.server.test/pom.xml +++ b/org.apache.juneau.server.test/pom.xml @@ -15,13 +15,18 @@ <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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.juneau</groupId> <artifactId>juneau-server-test</artifactId> - <version>6.0.0-SNAPSHOT</version> <name>Apache Juneau Server Test</name> <description>Tests for Juneau Client and Server.</description> + <parent> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> <properties> <encoding>UTF-8</encoding> + <maven.test.skip>true</maven.test.skip> </properties> <dependencies> <dependency>
