Repository: incubator-juneau Updated Branches: refs/heads/master 7f7ceba10 -> 6b8b2f2b8
Prep work for first release. Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6b8b2f2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6b8b2f2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6b8b2f2b Branch: refs/heads/master Commit: 6b8b2f2b811161d8724fe86d03730c4cf29adbac Parents: 7f7ceba Author: jamesbognar <jamesbog...@gmail.com> Authored: Tue Sep 20 21:44:43 2016 -0400 Committer: jamesbognar <jamesbog...@gmail.com> Committed: Tue Sep 20 21:44:43 2016 -0400 ---------------------------------------------------------------------- .gitignore | 2 +- juneau-all/.gitignore | 1 + juneau-all/.project | 31 ++++ .../.settings/org.eclipse.core.resources.prefs | 14 ++ juneau-all/.settings/org.eclipse.m2e.core.prefs | 16 ++ juneau-all/pom.xml | 87 +++++++++++ juneau-all/src/assembly/all.xml | 34 +++++ juneau-client/pom.xml | 27 ++++ juneau-core/.gitignore | 1 + juneau-core/pom.xml | 16 +- juneau-distrib/pom.xml | 86 ++++++----- juneau-distrib/src/assembly/all.xml | 34 ----- juneau-distrib/src/assembly/bin.xml | 46 ++++++ juneau-microservice/pom.xml | 23 +++ juneau-samples/pom.xml | 59 ++++++-- juneau-server-test/pom.xml | 32 +--- juneau-server/pom.xml | 30 +++- pom.xml | 145 ++++++++++--------- 18 files changed, 506 insertions(+), 178 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 137e5d1..9c412fd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /.DS_Store .idea *.iml -target \ No newline at end of file +target http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-all/.gitignore ---------------------------------------------------------------------- diff --git a/juneau-all/.gitignore b/juneau-all/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/juneau-all/.gitignore @@ -0,0 +1 @@ +/target/ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-all/.project ---------------------------------------------------------------------- diff --git a/juneau-all/.project b/juneau-all/.project new file mode 100644 index 0000000..50430fa --- /dev/null +++ b/juneau-all/.project @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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. * + *************************************************************************************************************************** +--> +<projectDescription> + <name>juneau-all</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-all/.settings/org.eclipse.core.resources.prefs ---------------------------------------------------------------------- diff --git a/juneau-all/.settings/org.eclipse.core.resources.prefs b/juneau-all/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..cd61090 --- /dev/null +++ b/juneau-all/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,14 @@ +# *************************************************************************************************************************** +# * 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. * +# *************************************************************************************************************************** +eclipse.preferences.version=1 +encoding/<project>=UTF-8 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-all/.settings/org.eclipse.m2e.core.prefs ---------------------------------------------------------------------- diff --git a/juneau-all/.settings/org.eclipse.m2e.core.prefs b/juneau-all/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..ca3cef3 --- /dev/null +++ b/juneau-all/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,16 @@ +# *************************************************************************************************************************** +# * 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. * +# *************************************************************************************************************************** +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-all/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-all/pom.xml b/juneau-all/pom.xml new file mode 100644 index 0000000..7bb3ce3 --- /dev/null +++ b/juneau-all/pom.xml @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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/xsd/maven-4.0.0.xsd";> + + <modelVersion>4.0.0</modelVersion> + <artifactId>juneau-all</artifactId> + <name>Apache Juneau UberJar</name> + <description>Combined contents of Core/Server/Client/Microservice jars</description> + <packaging>jar</packaging> + + <parent> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau</artifactId> + <version>6.0.0-incubating-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <dependencies> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-server</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-microservice</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <build> + <plugins> + + <!-- + Creates our juneau-all jar file that's a combo of our 4 modules. + --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.4.3</version> + <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> + <artifactSet> + <includes> + <include>org.apache.juneau:juneau-core</include> + <include>org.apache.juneau:juneau-server</include> + <include>org.apache.juneau:juneau-client</include> + <include>org.apache.juneau:juneau-microservice</include> + </includes> + </artifactSet> + </configuration> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-all/src/assembly/all.xml ---------------------------------------------------------------------- diff --git a/juneau-all/src/assembly/all.xml b/juneau-all/src/assembly/all.xml new file mode 100644 index 0000000..4b884e4 --- /dev/null +++ b/juneau-all/src/assembly/all.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>all</id> + <formats> + <format>dir</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <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/6b8b2f2b/juneau-client/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-client/pom.xml b/juneau-client/pom.xml index 2572974..afba1c0 100644 --- a/juneau-client/pom.xml +++ b/juneau-client/pom.xml @@ -15,10 +15,12 @@ --> <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> <artifactId>juneau-client</artifactId> <name>Apache Juneau Client</name> <description>REST client API.</description> + <packaging>bundle</packaging> <parent> <groupId>org.apache.juneau</groupId> @@ -38,4 +40,29 @@ <artifactId>httpclient</artifactId> </dependency> </dependencies> + + <properties> + <!-- Skip javadoc generation since we generate them in the aggregate pom --> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <includes> + <include>**/*Test.class</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-core/.gitignore ---------------------------------------------------------------------- diff --git a/juneau-core/.gitignore b/juneau-core/.gitignore index b83d222..e3d2422 100644 --- a/juneau-core/.gitignore +++ b/juneau-core/.gitignore @@ -1 +1,2 @@ /target/ +/.DS_Store http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-core/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-core/pom.xml b/juneau-core/pom.xml index b4faa77..8deb027 100644 --- a/juneau-core/pom.xml +++ b/juneau-core/pom.xml @@ -15,10 +15,12 @@ --> <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> <artifactId>juneau-core</artifactId> <name>Apache Juneau Core</name> <description>Base toolkit for serializers, parsers, and bean contexts.</description> + <packaging>bundle</packaging> <parent> <groupId>org.apache.juneau</groupId> @@ -31,15 +33,27 @@ <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - </dependencies> + </dependencies> + + <properties> + <!-- Skip javadoc generation since we generate them in the aggregate pom --> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <build> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-distrib/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-distrib/pom.xml b/juneau-distrib/pom.xml index fabdacd..af83f29 100644 --- a/juneau-distrib/pom.xml +++ b/juneau-distrib/pom.xml @@ -19,7 +19,7 @@ <artifactId>juneau-distrib</artifactId> <packaging>pom</packaging> <name>Apache Juneau Distribution</name> - <description>Location to find fully build Juneau distributions.</description> + <description>Location to find fully built Juneau distributions.</description> <parent> <groupId>org.apache.juneau</groupId> @@ -28,60 +28,76 @@ <relativePath>../pom.xml</relativePath> </parent> - <dependencies> - <dependency> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.juneau</groupId> - <artifactId>juneau-microservice</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <build> <plugins> <plugin> - <artifactId>maven-assembly-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> - <id>juneau-distro-assembly</id> + <id>copy</id> <phase>package</phase> <goals> - <goal>single</goal> + <goal>copy</goal> </goals> <configuration> - <descriptors> - <descriptor>src/assembly/all.xml</descriptor> - </descriptors> + <artifactItems> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-all</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-core</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-server</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-client</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-microservice</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-samples</artifactId> + <version>${project.version}</version> + </artifactItem> + <artifactItem> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-samples</artifactId> + <version>${project.version}</version> + <classifier>samples</classifier> + <type>cfg</type> + <destFileName>samples.cfg</destFileName> + </artifactItem> + </artifactItems> </configuration> </execution> </executions> </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> + <artifactId>maven-assembly-plugin</artifactId> <executions> <execution> - <id>copy-resources</id> + <id>juneau-assembly</id> <phase>package</phase> <goals> - <goal>copy-resources</goal> + <goal>single</goal> </goals> <configuration> - <outputDirectory>${basedir}/target/</outputDirectory> - <resources> - <resource> - <directory>${basedir}/../target</directory> - <includes> - <include> - juneau-all-${juneau.version}-javadoc.jar - </include> - </includes> - <filtering>true</filtering> - </resource> - </resources> + <descriptors> + <descriptor>src/assembly/bin.xml</descriptor> + </descriptors> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-distrib/src/assembly/all.xml ---------------------------------------------------------------------- diff --git a/juneau-distrib/src/assembly/all.xml b/juneau-distrib/src/assembly/all.xml deleted file mode 100644 index 4b884e4..0000000 --- a/juneau-distrib/src/assembly/all.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - *************************************************************************************************************************** - * 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.3"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> - <id>all</id> - <formats> - <format>dir</format> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <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/6b8b2f2b/juneau-distrib/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/juneau-distrib/src/assembly/bin.xml b/juneau-distrib/src/assembly/bin.xml new file mode 100644 index 0000000..452a2e4 --- /dev/null +++ b/juneau-distrib/src/assembly/bin.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *************************************************************************************************************************** + * 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.3"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd";> + <id>all</id> + <formats> + <format>dir</format> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <includes> + <include>*core*</include> + <include>*client*</include> + <include>*server*</include> + <include>*microservice*</include> + </includes> + <directory>target/dependency</directory> + <outputDirectory>/osgi</outputDirectory> + </fileSet> + <fileSet> + <includes> + <include>*all*</include> + <include>*samples*</include> + </includes> + <directory>target/dependency</directory> + <outputDirectory>/</outputDirectory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-microservice/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-microservice/pom.xml b/juneau-microservice/pom.xml index f2c0427..9dcf851 100644 --- a/juneau-microservice/pom.xml +++ b/juneau-microservice/pom.xml @@ -15,6 +15,7 @@ --> <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> <artifactId>juneau-microservice</artifactId> <name>Apache Juneau Microservice</name> @@ -27,6 +28,11 @@ <relativePath>../pom.xml</relativePath> </parent> + <properties> + <!-- Skip javadoc generation since we generate them in the aggregate pom --> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + <dependencies> <dependency> <groupId>org.apache.juneau</groupId> @@ -47,4 +53,21 @@ <artifactId>commons-fileupload</artifactId> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.apache.juneau.microservice.RestMicroservice</mainClass> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-samples/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-samples/pom.xml b/juneau-samples/pom.xml index 8d94240..7bfec51 100644 --- a/juneau-samples/pom.xml +++ b/juneau-samples/pom.xml @@ -15,7 +15,11 @@ --> <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> + <artifactId>juneau-samples</artifactId> + <name>Apache Juneau Samples</name> + <description>Sample code packaged as a microservice.</description> <parent> <groupId>org.apache.juneau</groupId> @@ -23,12 +27,12 @@ <version>6.0.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>juneau-samples</artifactId> - <name>Apache Juneau Samples</name> - <description>Sample code packaged as a microservice.</description> + <properties> <encoding>UTF-8</encoding> + <maven.javadoc.skip>true</maven.javadoc.skip> </properties> + <dependencies> <dependency> <groupId>org.apache.juneau</groupId> @@ -52,16 +56,14 @@ <artifactId>junit</artifactId> </dependency> </dependencies> + <build> <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> + + <!-- + This runs the _TestSuite class. + You must run within the testsuite so the REST microservice is started for the tests. + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -74,15 +76,21 @@ </includes> </configuration> </plugin> + + <!-- + This packages the samples into an executable jar. + Use: java -jar juneau-samples-uber.jar + Needs the samples.cfg copied below in the same directory. + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> <version>2.4.3</version> <configuration> + <createDependencyReducedPom>false</createDependencyReducedPom> <minimizeJar>false</minimizeJar> <transformers> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <manifestEntries> <Main-Class>org.apache.juneau.microservice.RestMicroservice</Main-Class> <Rest-Resources>org.apache.juneau.server.samples.RootResources</Rest-Resources> @@ -90,7 +98,6 @@ </manifestEntries> </transformer> </transformers> - <finalName>${project.artifactId}-${project.version}-uber</finalName> </configuration> <executions> <execution> @@ -101,6 +108,30 @@ </execution> </executions> </plugin> + + <!-- Attaches the samples.cfg to this artifact --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>samples.cfg</file> + <type>cfg</type> + <classifier>samples</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-server-test/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-server-test/pom.xml b/juneau-server-test/pom.xml index 1413f43..09aa57d 100644 --- a/juneau-server-test/pom.xml +++ b/juneau-server-test/pom.xml @@ -15,19 +15,24 @@ --> <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> <artifactId>juneau-server-test</artifactId> <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.javadoc.skip>true</maven.javadoc.skip> </properties> + <dependencies> <dependency> <groupId>org.apache.juneau</groupId> @@ -50,14 +55,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.19.1</version> @@ -69,25 +66,6 @@ </includes> </configuration> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> - <executions> - <execution> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <workingDirectory>${basedir}/../org.apache.juneau.samples</workingDirectory> - <executable>java</executable> - <arguments> - <argument>org.apache.juneau.microservice.RestMicroservice</argument> - </arguments> - </configuration> - </plugin> </plugins> </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/juneau-server/pom.xml ---------------------------------------------------------------------- diff --git a/juneau-server/pom.xml b/juneau-server/pom.xml index 3f94ac7..ccbe5c3 100644 --- a/juneau-server/pom.xml +++ b/juneau-server/pom.xml @@ -15,10 +15,12 @@ --> <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> <artifactId>juneau-server</artifactId> <name>Apache Juneau Server</name> <description>REST servlet API</description> + <packaging>bundle</packaging> <parent> <groupId>org.apache.juneau</groupId> @@ -26,7 +28,7 @@ <version>6.0.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - + <dependencies> <dependency> <groupId>org.apache.juneau</groupId> @@ -36,10 +38,36 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>jsr311-api</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> </dependency> </dependencies> + + <properties> + <!-- Skip javadoc generation since we generate them in the aggregate pom --> + <maven.javadoc.skip>true</maven.javadoc.skip> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.19.1</version> + <configuration> + <includes> + <include>**/*Test.class</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b8b2f2b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3fabcc6..5561d2f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ --> <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</artifactId> @@ -22,16 +23,19 @@ <packaging>pom</packaging> <name>Apache Juneau (incubating)</name> <description>All the Apache Juneau content in one convenient package.</description> + <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>18</version> </parent> + <properties> <juneau.version>6.0.0-incubating-SNAPSHOT</juneau.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <encoding>UTF-8</encoding> </properties> + <dependencyManagement> <dependencies> <dependency> @@ -91,29 +95,64 @@ <module>juneau-microservice</module> <module>juneau-samples</module> <module>juneau-server-test</module> + <module>juneau-all</module> <module>juneau-distrib</module> </modules> + <distributionManagement> + <site> + <id>${project.artifactId}-site</id> + <url>file://${project.baseUri}</url> + </site> + </distributionManagement> + <build> + <plugins> + <!-- + Runs Apache Rat against all source code to make sure all files have licenses. + --> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>**/*.log</exclude> + <exclude>**/*.log.*</exclude> + <exclude>**/target/**</exclude> + </excludes> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- Generates the source code xref pages. --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>attach-sources</id> + <phase>source</phase> + <goals> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + <pluginManagement> <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.6</version> - <configuration> - <descriptors> - <descriptor>src/assembly/all.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.3</version> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> + + <!-- Generates the javadocs for all non-test projects. --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> @@ -147,61 +186,27 @@ </execution> <execution> <id>aggregate</id> - <phase>package</phase> + <phase>site</phase> <goals> - <goal>aggregate-jar</goal> + <goal>aggregate</goal> </goals> </execution> </executions> </plugin> + + <!-- Forces all modules to compile at Java 6. --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <version>3.0.0</version> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/rat.txt</exclude> - <exclude>**/*.log</exclude> - <exclude>**/*.log.*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.2.201409121644</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - </executions> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> </plugin> + </plugins> </pluginManagement> </build> + <reporting> <plugins> <plugin> @@ -226,10 +231,20 @@ <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <version>0.7.2.201409121644</version> + <configuration> + <fileSets> + <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet"> + <directory>${project.parent.build.directory}</directory> + <includes> + <include>*.exec</include> + </includes> + </fileSet> + </fileSets> + </configuration> </plugin> - </plugins> + </plugins> </reporting> - + <url>http://juneau.incubator.apache.org</url> <organization> <name>Apache</name> @@ -249,5 +264,5 @@ <unsubscribe>list-unsubscr...@juneau.apache.org</unsubscribe> <archive>https://lists.apache.org/list.html?d...@juneau.apache.org</archive> </mailingList> - </mailingLists> + </mailingLists> </project> \ No newline at end of file
