This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave-examples.git
commit 37d370ba5c4906e8dd0f713e82799c993fb3dc7c Author: Mark Struberg <[email protected]> AuthorDate: Tue Jul 17 22:30:58 2018 +0200 clean up poms and move definitions to the respective projects This has the benefit that a user immediately sees what is needed for a certain type of project. --- pom.xml | 83 +--------------------------------------------- rest-trivial/pom.xml | 46 ++++++++++++++++++++++++- rest/pom.xml | 43 ++++++++++++++++++++++++ servlet-trivial/pom.xml | 44 ++++++++++++++++++++++++ servlet-vaadin-v08/pom.xml | 40 ++++++++++++++++++++++ servlet-vaadin-v10/pom.xml | 17 ++++++++++ 6 files changed, 190 insertions(+), 83 deletions(-) diff --git a/pom.xml b/pom.xml index 36019b7..1d45f39 100644 --- a/pom.xml +++ b/pom.xml @@ -58,94 +58,13 @@ <pitest.version>1.4.0</pitest.version> <pitest-junit5-plugin.version>0.5</pitest-junit5-plugin.version> - <junit.version>4.12</junit.version> + <junit4.version>4.12</junit4.version> <junit.jupiter.version>5.1.1</junit.jupiter.version> <junit.platform.version>1.1.1</junit.platform.version> </properties> - <dependencies> - <dependency> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-core</artifactId> - <version>${meecrowave.version}</version> - </dependency> - <!--jUnit5--> - - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-api</artifactId> - <version>${junit.jupiter.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-params</artifactId> - <version>${junit.jupiter.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-launcher</artifactId> - <version>${junit.platform.version}</version> - <scope>test</scope> - </dependency> - <!-- Only required to run tests in an IDE that bundles an older version --> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit.jupiter.version}</version> - <scope>test</scope> - </dependency> - <!-- Only required to run tests in an IDE that bundles an older version --> - <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <version>${junit.jupiter.version}</version> - <scope>test</scope> - </dependency> - - <!--Meecrowave--> - <dependency> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-junit</artifactId> - <version>${meecrowave.version}</version> - <scope>test</scope> - </dependency> - - <!--Logger--> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.7.25</version> - <!--<scope>test</scope>--> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.25</version> - <!--<scope>test</scope>--> - </dependency> - - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-web</artifactId> - <version>2.11.0</version> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.meecrowave</groupId> - <artifactId>meecrowave-maven-plugin</artifactId> - <version>${meecrowave.version}</version> - </plugin> - </plugins> - </build> <!-- Just to disable any accidential deployment to maven.central --> <distributionManagement> diff --git a/rest-trivial/pom.xml b/rest-trivial/pom.xml index 296d21f..5a1b18a 100644 --- a/rest-trivial/pom.xml +++ b/rest-trivial/pom.xml @@ -2,14 +2,58 @@ <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://maven.apache.org/POM/4.0.0"; 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> + <parent> <groupId>org.apache.meecrowave</groupId> <artifactId>meecrowave-examples</artifactId> <version>1.2.2-SNAPSHOT</version> </parent> - <modelVersion>4.0.0</modelVersion> + <artifactId>samples-rest-trivial</artifactId> <name>REST (trivial)</name> + <dependencies> + <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${meecrowave.version}</version> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-core</artifactId> + <version>${meecrowave.version}</version> + </dependency> + + <!-- our test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit4.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-junit</artifactId> + <version>${meecrowave.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <!-- + For starting meecrowave via Maven. Just run + $> mvn clean install meecrowave:run + --> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-maven-plugin</artifactId> + <version>${meecrowave.version}</version> + </plugin> + </plugins> + </build> + </project> \ No newline at end of file diff --git a/rest/pom.xml b/rest/pom.xml index b729df3..8503ee2 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -12,5 +12,48 @@ <artifactId>samples-rest</artifactId> <name>REST</name> + <dependencies> + <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${meecrowave.version}</version> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-core</artifactId> + <version>${meecrowave.version}</version> + </dependency> + + <!-- our test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit4.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-junit</artifactId> + <version>${meecrowave.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <!-- + For starting meecrowave via Maven. Just run + $> mvn clean install meecrowave:run + --> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-maven-plugin</artifactId> + <version>${meecrowave.version}</version> + </plugin> + + </plugins> + </build> + </project> \ No newline at end of file diff --git a/servlet-trivial/pom.xml b/servlet-trivial/pom.xml index faec477..fdc91b8 100644 --- a/servlet-trivial/pom.xml +++ b/servlet-trivial/pom.xml @@ -31,4 +31,48 @@ <name>Servlet (trivial)</name> + <dependencies> + <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${meecrowave.version}</version> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-core</artifactId> + <version>${meecrowave.version}</version> + </dependency> + + <!-- our test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit4.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-junit</artifactId> + <version>${meecrowave.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <!-- + For starting meecrowave via Maven. Just run + $> mvn clean install meecrowave:run + --> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-maven-plugin</artifactId> + <version>${meecrowave.version}</version> + </plugin> + + </plugins> + </build> + + </project> \ No newline at end of file diff --git a/servlet-vaadin-v08/pom.xml b/servlet-vaadin-v08/pom.xml index cec6067..12d3364 100644 --- a/servlet-vaadin-v08/pom.xml +++ b/servlet-vaadin-v08/pom.xml @@ -59,6 +59,46 @@ <artifactId>vaadin-client-compiled</artifactId> </dependency> + <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${meecrowave.version}</version> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-core</artifactId> + <version>${meecrowave.version}</version> + </dependency> + + <!-- our test dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit4.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-junit</artifactId> + <version>${meecrowave.version}</version> + <scope>test</scope> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <!-- + For starting meecrowave via Maven. Just run + $> mvn clean install meecrowave:run + --> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-maven-plugin</artifactId> + <version>${meecrowave.version}</version> + </plugin> + + </plugins> + </build> + </project> \ No newline at end of file diff --git a/servlet-vaadin-v10/pom.xml b/servlet-vaadin-v10/pom.xml index 552b02a..5cf644b 100644 --- a/servlet-vaadin-v10/pom.xml +++ b/servlet-vaadin-v10/pom.xml @@ -72,6 +72,13 @@ </dependencyManagement> <dependencies> + <!-- this package contains the javax APIs for CDI, JAX-RS, JSONP, JSONB and Servlet4 --> + <dependency> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-specs-api</artifactId> + <version>${meecrowave.version}</version> + </dependency> + <!--Vaadin --> <dependency> <groupId>com.vaadin</groupId> @@ -83,6 +90,16 @@ <build> <plugins> <plugin> + <!-- + For starting meecrowave via Maven. Just run + $> mvn clean install meecrowave:run + --> + <groupId>org.apache.meecrowave</groupId> + <artifactId>meecrowave-maven-plugin</artifactId> + <version>${meecrowave.version}</version> + </plugin> + + <plugin> <groupId>com.vaadin</groupId> <artifactId>vaadin-maven-plugin</artifactId> <version>${vaadin.version}</version>
