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 f9a92cc5a28c950ce340508f4dbb1c7d977d3564 Merge: b0e9a17 deba8fc Author: Sven Ruppert <[email protected]> AuthorDate: Wed Jan 16 15:50:55 2019 +0100 version updates .gitignore | 2 + README.adoc | 2 +- docker/pom.xml | 2 +- mw_bundle_config/pom.xml | 2 +- pom.xml | 20 ++- rest-trivial-kotlin/README.adoc | 11 ++ rest-trivial-kotlin/pom.xml | 155 +++++++++++++++++++++ .../com/superbiz/jaxrs/HelloFromKotlinEndpoint.kt | 18 +++ .../superbiz/jaxrs/HelloFromKotlinEndpointTest.kt | 30 ++++ rest-trivial/README.adoc | 4 +- rest-trivial/pom.xml | 2 +- rest/pom.xml | 2 +- servlet-trivial/pom.xml | 2 +- servlet-vaadin-v08/pom.xml | 4 +- servlet-vaadin-v10/pom.xml | 2 +- 15 files changed, 243 insertions(+), 15 deletions(-) diff --cc pom.xml index d553529,e727200..dcda711 --- a/pom.xml +++ b/pom.xml @@@ -46,7 -47,7 +47,7 @@@ </modules> <properties> - <meecrowave.version>1.2.3</meecrowave.version> - <meecrowave.version>1.2.4</meecrowave.version> ++ <meecrowave.version>1.2.5</meecrowave.version> <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> @@@ -66,8 -67,8 +67,6 @@@ </properties> -- -- <!-- Just to disable any accidential deployment to maven.central --> <distributionManagement> <repository> @@@ -79,4 -80,4 +78,17 @@@ <url>file://${basedir}/target/snapshot-repo/</url> </snapshotRepository> </distributionManagement> ++ ++ ++ <build> ++ <plugins> ++ <plugin> ++ <groupId>org.codehaus.mojo</groupId> ++ <artifactId>versions-maven-plugin</artifactId> ++ <version>2.7</version> ++ </plugin> ++ </plugins> ++ </build> ++ ++ </project> diff --cc rest-trivial-kotlin/pom.xml index 0000000,f32ab1f..5fbca25 mode 000000,100644..100644 --- a/rest-trivial-kotlin/pom.xml +++ b/rest-trivial-kotlin/pom.xml @@@ -1,0 -1,154 +1,155 @@@ + <?xml version="1.0" encoding="UTF-8"?> + <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.5-SNAPSHOT</version> + </parent> + + + <artifactId>samples-rest-trivial-kotlin</artifactId> + <name>REST (trivial) - Kotlin</name> + + <properties> - <kotlin.version>1.2.71</kotlin.version> ++ <!--<kotlin.version>1.2.71</kotlin.version>--> ++ <kotlin.version>1.3.11</kotlin.version> + </properties> + + <dependencies> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-stdlib-jdk8</artifactId> + <version>${kotlin.version}</version> + </dependency> + + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-test-junit</artifactId> + <version>${kotlin.version}</version> + <scope>test</scope> + </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> + + <plugin> + <artifactId>kotlin-maven-plugin</artifactId> + <groupId>org.jetbrains.kotlin</groupId> + <version>${kotlin.version}</version> + <configuration> + <compilerPlugins> + <plugin>all-open</plugin> + </compilerPlugins> + <pluginOptions> + <option>all-open:annotation=javax.enterprise.context.ApplicationScoped</option> + </pluginOptions> + </configuration> + <executions> + <execution> + <id>compile</id> + <goals> + <goal>compile</goal> + </goals> + <configuration> + <sourceDirs> + <sourceDir>${project.basedir}/src/main/kotlin</sourceDir> + <sourceDir>${project.basedir}/src/main/java</sourceDir> + </sourceDirs> + </configuration> + </execution> + <execution> + <id>test-compile</id> + <goals> + <goal>test-compile</goal> + </goals> + <configuration> + <sourceDirs> + <sourceDir>${project.basedir}/src/test/kotlin</sourceDir> + <sourceDir>${project.basedir}/src/test/java</sourceDir> + </sourceDirs> + </configuration> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.jetbrains.kotlin</groupId> + <artifactId>kotlin-maven-allopen</artifactId> + <version>${kotlin.version}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <!-- Replacing default-compile as it is treated specially by maven --> + <execution> + <id>default-compile</id> + <phase>none</phase> + </execution> + <!-- Replacing default-testCompile as it is treated specially by maven --> + <execution> + <id>default-testCompile</id> + <phase>none</phase> + </execution> + <execution> + <id>java-compile</id> + <phase>compile</phase> + <goals> + <goal>compile</goal> + </goals> + </execution> + <execution> + <id>java-test-compile</id> + <phase>test-compile</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + </project> diff --cc servlet-vaadin-v08/pom.xml index a87cff9,564ccf1..ff22d19 --- a/servlet-vaadin-v08/pom.xml +++ b/servlet-vaadin-v08/pom.xml @@@ -31,7 -31,7 +31,7 @@@ <name>Servlet (Vaadin - V08)</name> <properties> -- <vaadin.version>8.4.5</vaadin.version> ++ <vaadin.version>8.6.3</vaadin.version> </properties> <packaging>jar</packaging>
