mbien commented on code in PR #2: URL: https://github.com/apache/netbeans-mavenutils-archetypes/pull/2#discussion_r1210543912
########## netbeans-jakartaee-war-archetype/src/main/resources/archetype-resources/pom.xml: ########## @@ -0,0 +1,41 @@ +<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>war</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <maven.compiler.target>${javaVersion}</maven.compiler.target> + </properties> + + <dependencies> + <dependency> + <groupId>jakarta.platform</groupId> + <artifactId>jakarta.${jakartaEEVariant}-api</artifactId> + <version>${jakartaEEVersion}</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>3.1.0</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>3.3.2</version> + </plugin> + </plugins> + </build> +</project> Review Comment: nitpick: consider adding new line ########## netbeans-jakartaee-war-archetype/src/main/resources/archetype-resources/pom.xml: ########## @@ -0,0 +1,41 @@ +<?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 https://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>war</packaging> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.source>${javaVersion}</maven.compiler.source> + <maven.compiler.target>${javaVersion}</maven.compiler.target> Review Comment: would it be possible to make it use `maven.compiler.release` for versions > 8? ########## netbeans-jakartaee-war-archetype/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml: ########## @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +#if( $jakartaEEVersion == '8.0.0') + #set( $xmlns = 'https://xmlns.jcp.org/xml/ns/javaee' ) + #set( $xsiSchemaLocation = 'https://xmlns.jcp.org/xml/ns/javaee https://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd' ) + #set( $version = '2.0' ) +#else + #set( $xmlns = 'https://jakarta.ee/xml/ns/jakartaee' ) + #if( $jakartaEEVersion == '9.0.0' || $jakartaEEVersion == '9.1.0' ) + #set( $xsiSchemaLocation = 'https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd' ) + #set( $version = '3.0' ) + #else + #set( $xsiSchemaLocation = 'https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd' ) + #set( $version = '4.0' ) + #end +#end + +<beans xmlns="$xmlns" + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="$xsiSchemaLocation" + bean-discovery-mode="all" + version="$version"> +</beans> Review Comment: nitpick: consider adding new line ########## netbeans-jakartaee-war-archetype/src/main/resources/META-INF/archetype-post-generate.groovy: ########## @@ -0,0 +1,10 @@ +dir = new File(new File(request.outputDirectory), request.artifactId) + +jakartaEEVariant = request.getProperties().get("jakartaEEVariant") + +if ("jakartaee-core".equals(jakartaEEVariant)) { + dir = new File(new File(request.outputDirectory), request.artifactId) + persistenceXml = new File(dir.toString() + "/src/main/resources/META-INF/persistence.xml"); + + persistenceXml.delete() +} Review Comment: nitpick: consider adding new line -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
