Repository: maven-archetype
Updated Branches:
refs/heads/master cb1ffb298 -> f831932ce
Squashed commit of the following:
commit 35b4a76d1d6d73f23320aa2c825c616c9816760c
Author: rfscholte <rfscho...@apache.org>
Date: Sat Apr 1 11:39:22 2017 +0200
[ARCHETYPE-520] Following mirror configuration from settings.xml for
downloading archetype metadata
Add verify script to ensure nothing is downloaded directly from Central
commit 50b21e8a99d7d1d0170d5fc7b5ba7fb82425814e
Author: rfscholte <rfscho...@apache.org>
Date: Sat Apr 1 11:08:46 2017 +0200
[ARCHETYPE-520] Following mirror configuration from settings.xml for
downloading archetype metadata
Use released 1.1.0 of mrm-maven-plugin
commit be052022c053e887aa964060255231e579e15d56
Author: rfscholte <rfscho...@apache.org>
Date: Mon Mar 20 20:07:47 2017 +0100
ARCHETYPE-520: Following mirror configuration from settings.xml for
downloading archetype metadata
MRM based integration test
Project: http://git-wip-us.apache.org/repos/asf/maven-archetype/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-archetype/commit/f831932c
Tree: http://git-wip-us.apache.org/repos/asf/maven-archetype/tree/f831932c
Diff: http://git-wip-us.apache.org/repos/asf/maven-archetype/diff/f831932c
Branch: refs/heads/master
Commit: f831932cef0709cf72609d8e23169b5a4c01649f
Parents: cb1ffb2
Author: rfscholte <rfscho...@apache.org>
Authored: Sat Apr 1 11:43:41 2017 +0200
Committer: rfscholte <rfscho...@apache.org>
Committed: Sat Apr 1 11:51:24 2017 +0200
----------------------------------------------------------------------
maven-archetype-plugin/pom.xml | 3 +-
.../src/it/mrm/repository/archetype-catalog.xml | 35 ++++++++++++++++++++
.../META-INF/maven/archetype-metadata.xml | 30 +++++++++++++++++
.../archetype-resources/pom.xml | 29 ++++++++++++++++
.../it/mrm/repository/custom-archetype-1.0.pom | 29 ++++++++++++++++
.../ARCHETYPE-520_mirror/invoker.properties | 18 ++++++++++
.../ARCHETYPE-520_mirror/test.properties | 26 +++++++++++++++
.../projects/ARCHETYPE-520_mirror/verify.groovy | 21 ++++++++++++
8 files changed, 190 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index d059eb7..ba6b272 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -178,7 +178,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>mrm-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<executions>
<execution>
<goals>
@@ -191,6 +191,7 @@
<repositories>
<mockRepo>
<source>src/it/mrm/repository</source>
+ <cloneTo>target/mock-repo</cloneTo>
</mockRepo>
<proxyRepo/>
</repositories>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
----------------------------------------------------------------------
diff --git a/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
b/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
new file mode 100644
index 0000000..ac069a6
--- /dev/null
+++ b/maven-archetype-plugin/src/it/mrm/repository/archetype-catalog.xml
@@ -0,0 +1,35 @@
+<?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
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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-catalog
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0
http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd";
+
xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <archetypes>
+ <archetype>
+ <groupId>org.apache.maven.archetypes.its</groupId>
+ <artifactId>custom-archetype</artifactId>
+ <version>1.0</version>
+ <description>A custom archetype only available or ITs</description>
+ </archetype>
+ </archetypes>
+
+</archetype-catalog>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git
a/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
new file mode 100644
index 0000000..d504e4e
--- /dev/null
+++
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/META-INF/maven/archetype-metadata.xml
@@ -0,0 +1,30 @@
+<?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
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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="custom">
+ <fileSets>
+ <fileSet filtered="true" packaged="true">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git
a/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/archetype-resources/pom.xml
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/archetype-resources/pom.xml
new file mode 100644
index 0000000..43011ed
--- /dev/null
+++
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.jar/archetype-resources/pom.xml
@@ -0,0 +1,29 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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>
+
+ <groupId>${groupId}</groupId>
+ <artifactId>${artifactId}</artifactId>
+ <version>${version}</version>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.pom
----------------------------------------------------------------------
diff --git
a/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.pom
b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.pom
new file mode 100644
index 0000000..fe64dbf
--- /dev/null
+++ b/maven-archetype-plugin/src/it/mrm/repository/custom-archetype-1.0.pom
@@ -0,0 +1,29 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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>
+
+ <groupId>org.apache.maven.archetypes.its</groupId>
+ <artifactId>custom-archetype</artifactId>
+ <version>1.0</version>
+
+</project>
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
----------------------------------------------------------------------
diff --git
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
new file mode 100644
index 0000000..0517021
--- /dev/null
+++
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/invoker.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+invoker.goals =
org.apache.maven.plugins:maven-archetype-plugin:${project.version}:generate
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/test.properties
----------------------------------------------------------------------
diff --git
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/test.properties
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/test.properties
new file mode 100644
index 0000000..4ae9393
--- /dev/null
+++
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/test.properties
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+
+archetypeGroupId=org.apache.maven.archetypes.its
+archetypeArtifactId=custom-archetype
+archetypeVersion=1.0
+archetypeCatalog=local
+
+groupId=com.company
+artifactId=project
+version=1.0-SNAPSHOT
+package=com.company.project
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/maven-archetype/blob/f831932c/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
----------------------------------------------------------------------
diff --git
a/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
new file mode 100644
index 0000000..ffbb061
--- /dev/null
+++ b/maven-archetype-plugin/src/it/projects/ARCHETYPE-520_mirror/verify.groovy
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+
+buildLog = new File( basedir, "build.log" )
+assert !buildLog.text.contains( "://repo.maven.apache.org" )
\ No newline at end of file
