This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch branch-feature-logsearch-ga in repository https://gitbox.apache.org/repos/asf/ambari.git
commit bca5a96282376024d551e45498b8ec18647fd2a6 Author: Oliver Szabo <[email protected]> AuthorDate: Sun Sep 23 21:56:12 2018 +0200 add simple modules + create profiles --- .../src/main/java/module-info.java | 23 +++++++ .../src/main/java/module-info.java | 24 ++++++++ .../src/main/java/module-info.java | 24 ++++++++ .../src/main/java/module-info.java | 25 ++++++++ .../src/main/java/module-info.java | 25 ++++++++ .../src/main/java/module-info.java | 32 ++++++++++ .../src/main/java/module-info.java | 26 ++++++++ .../src/main/java/module-info.java | 24 ++++++++ .../src/main/java/module-info.java | 33 ++++++++++ .../ambari-logsearch-logfeeder/pom.xml | 12 ++-- ambari-logsearch/ambari-logsearch-server/pom.xml | 5 -- ambari-logsearch/pom.xml | 71 ++++++++++++++++------ 12 files changed, 298 insertions(+), 26 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-appender/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-appender/src/main/java/module-info.java new file mode 100644 index 0000000..5e3e21d --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-appender/src/main/java/module-info.java @@ -0,0 +1,23 @@ +/* + * 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. + */ +module ambari.logsearch.appender { + exports org.apache.ambari.logsearch.appender; + requires log4j; + requires gson; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-config-api/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/module-info.java new file mode 100644 index 0000000..a998e36 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-config-api/src/main/java/module-info.java @@ -0,0 +1,24 @@ +/* + * 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. + */ +module ambari.logsearch.config.api { + exports org.apache.ambari.logsearch.config.api; + exports org.apache.ambari.logsearch.config.api.model.inputconfig; + exports org.apache.ambari.logsearch.config.api.model.loglevelfilter; + requires org.apache.logging.log4j; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-config-json/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-config-json/src/main/java/module-info.java new file mode 100644 index 0000000..caa3c44 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-config-json/src/main/java/module-info.java @@ -0,0 +1,24 @@ +/* + * 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. + */ +module ambari.logsearch.config.json { + exports org.apache.ambari.logsearch.config.json.model.inputconfig.impl; + exports org.apache.ambari.logsearch.config.json; + requires ambari.logsearch.config.api; + requires gson; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-config-local/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-config-local/src/main/java/module-info.java new file mode 100644 index 0000000..0c9d7ba --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-config-local/src/main/java/module-info.java @@ -0,0 +1,25 @@ +/* + * 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. + */ +module ambari.logsearch.config.local { + exports org.apache.ambari.logsearch.config.local; + requires org.apache.logging.log4j; + requires gson; + requires ambari.logsearch.config.json; + requires ambari.logsearch.config.api; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-config-solr/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-config-solr/src/main/java/module-info.java new file mode 100644 index 0000000..0d156b6 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-config-solr/src/main/java/module-info.java @@ -0,0 +1,25 @@ +/* + * 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. + */ +module ambari.logsearch.config.solr { + exports org.apache.ambari.logsearch.config.solr; + requires ambari.logsearch.config.api; + requires org.apache.logging.log4j; + requires solr.solrj; + requires gson; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/module-info.java new file mode 100644 index 0000000..803e0fd --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-config-zookeeper/src/main/java/module-info.java @@ -0,0 +1,32 @@ +/* + * 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. + */ +module ambari.logsearch.config.zookeeper { + exports org.apache.ambari.logsearch.config.zookeeper; + requires ambari.logsearch.config.api; + requires ambari.logsearch.config.json; + requires zookeeper; + requires curator.framework; + requires curator.recipes; + requires curator.client; + requires org.apache.logging.log4j; + requires gson; + requires guava; + requires commons.collections; + requires commons.lang3; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-log4j2-appender/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-log4j2-appender/src/main/java/module-info.java new file mode 100644 index 0000000..64d4145 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-log4j2-appender/src/main/java/module-info.java @@ -0,0 +1,26 @@ +/* + * 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. + */ +module ambari.logsearch.log4j2.appender { + requires org.apache.logging.log4j; + requires org.apache.logging.log4j.core; + + requires com.fasterxml.jackson.annotation; + requires com.fasterxml.jackson.core; + requires com.fasterxml.jackson.databind; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/module-info.java new file mode 100644 index 0000000..057afff --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-logfeeder-container-registry/src/main/java/module-info.java @@ -0,0 +1,24 @@ +/* + * 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. + */ +module ambari.logsearch.logfeeder.container.registry { + exports org.apache.ambari.logfeeder.docker; + requires org.apache.logging.log4j; + requires commons.lang; + requires com.fasterxml.jackson.databind; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-logfeeder-plugin-api/src/main/java/module-info.java b/ambari-logsearch/ambari-logsearch-logfeeder-plugin-api/src/main/java/module-info.java new file mode 100644 index 0000000..c1359d7 --- /dev/null +++ b/ambari-logsearch/ambari-logsearch-logfeeder-plugin-api/src/main/java/module-info.java @@ -0,0 +1,33 @@ +/* + * 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. + */ +module ambari.logsearch.logfeeder.plugin.api { + exports org.apache.ambari.logfeeder.plugin.manager; + exports org.apache.ambari.logfeeder.plugin.common; + exports org.apache.ambari.logfeeder.plugin.filter; + exports org.apache.ambari.logfeeder.plugin.input; + exports org.apache.ambari.logfeeder.plugin.output; + exports org.apache.ambari.logfeeder.plugin.filter.mapper; + exports org.apache.ambari.logfeeder.plugin.input.cache; + + requires ambari.logsearch.config.api; + requires gson; + requires org.apache.logging.log4j; + requires jackson.mapper.asl; + requires jackson.core.asl; +} \ No newline at end of file diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml index 6dd3905..5235419 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -295,10 +295,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.0</version> - </plugin> - <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.8</version> </plugin> @@ -336,6 +332,14 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${jdk.version}</source> + <target>${jdk.version}</target> + </configuration> + </plugin> <!-- ant pacakge --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml index ea58d6f..8bffc7d 100755 --- a/ambari-logsearch/ambari-logsearch-server/pom.xml +++ b/ambari-logsearch/ambari-logsearch-server/pom.xml @@ -57,10 +57,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> - </plugin> - <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.8</version> </plugin> @@ -70,7 +66,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> <configuration> <source>${jdk.version}</source> <target>${jdk.version}</target> diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml index 2caa40b..2a9dbe9 100644 --- a/ambari-logsearch/pom.xml +++ b/ambari-logsearch/pom.xml @@ -23,22 +23,58 @@ <packaging>pom</packaging> <url>http://maven.apache.org</url> - <modules> - <module>ambari-logsearch-assembly</module> - <module>ambari-logsearch-appender</module> - <module>ambari-logsearch-log4j2-appender</module> - <module>ambari-logsearch-server</module> - <module>ambari-logsearch-web</module> - <module>ambari-logsearch-logfeeder</module> - <module>ambari-logsearch-config-api</module> - <module>ambari-logsearch-config-json</module> - <module>ambari-logsearch-config-zookeeper</module> - <module>ambari-logsearch-it</module> - <module>ambari-logsearch-logfeeder-plugin-api</module> - <module>ambari-logsearch-logfeeder-container-registry</module> - <module>ambari-logsearch-config-local</module> - <module>ambari-logsearch-config-solr</module> - </modules> + <profiles> + <profile> + <id>all</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>ambari-logsearch-web</module> + <module>ambari-logsearch-assembly</module> + <module>ambari-logsearch-appender</module> + <module>ambari-logsearch-log4j2-appender</module> + <module>ambari-logsearch-server</module> + <module>ambari-logsearch-it</module> + <module>ambari-logsearch-logfeeder</module> + <module>ambari-logsearch-config-api</module> + <module>ambari-logsearch-config-json</module> + <module>ambari-logsearch-config-zookeeper</module> + <module>ambari-logsearch-logfeeder-plugin-api</module> + <module>ambari-logsearch-logfeeder-container-registry</module> + <module>ambari-logsearch-config-local</module> + <module>ambari-logsearch-config-solr</module> + </modules> + </profile> + <profile> + <id>be</id> + <properties> + <rat.skip>true</rat.skip> + </properties> + <modules> + <module>ambari-logsearch-appender</module> + <module>ambari-logsearch-log4j2-appender</module> + <module>ambari-logsearch-server</module> + <module>ambari-logsearch-logfeeder</module> + <module>ambari-logsearch-config-api</module> + <module>ambari-logsearch-config-json</module> + <module>ambari-logsearch-config-zookeeper</module> + <module>ambari-logsearch-logfeeder-plugin-api</module> + <module>ambari-logsearch-logfeeder-container-registry</module> + <module>ambari-logsearch-config-local</module> + <module>ambari-logsearch-config-solr</module> + </modules> + </profile> + <profile> + <id>fe</id> + <properties> + <rat.skip>true</rat.skip> + </properties> + <modules> + <module>ambari-logsearch-web</module> + </modules> + </profile> + </profiles> <properties> <jdk.version>10</jdk.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -54,6 +90,7 @@ <reuseForks>false</reuseForks> <surefire.argLine>-Xmx1024m -Xms512m</surefire.argLine> <skipSurefireTests>false</skipSurefireTests> + <compiler.version>3.8.0</compiler.version> </properties> <licenses> @@ -203,7 +240,7 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>3.8.0</version> + <version>${compiler.version}</version> <configuration> <source>${jdk.version}</source> <target>${jdk.version}</target>
