Skip to content

Commit

Permalink
00.08.02-RPM
Browse files Browse the repository at this point in the history
  • Loading branch information
@svenruppert
svenruppert committed Sep 10, 2019
1 parent bd8623a commit f6b86a7
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 100 deletions.
9 changes: 5 additions & 4 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
version: '3.5'

services:
deploy:
image: svenruppert/maven-3.6.1-adopt:1.8.212-04
container_name: deploy
hostname: deploy
deploy-fluent-api-for-flow:
image: svenruppert/maven-3.6.2-adopt:1.8.212-04
container_name: deploy-fluent-api-for-flow
hostname: deploy-fluent-api-for-flow
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- $PWD/:/usr/src/mymaven
Expand All @@ -30,4 +30,5 @@ services:
# command: 'mvn help:active-profiles
command: 'mvn license:format clean deploy
-P_release
-Pvaadin-install-nodejs
-Dmaven.test.skip=true '
2 changes: 1 addition & 1 deletion docker_compile_locale.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ docker run \
--name compile \
-v "$(pwd)":/usr/src/mymaven \
-w /usr/src/mymaven \
svenruppert/maven-3.6.1-adopt:1.8.212-04 \
svenruppert/maven-3.6.2-adopt:1.8.212-04 \
mvn clean install
53 changes: 3 additions & 50 deletions fluent-api-impl/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,58 +21,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>fluent-api-for-flow</artifactId>
<version>00.08.02-RPM-SNAPSHOT</version>
<artifactId>fluent-api-for-flow-parent</artifactId>
<version>00.08.02-RPM</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>fluent-api-for-flow-impl</artifactId>
<artifactId>fluent-api-for-flow</artifactId>


<properties>
<!--Properties for Vaadin Directory-->
<Vaadin-Package-Version>1</Vaadin-Package-Version>
<Vaadin-Addon>${project.build.finalName}.${project.packaging}</Vaadin-Addon>
</properties>

<build>
<plugins>
<!--For Vaadin Directory deployment-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-jar-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <archive>-->
<!-- <index>true</index>-->
<!-- <manifest>-->
<!-- <addClasspath>false</addClasspath>-->
<!-- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
<!-- </manifest>-->
<!-- <manifestEntries>-->
<!-- <Vaadin-Package-Version>${Vaadin-Package-Version}</Vaadin-Package-Version>-->
<!-- </manifestEntries>-->
<!-- </archive>-->
<!-- </configuration>-->
<!-- </plugin>-->

<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-assembly-plugin</artifactId>-->
<!-- <configuration>-->
<!-- <appendAssemblyId>false</appendAssemblyId>-->
<!-- <descriptors>-->
<!-- <descriptor>assembly/assembly.xml</descriptor>-->
<!-- </descriptors>-->
<!-- </configuration>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <goals>-->
<!-- <goal>single</goal>-->
<!-- </goals>-->
<!-- <phase>install</phase>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
</plugins>
</build>
</project>
10 changes: 5 additions & 5 deletions fluent-api-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>fluent-api-for-flow</artifactId>
<version>00.08.02-RPM-SNAPSHOT</version>
<artifactId>fluent-api-for-flow-parent</artifactId>
<version>00.08.02-RPM</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down Expand Up @@ -53,13 +53,13 @@
<dependencies>
<dependency>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>fluent-api-for-flow-impl</artifactId>
<version>00.08.02-RPM-SNAPSHOT</version>
<artifactId>fluent-api-for-flow</artifactId>
<version>00.08.02-RPM</version>
</dependency>
<dependency>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>id-generator-for-flow</artifactId>
<version>00.09.02-RPM</version>
<version>00.09.03-RPM</version>
</dependency>

<!--TDD-->
Expand Down
103 changes: 63 additions & 40 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@

<parent>
<groupId>org.rapidpm</groupId>
<artifactId>rapidpm-vaadin-dependencies-v14</artifactId>
<version>04.01.05-RPM</version>
<artifactId>rapidpm-vaadin-dependencies-vXX</artifactId>
<version>04.01.15-RPM</version>
</parent>

<groupId>org.rapidpm.vaadin</groupId>
<artifactId>fluent-api-for-flow</artifactId>
<artifactId>fluent-api-for-flow-parent</artifactId>
<name>Fluent API for Flow</name>
<version>00.08.02-RPM-SNAPSHOT</version>
<version>00.08.02-RPM</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -90,13 +90,7 @@
<dependencyManagement>
<dependencies>
<!--Vaadin -->
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-bom</artifactId>
<version>${vaadin-v14.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -129,36 +123,65 @@
<!--Vaadin -->
<dependency>
<groupId>com.vaadin</groupId>
<!-- Replace artifactId with vaadin-core to use only free components -->
<artifactId>vaadin</artifactId>
<exclusions>
<!-- Webjars are only needed when running in Vaadin 13 compatibility mode -->
<exclusion>
<groupId>com.vaadin.webjar</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.insites</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.polymer</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.polymerelements</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.vaadin</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.webjars.bowergithub.webcomponents</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<artifactId>vaadin-lumo-theme</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-ordered-layout-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-form-layout-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-radio-button-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-combo-box-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-button-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-select-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-date-picker-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-icons-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-tabs-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-context-menu-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-notification-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-grid-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-checkbox-flow</artifactId>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin-text-field-flow</artifactId>
</dependency>


</dependencies>
</project>

0 comments on commit f6b86a7

Please sign in to comment.