Author: gk
Date: Tue Dec 27 15:56:29 2016
New Revision: 1776160
URL: http://svn.apache.org/viewvc?rev=1776160&view=rev
Log:
- reverted to version 1.0.1-SNAPSHOT (target tag was not set correctly)
- fix order for sql execute
- add README with hint to solve error
Added:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/README (with props)
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/pom.xml
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
Added: turbine/maven/archetypes/trunk/turbine-webapp-4.0/README
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/README?rev=1776160&view=auto
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/README (added)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/README Tue Dec 27
15:56:29 2016
@@ -0,0 +1,5 @@
+If you get that goal integration-test of maven-archetype-plugin fails with
+
+'Cannot run additions goals." cft.
https://issues.apache.org/jira/browse/ARCHETYPE-488.
+
+Fastest workaround (Dez 2016) ist to copy mvn.cmd to mvn.bat.
\ No newline at end of file
Propchange: turbine/maven/archetypes/trunk/turbine-webapp-4.0/README
------------------------------------------------------------------------------
svn:eol-style = native
Modified: turbine/maven/archetypes/trunk/turbine-webapp-4.0/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/pom.xml?rev=1776160&r1=1776159&r2=1776160&view=diff
==============================================================================
--- turbine/maven/archetypes/trunk/turbine-webapp-4.0/pom.xml (original)
+++ turbine/maven/archetypes/trunk/turbine-webapp-4.0/pom.xml Tue Dec 27
15:56:29 2016
@@ -1,64 +1,64 @@
-<?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.
--->
-<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/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>18</version>
- </parent>
- <groupId>org.apache.turbine</groupId>
- <artifactId>turbine-webapp-4.0</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <packaging>maven-archetype</packaging>
-
- <name>Archetype - Turbine 4.0M2 WebApp</name>
- <description>This archetype sets up a web application project based on
Apache Turbine 4.0M2</description>
- <url>http://turbine.apache.org</url>
-
- <inceptionYear>2011</inceptionYear>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</developerConnection>
-
<url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</url>
- </scm>
-
-<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- <version>2.4</version>
- </extension>
- </extensions>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-archetype-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
-</project>
+<?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.
+-->
+<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/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>18</version>
+ </parent>
+ <groupId>org.apache.turbine</groupId>
+ <artifactId>turbine-webapp-4.0</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ <packaging>maven-archetype</packaging>
+
+ <name>Archetype - Turbine 4.0M2 WebApp</name>
+ <description>This archetype sets up a web application project based on
Apache Turbine 4.0M2</description>
+ <url>http://turbine.apache.org</url>
+
+ <inceptionYear>2011</inceptionYear>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</developerConnection>
+
<url>http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/</url>
+ </scm>
+
+<build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.4</version>
+ </extension>
+ </extensions>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Modified:
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml?rev=1776160&r1=1776159&r2=1776160&view=diff
==============================================================================
---
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
(original)
+++
turbine/maven/archetypes/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
Tue Dec 27 15:56:29 2016
@@ -159,7 +159,7 @@ under the License.
<password>${turbine_database_password}</password>
<onError>continue</onError>
<autocommit>true</autocommit>
- <orderFile>ascending</orderFile>
+ <orderFile>descending</orderFile>
<!-- this is mysql specific -->
<fileset>
<basedir>${project.build.directory}/generated-sql/torque/mysql</basedir>
