Author: hboutemy
Date: Mon Feb 19 18:15:04 2018
New Revision: 1824801
URL: http://svn.apache.org/viewvc?rev=1824801&view=rev
Log:
[MARCHETYPES-57] update generated project to be a valid ArchetypeNG
Added:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype-metadata.xml
- copied, changed from r1824800,
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
(with props)
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/
- copied from r1824800,
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/
- copied from r1824715,
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/resources/projects/basic/
Removed:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype.xml
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/java/
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/basic/
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/archetype.properties
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/goal.txt
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1824801&r1=1824800&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
Mon Feb 19 18:15:04 2018
@@ -26,5 +26,8 @@ under the License.
<fileSet>
<directory>src/main/resources</directory>
</fileSet>
+ <fileSet>
+ <directory>src/test/resources</directory>
+ </fileSet>
</fileSets>
</archetype-descriptor>
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml?rev=1824801&r1=1824800&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/pom.xml
Mon Feb 19 18:15:04 2018
@@ -23,15 +23,14 @@
<extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</extension>
</extensions>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-archetype-plugin</artifactId>
- <version>2.2</version>
- <extensions>true</extensions>
+ <version>2.4</version>
</plugin>
</plugins>
</pluginManagement>
Copied:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype-metadata.xml
(from r1824800,
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml)
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype-metadata.xml?p2=maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype-metadata.xml&p1=maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml&r1=1824800&r2=1824801&rev=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/maven/archetype-metadata.xml
Mon Feb 19 18:15:04 2018
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,14 +19,16 @@ specific language governing permissions
under the License.
-->
-<archetype
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0
http://maven.apache.org/xsd/archetype-1.0.0.xsd";>
- <id>${artifactId}</id>
+<archetype-descriptor
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
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";
+ name="${artifactId}">
- <sources>
- <source>src/main/java/App.java</source>
- </sources>
- <testSources>
- <source>src/test/java/AppTest.java</source>
- </testSources>
-</archetype>
+ <fileSets>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/main/java</directory>
+ </fileSet>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/test/java</directory>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml?rev=1824801&r1=1824800&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/pom.xml
Mon Feb 19 18:15:04 2018
@@ -1,16 +1,18 @@
+<?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>
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java?rev=1824801&r1=1824800&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/main/java/App.java
Mon Feb 19 18:15:04 2018
@@ -1,4 +1,4 @@
-package $$package;
+package $package;
/**
* Hello world!
Added:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java?rev=1824801&view=auto
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
(added)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
Mon Feb 19 18:15:04 2018
@@ -0,0 +1,20 @@
+package $package;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+{
+ /**
+ * Rigorous Test :-)
+ */
+ @Test
+ public void shouldAnswerWithTrue()
+ {
+ assertTrue( true );
+ }
+}
Propchange:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/main/resources/archetype-resources/src/test/java/AppTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/archetype.properties
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/archetype.properties?rev=1824801&r1=1824715&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/archetype.properties
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/archetype.properties
Mon Feb 19 18:15:04 2018
@@ -1,3 +1,4 @@
groupId=archetype.it
-artifactId=basic
-version=0.1-SNAPSHOT
\ No newline at end of file
+artifactId=basic-project
+version=0.1-SNAPSHOT
+package=it.pkg
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/goal.txt
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/goal.txt?rev=1824801&r1=1824715&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/goal.txt
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/main/resources/archetype-resources/src/test/resources/projects/it-basic/goal.txt
Mon Feb 19 18:15:04 2018
@@ -0,0 +1 @@
+verify
\ No newline at end of file
Modified:
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
URL:
http://svn.apache.org/viewvc/maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt?rev=1824801&r1=1824800&r2=1824801&view=diff
==============================================================================
---
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
(original)
+++
maven/archetypes/trunk/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
Mon Feb 19 18:15:04 2018
@@ -0,0 +1 @@
+verify
\ No newline at end of file
