Skip to content
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

Helidon bare archetypes #950

Merged
merged 13 commits into from
Aug 27, 2019
Merged

Helidon bare archetypes #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5160029
new archetypes multi-module project + bare-mp archetype (or at least …
romain-grecourt Aug 20, 2019
e1b8026
fix copyright headers
romain-grecourt Aug 22, 2019
f8ee722
Add se-bare archetype.
romain-grecourt Aug 23, 2019
3f9cb9a
remove unintended change in helidon-quickstart-se
romain-grecourt Aug 23, 2019
49f99d7
more cleanup in helidon-quickstart-se
romain-grecourt Aug 23, 2019
a1a1e44
cleanup in helidon-quickstart-mp
romain-grecourt Aug 23, 2019
c651fe2
update artifactids
romain-grecourt Aug 24, 2019
c1f2ab1
incorporate review feedback
romain-grecourt Aug 24, 2019
322df8a
fix copyright
romain-grecourt Aug 24, 2019
d33e031
fix checkstyle
romain-grecourt Aug 24, 2019
42dc91f
fix checkstyle
romain-grecourt Aug 27, 2019
11a2cef
Merge remote-tracking branch 'origin/master' into helidon-bare-archet…
romain-grecourt Aug 27, 2019
7e5a98f
update pom version to 1.2.2-SNAPSHOT
romain-grecourt Aug 27, 2019
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
39 changes: 39 additions & 0 deletions archetypes/mp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>io.helidon.archetypes</groupId>
<artifactId>helidon-archetypes-project</artifactId>
<version>1.2.2-SNAPSHOT</version>
</parent>
<artifactId>helidon-mp</artifactId>
<packaging>maven-archetype</packaging>
<name>Helidon MP Archetype</name>
<description>Archetype to generate a basic Helidon MP application</description>

<build>
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
</extension>
</extensions>
</build>
</project>
45 changes: 45 additions & 0 deletions archetypes/mp/src/main/resources/META-INF/archetype-post-generate.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

def rootDir = new File(request.getOutputDirectory() + "/" + request.getArtifactId())
def javaPackage = request.getProperties().get("package")
def javaPkgDir = new File(rootDir, "src/main/java/" + javaPackage.replace('.','/'))
def testJavaPkgDir = new File(rootDir, "src/test/java/" + javaPackage.replace('.','/'))
def resourcesDir = new File(rootDir, "src/main/resources")
def testResourcesDir = new File(rootDir, "src/test/resources")

def optionalFiles = [
restResource: [ "${javaPkgDir}/__applicationName__.java", "${javaPkgDir}/__restResourceName__.java" ],
unitTest: [ "${testJavaPkgDir}/MainTest.java", "${testResourcesDir}/microprofile-config.properties" ],
loggingConfig: [ "${resourcesDir}/logging.properties" ],
applicationYaml: [ "${resourcesDir}/application.yaml" ]
]

// remove optional files that should not be included
def processOptionalFiles(prop, fnames) {
if (request.getProperties().get(prop).matches("n|no|false")) {
fnames.each{ fname -> new File(fname).delete() }
}
}
optionalFiles.each{ key, value -> processOptionalFiles(key, value) }

// rename .vm files
def renameVmFile(file) {
if (file.path.endsWith(".vm")) {
file.renameTo file.path.substring(0, file.path.length() - 3)
}
}
rootDir.traverse(type: groovy.io.FileType.FILES, maxDepth: -1) { file -> renameVmFile(file) }
81 changes: 81 additions & 0 deletions archetypes/mp/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

-->
<archetype-descriptor
name="helidon-mp"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<requiredProperties>
<requiredProperty key="groupId"/>
<requiredProperty key="artifactId"/>
<requiredProperty key="version"/>
<requiredProperty key="package"/>
<requiredProperty key="applicationName">
<defaultValue>ExampleApplication</defaultValue>
<validationRegex>([$_a-zA-Z][$_a-zA-Z0-9]*)</validationRegex>
</requiredProperty>
<requiredProperty key="restResource">
<defaultValue>yes</defaultValue>
</requiredProperty>
<requiredProperty key="restResourceName">
<defaultValue>ExampleResource</defaultValue>
<validationRegex>([$_a-zA-Z][$_a-zA-Z0-9]*)</validationRegex>
</requiredProperty>
<requiredProperty key="restResourcePath">
<defaultValue>/example</defaultValue>
<validationRegex>^\/.*</validationRegex>
</requiredProperty>
<requiredProperty key="loggingConfig">
<defaultValue>no</defaultValue>
</requiredProperty>
<requiredProperty key="applicationYaml">
<defaultValue>yes</defaultValue>
</requiredProperty>
<requiredProperty key="unitTest">
<defaultValue>no</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSets>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java</directory>
<includes>
<include>**/*.java.vm</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java.vm</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/resources</directory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/test/resources</directory>
<includes>
<include>**/*</include>
</includes>
</fileSet>
</fileSets>
</archetype-descriptor>
16 changes: 16 additions & 0 deletions archetypes/mp/src/main/resources/archetype-resources/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
hs_err_pid*
target/
.DS_Store
.idea/
*.iws
*.ipr
*.iml
atlassian-ide-plugin.xml
nbactions.xml
nb-configuration.xml
.settings
.settings/
.project
.classpath
*.swp
*~
195 changes: 195 additions & 0 deletions archetypes/mp/src/main/resources/archetype-resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
#set( $symbol_dollar = '$' )
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
<packaging>jar</packaging>
<name>${artifactId}</name>

<properties>
<helidon.version>1.2.2-SNAPSHOT</helidon.version>
#if( $mainClass.matches("y|yes|true") )
<mainClass>${package}.Main</mainClass>
#else
<mainClass>io.helidon.microprofile.server.Main</mainClass>
#end
<exec.mainClass>${symbol_dollar}{mainClass}</exec.mainClass>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>${symbol_dollar}{maven.compiler.source}</maven.compiler.target>
<libs.classpath.prefix>libs</libs.classpath.prefix>
<copied.libs.dir>${symbol_dollar}{project.build.directory}/${libs.classpath.prefix}</copied.libs.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
#if( $unitTest.matches("y|yes|true") )
<argLine>-Dfile.encoding=UTF-8</argLine>
#end
</properties>

<build>
<finalName>${symbol_dollar}{project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<version>1.0.6</version>
</plugin>
#if( $unitTest.matches("y|yes|true") )
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<dependencies>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-surefire-provider</artifactId>
<version>1.1.0</version>
</dependency>
</dependencies>
</plugin>
#end
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>${symbol_dollar}{libs.classpath.prefix}</classpathPrefix>
<mainClass>${symbol_dollar}{mainClass}</mainClass>
<useUniqueVersions>false</useUniqueVersions>
</manifest>
</archive>
</configuration>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${symbol_dollar}{copied.libs.dir}</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<overWriteIfNewer>true</overWriteIfNewer>
<includeScope>runtime</includeScope>
<excludeScope>test</excludeScope>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
<phase>process-classes</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.helidon</groupId>
<artifactId>helidon-bom</artifactId>
<version>${symbol_dollar}{helidon.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<version>2.1.1.Final</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
</dependency>
#if( $unitTest.matches("y|yes|true") )
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.0.1</version>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
<version>1.3</version>
</dependency>
#end
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.helidon.microprofile.bundles</groupId>
<artifactId>helidon-microprofile-2.2</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jandex</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<scope>runtime</scope>
</dependency>
#if( $unitTest.matches("y|yes|true") )
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
#end
</dependencies>
</project>
Loading