Repository: incubator-juneau Updated Branches: refs/heads/master 4c171412b -> 30511aae2
Fix maven warnings. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/30511aae Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/30511aae Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/30511aae Branch: refs/heads/master Commit: 30511aae2e970657a318dc9d7ced4f60a30d7e04 Parents: 4c17141 Author: JamesBognar <[email protected]> Authored: Mon Nov 28 19:42:29 2016 -0500 Committer: JamesBognar <[email protected]> Committed: Mon Nov 28 20:04:25 2016 -0500 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 2 + juneau-distrib/src/assembly/bin.xml | 4 +- juneau-distrib/src/assembly/src.xml | 4 +- pom.xml | 114 +------------------------------ 4 files changed, 7 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30511aae/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index cd0603c..1044910 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -17,6 +17,8 @@ Release Notes - Juneau - Version 6.0.1 * [JUNEAU-17] - Resolve various small issues pointed out during release of 6.0.0 * [JUNEAU-19] - Fix various JSON parser edge cases * [JUNEAU-21] - Scrub references to IBM from code. + * [JUNEAU-22] - Localization bugs in CalendarSwap JUnits + * [JUNEAU-23] - Fix various maven build warnings. ** Improvement * [JUNEAU-18] - Add HtmlDocSerializer.DEFAULT field. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30511aae/juneau-distrib/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/juneau-distrib/src/assembly/bin.xml b/juneau-distrib/src/assembly/bin.xml index d23ef0f..8a206a9 100644 --- a/juneau-distrib/src/assembly/bin.xml +++ b/juneau-distrib/src/assembly/bin.xml @@ -28,7 +28,7 @@ <include>**</include> </includes> <directory>target/bin</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> </fileSet> <fileSet> <includes> @@ -38,7 +38,7 @@ <include>RELEASE-NOTES.txt</include> </includes> <directory>..</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> </fileSet> </fileSets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30511aae/juneau-distrib/src/assembly/src.xml ---------------------------------------------------------------------- diff --git a/juneau-distrib/src/assembly/src.xml b/juneau-distrib/src/assembly/src.xml index f4a8af3..7111a46 100644 --- a/juneau-distrib/src/assembly/src.xml +++ b/juneau-distrib/src/assembly/src.xml @@ -28,7 +28,7 @@ <include>**</include> </includes> <directory>target/src</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> </fileSet> <fileSet> <includes> @@ -37,7 +37,7 @@ <include>RELEASE-NOTES.txt</include> </includes> <directory>..</directory> - <outputDirectory>/</outputDirectory> + <outputDirectory></outputDirectory> </fileSet> </fileSets> </assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/30511aae/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d6f5691..580b2c5 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ <module>juneau-samples</module> <module>juneau-server-test</module> <module>juneau-all</module> - <!-- module>juneau-distrib</module--> + <module>juneau-distrib</module> </modules> <distributionManagement> @@ -135,118 +135,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - - <artifactItem> - <outputDirectory>${project.build.directory}/bin</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-all</artifactId> - <version>${project.version}</version> - </artifactItem> - - <artifactItem> - <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-core</artifactId> - <version>${project.version}</version> - <type>jar</type> - <classifier>sources</classifier> - </artifactItem> - <artifactItem> - <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-core</artifactId> - <version>${project.version}</version> - </artifactItem> - - <artifactItem> - <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-server</artifactId> - <version>${project.version}</version> - <type>jar</type> - <classifier>sources</classifier> - </artifactItem> - <artifactItem> - <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-server</artifactId> - <version>${project.version}</version> - </artifactItem> - - <artifactItem> - <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-client</artifactId> - <version>${project.version}</version> - <type>jar</type> - <classifier>sources</classifier> - </artifactItem> - <artifactItem> - <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-client</artifactId> - <version>${project.version}</version> - </artifactItem> - - <artifactItem> - <outputDirectory>${project.build.directory}/src/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-microservice</artifactId> - <version>${project.version}</version> - <type>jar</type> - <classifier>sources</classifier> - </artifactItem> - <artifactItem> - <outputDirectory>${project.build.directory}/bin/osgi-bundles</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-microservice</artifactId> - <version>${project.version}</version> - </artifactItem> - - <artifactItem> - <outputDirectory>${project.build.directory}/src</outputDirectory> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-samples</artifactId> - <version>${project.version}</version> - <type>jar</type> - <classifier>sources</classifier> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>juneau-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src.xml</descriptor> - <descriptor>bin.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> </plugins> <pluginManagement>
