You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/10/16 21:38:56 UTC
svn commit: r1709070 - in /sling/trunk/tooling/maven/archetypes:
bundle-for-jcrinstall/
bundle-for-jcrinstall/src/test/resources/projects/normal/ bundle/
bundle/src/test/resources/projects/normal/ initial-content/
initial-content/src/test/resources/pro...
Author: rombert
Date: Fri Oct 16 19:38:55 2015
New Revision: 1709070
URL: http://svn.apache.org/viewvc?rev=1709070&view=rev
Log:
archetypes: move to archetype parent 4-SNAPSHOT and fix rat checks
Modified:
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/bundle/pom.xml
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/initial-content/pom.xml
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/servlet/pom.xml
sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml
sling/trunk/tooling/maven/archetypes/slingstart/pom.xml
sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/archetype.properties
sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/verify.groovy
sling/trunk/tooling/maven/archetypes/taglib/pom.xml
Modified: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/pom.xml Fri Oct 16 19:38:55 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath/>
</parent>
Modified: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-jcrinstall-bundle-archetype-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy (original)
+++ sling/trunk/tooling/maven/archetypes/bundle-for-jcrinstall/src/test/resources/projects/normal/verify.groovy Fri Oct 16 19:38:55 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
Modified: sling/trunk/tooling/maven/archetypes/bundle/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/bundle/pom.xml Fri Oct 16 19:38:55 2015
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath/>
</parent>
Modified: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-bundle-archetype-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy (original)
+++ sling/trunk/tooling/maven/archetypes/bundle/src/test/resources/projects/normal/verify.groovy Fri Oct 16 19:38:55 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
Modified: sling/trunk/tooling/maven/archetypes/initial-content/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/initial-content/pom.xml Fri Oct 16 19:38:55 2015
@@ -22,8 +22,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
<relativePath/>
+ <version>4-SNAPSHOT</version>
</parent>
<artifactId>sling-initial-content-archetype</artifactId>
Modified: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-bundle-archetype-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy (original)
+++ sling/trunk/tooling/maven/archetypes/initial-content/src/test/resources/projects/normal/verify.groovy Fri Oct 16 19:38:55 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
Modified: sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/pom.xml Fri Oct 16 19:38:55 2015
@@ -16,8 +16,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
<relativePath/>
+ <version>4-SNAPSHOT</version>
</parent>
<artifactId>sling-launchpad-standalone-archetype</artifactId>
<version>1.0.1-SNAPSHOT</version>
Modified: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-bundle-archetype-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-standalone/src/test/resources/projects/normal/verify.groovy Fri Oct 16 19:38:55 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
Modified: sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/pom.xml Fri Oct 16 19:38:55 2015
@@ -16,8 +16,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
<relativePath/>
+ <version>4-SNAPSHOT</version>
</parent>
<artifactId>sling-launchpad-webapp-archetype</artifactId>
<version>1.0.1-SNAPSHOT</version>
Modified: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-bundle-archetype-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy (original)
+++ sling/trunk/tooling/maven/archetypes/launchpad-webapp/src/test/resources/projects/normal/verify.groovy Fri Oct 16 19:38:55 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
Modified: sling/trunk/tooling/maven/archetypes/servlet/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/servlet/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/servlet/pom.xml Fri Oct 16 19:38:55 2015
@@ -23,11 +23,10 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
<relativePath/>
+ <version>4-SNAPSHOT</version>
</parent>
- <groupId>org.apache.sling</groupId>
<artifactId>sling-servlet-archetype</artifactId>
<version>1.0.3-SNAPSHOT</version>
<packaging>maven-archetype</packaging>
Modified: sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-servlet-archetype-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/servlet/src/test/resources/projects/normal/reference/pom.xml Fri Oct 16 19:38:55 2015
@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.16.0</version>
+ <version>1.21.0</version>
<executions>
<execution>
<id>generate-scr-descriptor</id>
@@ -44,21 +44,21 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <version>2.4.0</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <version>3.3</version>
<configuration>
- <source>6</source>
- <target>6</target>
+ <source>7</source>
+ <target>7</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.sling</groupId>
<artifactId>maven-sling-plugin</artifactId>
- <version>2.1.0</version>
+ <version>2.1.2</version>
<configuration>
<slingUrl>http://localhost:8080/system/console</slingUrl>
<user>admin</user>
@@ -95,25 +95,25 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.2.0</version>
+ <version>2.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.10</version>
+ <version>1.7.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.8</version>
+ <version>1.9.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: sling/trunk/tooling/maven/archetypes/slingstart/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/slingstart/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/slingstart/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/slingstart/pom.xml Fri Oct 16 19:38:55 2015
@@ -16,8 +16,8 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
<relativePath/>
+ <version>4-SNAPSHOT</version>
</parent>
<artifactId>sling-slingstart-archetype</artifactId>
<version>0.9.0-SNAPSHOT</version>
Modified: sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/archetype.properties
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/archetype.properties?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/archetype.properties (original)
+++ sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/archetype.properties Fri Oct 16 19:38:55 2015
@@ -1,3 +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.
+#####################################################################
groupId=org.apache.sling
artifactId=test-slingstart-project
version=0.0.1-SNAPSHOT
Modified: sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/verify.groovy
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/verify.groovy?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/verify.groovy (original)
+++ sling/trunk/tooling/maven/archetypes/slingstart/src/test/resources/projects/normal/verify.groovy Fri Oct 16 19:38:55 2015
@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
new File(basedir, '.').eachFileRecurse(groovy.io.FileType.FILES) { logFile ->
if ( logFile.name == "build.log" ) {
logFile.eachLine { line ->
Modified: sling/trunk/tooling/maven/archetypes/taglib/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/archetypes/taglib/pom.xml?rev=1709070&r1=1709069&r2=1709070&view=diff
==============================================================================
--- sling/trunk/tooling/maven/archetypes/taglib/pom.xml (original)
+++ sling/trunk/tooling/maven/archetypes/taglib/pom.xml Fri Oct 16 19:38:55 2015
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-archetype-parent</artifactId>
- <version>3</version>
+ <version>4-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.apache.sling</groupId>