Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

Commit

Permalink
update vmp groupid and vert.x version (#1517)
Browse files Browse the repository at this point in the history
* update vmp groupid and vert.x version

* Update _enricher.adoc

* update with fix 1517
  • Loading branch information
rdruss authored and rohanKanojia committed Feb 18, 2019
1 parent cfb79a1 commit 96f17eb
Show file tree
Hide file tree
Showing 15 changed files with 29 additions and 27 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ notes.md
.vscode
velocity.log
/.metadata/
/.recommenders/
/.recommenders/
.factorypath
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/src/main/asciidoc/inc/_enricher.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ Lets say you have a maven pom.xml with the following issue management informatio
----
<issueManagement>
<system>GitHub</system>
<url>https://github.com/fabric8io/vertx-maven-plugin/issues/</url>
<url>https://github.com/reactiverse/vertx-maven-plugin/issues/</url>
</issueManagement>
----

Expand All @@ -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/"
...
----

Expand Down
2 changes: 1 addition & 1 deletion doc/src/main/asciidoc/inc/generator/_vertx.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<generator-java-exec,java-exec generator>>. It supports the <<generator-options-common, common generator options>> and the <<generator-java-exec-options, `java-exec` options>>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 3 additions & 3 deletions it/src/it/custom-environment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<vertx.version>3.3.3</vertx.version>
<vertx.version>3.6.3</vertx.version>

<vertx.verticle>io.vertx.example.SimpleWebVerticle</vertx.verticle>
<vertx-maven-plugin.version>1.0.5</vertx-maven-plugin.version>
<vertx-maven-plugin.version>1.0.18</vertx-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -103,7 +103,7 @@

<!-- vert.x maven plugin to generate the fat-jar -->
<plugin>
<groupId>io.fabric8</groupId>
<groupId>io.reactiverse</groupId>
<artifactId>vertx-maven-plugin</artifactId>
<version>${vertx-maven-plugin.version}</version>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions it/src/it/remote-resources/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<vertx.version>3.3.3</vertx.version>
<vertx.version>3.6.3</vertx.version>

<vertx.verticle>io.vertx.example.SimpleWebVerticle</vertx.verticle>
<vertx-maven-plugin.version>1.0.5</vertx-maven-plugin.version>
<vertx-maven-plugin.version>1.0.18</vertx-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -105,7 +105,7 @@

<!-- vert.x maven plugin to generate the fat-jar -->
<plugin>
<groupId>io.fabric8</groupId>
<groupId>io.reactiverse</groupId>
<artifactId>vertx-maven-plugin</artifactId>
<version>${vertx-maven-plugin.version}</version>
<executions>
Expand Down
2 changes: 1 addition & 1 deletion it/src/it/simple-maven-issue-mgmt/expected/kubernetes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion it/src/it/simple-maven-issue-mgmt/expected/openshift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion it/src/it/simple-maven-issue-mgmt/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<issueManagement>
<system>GitHub</system>
<url>https://github.com/fabric8io/vertx-maven-plugin/issues/</url>
<url>https://github.com/reactiverse/vertx-maven-plugin/issues/</url>
</issueManagement>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions it/src/it/vertx-default/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<description>Minimal Example with Eclipse Vert.x</description>

<properties>
<vertx.version>3.4.2</vertx.version>
<vertx-maven-plugin.version>1.0.9</vertx-maven-plugin.version>
<vertx.version>3.6.3</vertx.version>
<vertx-maven-plugin.version>1.0.18</vertx-maven-plugin.version>
<vertx.verticle>io.openshift.booster.HttpApplication</vertx.verticle>
</properties>

Expand Down Expand Up @@ -62,7 +62,7 @@
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<groupId>io.reactiverse</groupId>
<artifactId>vertx-maven-plugin</artifactId>
<version>${vertx-maven-plugin.version}</version>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions it/src/it/vertx-health-check/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<description>Minimal Example with Eclipse Vert.x</description>

<properties>
<vertx.version>3.4.2</vertx.version>
<vertx-maven-plugin.version>1.0.9</vertx-maven-plugin.version>
<vertx.version>3.6.3</vertx.version>
<vertx-maven-plugin.version>1.0.18</vertx-maven-plugin.version>
<vertx.verticle>io.openshift.booster.HttpApplication</vertx.verticle>
</properties>

Expand Down Expand Up @@ -62,7 +62,7 @@
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<groupId>io.reactiverse</groupId>
<artifactId>vertx-maven-plugin</artifactId>
<version>${vertx-maven-plugin.version}</version>
<executions>
Expand Down
6 changes: 3 additions & 3 deletions it/src/it/vertx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<vertx.version>3.3.3</vertx.version>
<vertx.version>3.6.3</vertx.version>

<vertx.verticle>io.vertx.example.SimpleWebVerticle</vertx.verticle>
<vertx-maven-plugin.version>1.0.5</vertx-maven-plugin.version>
<vertx-maven-plugin.version>1.0.18</vertx-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -102,7 +102,7 @@

<!-- vert.x maven plugin to generate the fat-jar -->
<plugin>
<groupId>io.fabric8</groupId>
<groupId>io.reactiverse</groupId>
<artifactId>vertx-maven-plugin</artifactId>
<version>${vertx-maven-plugin.version}</version>
<executions>
Expand Down

0 comments on commit 96f17eb

Please sign in to comment.