Skip to content

Commit

Permalink
Merge pull request #11 from Nano-Vaadin-Demos/release/01.00.01-RPM
Browse files Browse the repository at this point in the history
Release/01.00.01 rpm
  • Loading branch information
svenruppert committed Oct 7, 2019
2 parents 70f4a79 + baa5897 commit 83b64f9
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion 01_impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<version>01.00.00-RPM</version>
<version>01.00.01-RPM</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion 02_test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<version>01.00.00-RPM</version>
<version>01.00.01-RPM</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
8 changes: 4 additions & 4 deletions 03_demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
<!-- <parent>-->
<!-- <artifactId>nano-vaadin-jetty-parent</artifactId>-->
<!-- <groupId>org.rapidpm.vaadin</groupId>-->
<!-- <version>01.00.00-RPM</version>-->
<!-- <version>01.00.01-RPM</version>-->
<!-- </parent>-->

<parent>
<groupId>org.rapidpm</groupId>
<artifactId>rapidpm-vaadin-dependencies-v14</artifactId>
<version>04.02.00-RPM</version>
<version>04.03.01-RPM</version>
<relativePath></relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>

<groupId>org.rapidpm.vaadin</groupId>
<artifactId>nano-vaadin-jetty-demo</artifactId>
<version>01.00.00-RPM</version>
<version>01.00.01-RPM</version>

<!-- Just to disable any accidental deployment to maven.central -->
<distributionManagement>
Expand All @@ -54,7 +54,7 @@
<dependency>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>nano-vaadin-jetty</artifactId>
<version>01.00.00-RPM</version>
<version>01.00.01-RPM</version>
</dependency>
<!--For Core Vaadin Components-->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# limitations under the License.
#

docker rm deploy
docker rm deploy_nano_vaadin_jetty
docker-compose up
5 changes: 3 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ version: '3.5'
services:
deploy:
image: svenruppert/maven-3.6.2-adopt:1.8.212-04
container_name: deploy
hostname: deploy
container_name: deploy_nano_vaadin_jetty
hostname: deploy_nano_vaadin_jetty
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- $PWD/:/usr/src/mymaven
Expand All @@ -29,6 +29,7 @@ services:
working_dir: /usr/src/mymaven
# command: 'mvn help:active-profiles
command: 'mvn license:format clean deploy
-P_release_prepare
-P_release
-Pvaadin-install-nodejs
-Dmaven.test.skip=true '
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<parent>
<groupId>org.rapidpm</groupId>
<artifactId>rapidpm-dependencies</artifactId>
<version>04.02.00-RPM</version>
<version>04.03.01-RPM</version>
</parent>

<groupId>org.rapidpm.vaadin</groupId>
<artifactId>nano-vaadin-jetty-parent</artifactId>
<version>01.00.00-RPM</version>
<version>01.00.01-RPM</version>

<packaging>pom</packaging>

Expand Down Expand Up @@ -99,7 +99,7 @@
<dependency>
<groupId>org.rapidpm.vaadin</groupId>
<artifactId>nano-vaadin-jetty</artifactId>
<version>01.00.00-RPM</version>
<version>01.00.01-RPM</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down

0 comments on commit 83b64f9

Please sign in to comment.