Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #49 from rciovati/master
Revamped archetypes
- Loading branch information
Showing
110 changed files
with
2,515 additions
and
1,707 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,59 @@ | ||
| <!-- | ||
| Copyright 2010 akquinet | ||
| Licensed 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 | ||
| <!-- Copyright 2010 akquinet Licensed 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> | ||
| <parent> | ||
| <artifactId>android-archetype-project</artifactId> | ||
| <groupId>de.akquinet.android.archetypes</groupId> | ||
| <version>1.0.10-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <groupId>de.akquinet.android.archetypes</groupId> | ||
| <artifactId>android-archetypes-it</artifactId> | ||
| <version>1.0.10-SNAPSHOT</version> | ||
| <name>Akquinet Android Archetype - Integration Tests</name> | ||
| <description>Android Archetypes Integration Tests</description> | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.maven.shared</groupId> | ||
| <artifactId>maven-verifier</artifactId> | ||
| <version>1.4</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.11</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.assertj</groupId> | ||
| <artifactId>assertj-core</artifactId> | ||
| <version>1.1.0</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| 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> | ||
| <parent> | ||
| <artifactId>android-archetype-project</artifactId> | ||
| <groupId>de.akquinet.android.archetypes</groupId> | ||
| <version>1.0.10-SNAPSHOT</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <groupId>de.akquinet.android.archetypes</groupId> | ||
| <artifactId>android-archetypes-it</artifactId> | ||
| <version>1.0.10-SNAPSHOT</version> | ||
| <name>Akquinet Android Archetype - Integration Tests</name> | ||
| <description>Android Archetypes Integration Tests</description> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.apache.maven.shared</groupId> | ||
| <artifactId>maven-verifier</artifactId> | ||
| <version>1.2</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>junit</groupId> | ||
| <artifactId>junit</artifactId> | ||
| <version>4.10</version> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>2.7.2</version> | ||
| <configuration> | ||
| <parallel>true</parallel> | ||
| <systemPropertyVariables> | ||
| <archetype.version>${project.version}</archetype.version> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-surefire-plugin</artifactId> | ||
| <version>2.14.1</version> | ||
| <configuration> | ||
| <parallel>true</parallel> | ||
| <systemPropertyVariables> | ||
| <archetype.version>${project.version}</archetype.version> | ||
| </systemPropertyVariables> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
Oops, something went wrong.