From ff46186ae158eca124e46ec3f0150474a2b9411e Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Sat, 18 Jan 2020 15:15:27 +0100 Subject: [PATCH 1/4] added repo URL (Artifactory) --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 17b0b6d..42c6636 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,12 @@ 1.8 + http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release + http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot + + + + From ea468ab29bf25e5555936cc7f8293d5d9dc17556 Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Sat, 18 Jan 2020 15:39:38 +0100 Subject: [PATCH 2/4] added repo URL (Artifactory) --- pom.xml | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 42c6636..03871dd 100644 --- a/pom.xml +++ b/pom.xml @@ -95,12 +95,36 @@ - sven-ruppert - Dev Repo with SNAPSHOTS - default - http://repo.sven-ruppert.de/repository/maven-public/ + + false + + central + libs-release + ${deploy-repo-url} + + + + snapshots + libs-snapshot + ${deploy-repo-snapshots-url} + + + + false + + central + libs-release + ${deploy-repo-url} + + + + snapshots + libs-snapshot + ${deploy-repo-snapshots-url} + + From c30cdd3daec0e8e5db7cd0642b54801f1e80336e Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Mon, 10 Feb 2020 21:06:08 +0100 Subject: [PATCH 3/4] prepare for TC build versions --- 01_impl/pom.xml | 2 +- 02_test/pom.xml | 2 +- 03_demo/pom.xml | 2 +- pom.xml | 39 +++++++++++++++++++-------------------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/01_impl/pom.xml b/01_impl/pom.xml index 54ea76e..f9db0b9 100644 --- a/01_impl/pom.xml +++ b/01_impl/pom.xml @@ -22,7 +22,7 @@ component-project-template-for-flow-parent org.rapidpm.vaadin - 00.00.01-RPM-SNAPSHOT + 00.00.02-alpha 4.0.0 diff --git a/02_test/pom.xml b/02_test/pom.xml index d6772d7..606fb3c 100644 --- a/02_test/pom.xml +++ b/02_test/pom.xml @@ -22,7 +22,7 @@ component-project-template-for-flow-parent org.rapidpm.vaadin - 00.00.01-RPM-SNAPSHOT + 00.00.02-alpha 4.0.0 diff --git a/03_demo/pom.xml b/03_demo/pom.xml index e58942a..89b5f72 100644 --- a/03_demo/pom.xml +++ b/03_demo/pom.xml @@ -22,7 +22,7 @@ component-project-template-for-flow-parent org.rapidpm.vaadin - 00.00.01-RPM-SNAPSHOT + 00.00.02-alpha 4.0.0 diff --git a/pom.xml b/pom.xml index 03871dd..c816316 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ 4.0.0 - org.rapidpm + org.rapidpm.vaadin rapidpm-vaadin-dependencies-v14 - 04.06.01-RPM-SNAPSHOT + 05.00.00-alpha-b2 org.rapidpm.vaadin component-project-template-for-flow-parent - 00.00.01-RPM-SNAPSHOT + 00.00.02-alpha pom @@ -87,10 +87,6 @@ 1.8 http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot - - - - @@ -100,13 +96,17 @@ central libs-release - ${deploy-repo-url} + + http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release - + + true + always + snapshots libs-snapshot - ${deploy-repo-snapshots-url} + http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot @@ -116,13 +116,17 @@ central libs-release - ${deploy-repo-url} + http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-release + - + + true + always + snapshots libs-snapshot - ${deploy-repo-snapshots-url} + http://jfrog-repo.sven-ruppert.de:8081/artifactory/libs-snapshot @@ -131,17 +135,12 @@ org.rapidpm.vaadin component-project-template-for-flow - 00.00.01-RPM-SNAPSHOT + ${project.version} org.rapidpm.vaadin nano-vaadin-undertow - 01.00.05-RPM-SNAPSHOT - - - com.github.appreciated - vaadin-css-grid - 2.0.0.beta3 + 01.01.00-alpha-b3 From ca4ae55b705e006f73030e2efe4ddd60b844b54e Mon Sep 17 00:00:00 2001 From: Sven Ruppert Date: Mon, 10 Feb 2020 21:21:18 +0100 Subject: [PATCH 4/4] prepare for TC build versions --- version-number-rules.xml | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 version-number-rules.xml diff --git a/version-number-rules.xml b/version-number-rules.xml new file mode 100644 index 0000000..6267ebd --- /dev/null +++ b/version-number-rules.xml @@ -0,0 +1,46 @@ + + + (?i).*[-_\.]CR[0-9\.]* + (?i).*[-_\.]rc[0-9\.]* + (?i).*[-_\.]beta[0-9\.-]* + (?i).*[-_\.]alpha[0-9\.-]* + (?i).*[-_\.]Alpha + (?i).*[-_\.]nightly[0-9\.]* + (?i).*[-_\.]jboss[0-9\.]* + (?i).*-atlassian-[0-9\.]* + (?i).*-jenkins-[0-9\.]* + .*[-\.]redhat-[0-9]+ + \d{4,}.* + + + + + 1.3.1.Alpha + + + + + .*-xwiki + .*-alpha* + + + + + 9c6abc2 + + + + + .*-tc + + + + + .*-r\d+ + .*-Draft\d+ + + + + \ No newline at end of file