diff --git a/.gitignore b/.gitignore
index 8ad0a1bb66..e9ac9da261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ notes.md
.vscode
velocity.log
/.metadata/
-/.recommenders/
\ No newline at end of file
+/.recommenders/
+.factorypath
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01f30c354d..7663f3fa70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,7 +29,8 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
* Feature 718: Detect port number from configuration file for health check in Thorntail
* Refactor 828: Moved Metedata specific code into DefaultMetadataEnricher
* Feature 718: Detect port number from configuration file for health check in Thorntail
-* Feature 1498: Allow users to define secrets from annotations
+* Feature 1498: Allow users to define secrets from annotations
+* Fix 1517: update vmp groupid and vert.x version
### 4.0.0-M2 (2018-12-14)
* Fix 10: Make VolumeConfiguration more flexible
diff --git a/doc/src/main/asciidoc/inc/_enricher.adoc b/doc/src/main/asciidoc/inc/_enricher.adoc
index 22117e2c86..0f0b4bd791 100644
--- a/doc/src/main/asciidoc/inc/_enricher.adoc
+++ b/doc/src/main/asciidoc/inc/_enricher.adoc
@@ -939,7 +939,7 @@ Lets say you have a maven pom.xml with the following issue management informatio
----
GitHub
- https://github.com/fabric8io/vertx-maven-plugin/issues/
+ https://github.com/reactiverse/vertx-maven-plugin/issues/
----
@@ -952,7 +952,7 @@ This information will be enriched as annotations in the generated manifest like,
metadata:
annotations:
fabric8.io/issue-system: "GitHub"
- fabric8.io/issue-tracker-url: "https://github.com/fabric8io/vertx-maven-plugin/issues/"
+ fabric8.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/"
...
----
diff --git a/doc/src/main/asciidoc/inc/generator/_vertx.adoc b/doc/src/main/asciidoc/inc/generator/_vertx.adoc
index f7953286da..98e778b2f4 100644
--- a/doc/src/main/asciidoc/inc/generator/_vertx.adoc
+++ b/doc/src/main/asciidoc/inc/generator/_vertx.adoc
@@ -5,7 +5,7 @@ The Vert.x generator detects an application using Eclipse Vert.x. It generates t
Currently, this generator is enabled if:
-* you are using the Vert.x Maven Plugin (https://github.com/fabric8io/vertx-maven-plugin)
+* you are using the Vert.x Maven Plugin (https://github.com/reactiverse/vertx-maven-plugin)
* you are depending on `io.vertx:vertx-core` and uses the Maven Shader plugin
Otherwise this generator is identical to the <>. It supports the <> and the <>.
diff --git a/enricher/fabric8/src/main/java/io/fabric8/maven/enricher/fabric8/VertxHealthCheckEnricher.java b/enricher/fabric8/src/main/java/io/fabric8/maven/enricher/fabric8/VertxHealthCheckEnricher.java
index 836bd1cecf..8832563c77 100644
--- a/enricher/fabric8/src/main/java/io/fabric8/maven/enricher/fabric8/VertxHealthCheckEnricher.java
+++ b/enricher/fabric8/src/main/java/io/fabric8/maven/enricher/fabric8/VertxHealthCheckEnricher.java
@@ -49,7 +49,7 @@
*/
public class VertxHealthCheckEnricher extends AbstractHealthCheckEnricher {
- static final String VERTX_MAVEN_PLUGIN_GROUP = "io.fabric8";
+ static final String VERTX_MAVEN_PLUGIN_GROUP = "io.reactiverse";
static final String VERTX_MAVEN_PLUGIN_ARTIFACT = "vertx-maven-plugin";
static final String VERTX_GROUPID = "io.vertx";
diff --git a/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/MavenIssueManagementEnricherTest.java b/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/MavenIssueManagementEnricherTest.java
index 9d25a3566b..6fdd981584 100644
--- a/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/MavenIssueManagementEnricherTest.java
+++ b/enricher/standard/src/test/java/io/fabric8/maven/enricher/standard/MavenIssueManagementEnricherTest.java
@@ -45,7 +45,7 @@ public void testMavenIssueManagementAll() {
final MavenProject project = new MavenProject();
final IssueManagement issueManagement = new IssueManagement();
issueManagement.setSystem("GitHub");
- issueManagement.setUrl("https://github.com/fabric8io/vertx-maven-plugin/issues/");
+ issueManagement.setUrl("https://github.com/reactiverse/vertx-maven-plugin/issues/");
project.setIssueManagement(issueManagement);
// Setup mock behaviour
new Expectations() {
@@ -63,7 +63,7 @@ public void testMavenIssueManagementAll() {
Assert.assertEquals(2, scmAnnotations.size());
assertEquals("GitHub",
scmAnnotations.get(Fabric8Annotations.ISSUE_SYSTEM.value()));
- assertEquals("https://github.com/fabric8io/vertx-maven-plugin/issues/",
+ assertEquals("https://github.com/reactiverse/vertx-maven-plugin/issues/",
scmAnnotations.get(Fabric8Annotations.ISSUE_TRACKER_URL.value()));
}
diff --git a/generator/vertx/src/main/java/io/fabric8/maven/generator/vertx/Constants.java b/generator/vertx/src/main/java/io/fabric8/maven/generator/vertx/Constants.java
index e81a37aa08..261dd5a7c5 100644
--- a/generator/vertx/src/main/java/io/fabric8/maven/generator/vertx/Constants.java
+++ b/generator/vertx/src/main/java/io/fabric8/maven/generator/vertx/Constants.java
@@ -17,7 +17,7 @@
public class Constants {
- static final String VERTX_MAVEN_PLUGIN_GROUP = "io.fabric8";
+ static final String VERTX_MAVEN_PLUGIN_GROUP = "io.reactiverse";
static final String VERTX_MAVEN_PLUGIN_ARTIFACT = "vertx-maven-plugin";
static final String SHADE_PLUGIN_GROUP = "org.apache.maven.plugins";
static final String SHADE_PLUGIN_ARTIFACT = "maven-shade-plugin";
diff --git a/it/src/it/custom-environment/pom.xml b/it/src/it/custom-environment/pom.xml
index 286facdcf1..bbd78e05a4 100644
--- a/it/src/it/custom-environment/pom.xml
+++ b/it/src/it/custom-environment/pom.xml
@@ -33,10 +33,10 @@
UTF-8
1.8
1.8
- 3.3.3
+ 3.6.3
io.vertx.example.SimpleWebVerticle
- 1.0.5
+ 1.0.18
@@ -103,7 +103,7 @@
- io.fabric8
+ io.reactiverse
vertx-maven-plugin
${vertx-maven-plugin.version}
diff --git a/it/src/it/remote-resources/pom.xml b/it/src/it/remote-resources/pom.xml
index 3990a028a7..c0c480afb5 100644
--- a/it/src/it/remote-resources/pom.xml
+++ b/it/src/it/remote-resources/pom.xml
@@ -33,10 +33,10 @@
UTF-8
1.8
1.8
- 3.3.3
+ 3.6.3
io.vertx.example.SimpleWebVerticle
- 1.0.5
+ 1.0.18
@@ -105,7 +105,7 @@
- io.fabric8
+ io.reactiverse
vertx-maven-plugin
${vertx-maven-plugin.version}
diff --git a/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml b/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml
index fc6e9c8a70..5952fd4e00 100644
--- a/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml
+++ b/it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml
@@ -27,7 +27,7 @@ items:
fabric8.io/git-branch: "@ignore@"
prometheus.io/port: "9779"
fabric8.io/issue-system: "GitHub"
- fabric8.io/issue-tracker-url: "https://github.com/fabric8io/vertx-maven-plugin/issues/"
+ fabric8.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/"
labels:
expose: "true"
provider: fabric8
diff --git a/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml b/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml
index 699fa34404..882f04dd72 100644
--- a/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml
+++ b/it/src/it/simple-maven-issue-mgmt/expected/openshift.yml
@@ -27,7 +27,7 @@ items:
fabric8.io/git-branch: "@ignore@"
prometheus.io/port: "9779"
fabric8.io/issue-system: "GitHub"
- fabric8.io/issue-tracker-url: "https://github.com/fabric8io/vertx-maven-plugin/issues/"
+ fabric8.io/issue-tracker-url: "https://github.com/reactiverse/vertx-maven-plugin/issues/"
labels:
expose: "true"
provider: fabric8
diff --git a/it/src/it/simple-maven-issue-mgmt/pom.xml b/it/src/it/simple-maven-issue-mgmt/pom.xml
index 05ceaa6863..1ef5f9b52a 100644
--- a/it/src/it/simple-maven-issue-mgmt/pom.xml
+++ b/it/src/it/simple-maven-issue-mgmt/pom.xml
@@ -33,7 +33,7 @@
GitHub
- https://github.com/fabric8io/vertx-maven-plugin/issues/
+ https://github.com/reactiverse/vertx-maven-plugin/issues/
diff --git a/it/src/it/vertx-default/pom.xml b/it/src/it/vertx-default/pom.xml
index c147ae42d6..5d1de60cad 100644
--- a/it/src/it/vertx-default/pom.xml
+++ b/it/src/it/vertx-default/pom.xml
@@ -31,8 +31,8 @@
Minimal Example with Eclipse Vert.x
- 3.4.2
- 1.0.9
+ 3.6.3
+ 1.0.18
io.openshift.booster.HttpApplication
@@ -62,7 +62,7 @@
- io.fabric8
+ io.reactiverse
vertx-maven-plugin
${vertx-maven-plugin.version}
diff --git a/it/src/it/vertx-health-check/pom.xml b/it/src/it/vertx-health-check/pom.xml
index f3a6b2440f..57961432a4 100644
--- a/it/src/it/vertx-health-check/pom.xml
+++ b/it/src/it/vertx-health-check/pom.xml
@@ -31,8 +31,8 @@
Minimal Example with Eclipse Vert.x
- 3.4.2
- 1.0.9
+ 3.6.3
+ 1.0.18
io.openshift.booster.HttpApplication
@@ -62,7 +62,7 @@
- io.fabric8
+ io.reactiverse
vertx-maven-plugin
${vertx-maven-plugin.version}
diff --git a/it/src/it/vertx/pom.xml b/it/src/it/vertx/pom.xml
index 36d662f0ee..b846d2a5cb 100644
--- a/it/src/it/vertx/pom.xml
+++ b/it/src/it/vertx/pom.xml
@@ -33,10 +33,10 @@
UTF-8
1.8
1.8
- 3.3.3
+ 3.6.3
io.vertx.example.SimpleWebVerticle
- 1.0.5
+ 1.0.18
@@ -102,7 +102,7 @@
- io.fabric8
+ io.reactiverse
vertx-maven-plugin
${vertx-maven-plugin.version}