Skip to content

Changes in Maven project templates for more convenience in multi-modular projects #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open

Changes in Maven project templates for more convenience in multi-modular projects #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9254ea8
Ignore IntelliJ IDEA settings files
dkorotych Mar 24, 2017
0c0c6c4
Changes in Maven project templates for more convenience in multi-modu…
dkorotych Mar 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
**/.idea
**/*.iml
.vscode
node_modules
1 change: 1 addition & 0 deletions components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"groupId": "io.netty",
"artifactId": "netty-tcnative-boringssl-static",
"version": "1.1.33.Fork26",
"scope": "runtime",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is a nice addtion

"included": true,
"description": "netty-tcnative is a multi-module project and builds a few artifacts, allowing it to be used in a variety of environments."
},
Expand Down
19 changes: 19 additions & 0 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,25 @@ function compileProject(project, callback) {
return el.checked;
});

project.transformedSelectedDependencies = project.selectedDependencies.map(function (el) {
if (el.groupId == 'io.vertx' || el.groupId == 'junit') {
var clone = JSON.parse(JSON.stringify(el));
delete clone['version'];
return clone;
}
return el;
});

project.coreVersion = project.dependencies.filter(function (el) {
return el.groupId == 'io.vertx' && el.artifactId == 'vertx-core';
}).map(function (el) {
return el.version;
});

project.hasUnit = project.selectedDependencies.filter(function (el) {
return el.groupId == 'io.vertx' && el.artifactId == 'vertx-unit';
}).length > 0;

project.metadata = {};

// make a boolean value for the languageId
Expand Down
48 changes: 45 additions & 3 deletions templ/maven+service-proxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,61 @@
{{/if}}

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<main.verticle>{{metadata.packageName}}.MainVerticle</main.verticle>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-dependencies</artifactId>
<version>{{coreVersion}}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
{{#if hasUnit}}

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>{{coreVersion}}</version>
<scope>test</scope>
</dependency>

<dependency>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we add vertx-unit it should pull junit, since it is an optional dependency it should be available and we don't exclude dependencies anywhere in the simple pom's

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I'm thinking that this hasUnit check is probably not necessary, but i might be missing something

<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
{{/if}}
</dependencies>
</dependencyManagement>

<dependencies>
{{#each selectedDependencies}}
{{#each transformedSelectedDependencies}}
<dependency>
<groupId>{{groupId}}</groupId>
<artifactId>{{artifactId}}</artifactId>
{{#if version}}
<version>{{version}}</version>
{{/if}}
{{#if scope}}
<scope>{{scope}}</scope>
{{/if}}
</dependency>
{{/each}}
{{#if hasUnit}}
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
{{/if}}
</dependencies>

<build>
Expand All @@ -35,8 +79,6 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<annotationProcessors>
<annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
</annotationProcessors>
Expand Down
50 changes: 45 additions & 5 deletions templ/maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,61 @@
{{/if}}

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>

<main.verticle>{{metadata.packageName}}.MainVerticle</main.verticle>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-dependencies</artifactId>
<version>{{coreVersion}}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
{{#if hasUnit}}

<dependency>
<groupId>io.vertx</groupId>
<artifactId>vertx-unit</artifactId>
<version>{{coreVersion}}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
{{/if}}
</dependencies>
</dependencyManagement>

<dependencies>
{{#each selectedDependencies}}
{{#each transformedSelectedDependencies}}
<dependency>
<groupId>{{groupId}}</groupId>
<artifactId>{{artifactId}}</artifactId>
{{#if version}}
<version>{{version}}</version>
{{/if}}
{{#if scope}}
<scope>{{scope}}</scope>
{{/if}}
</dependency>
{{/each}}
{{#if hasUnit}}
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
{{/if}}
</dependencies>

<build>
Expand All @@ -34,10 +78,6 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
{{#if metadata.kotlin}}
<plugin>
Expand Down
Loading