diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-04-30 16:41:01 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-04-30 16:41:01 +0000 |
commit | ac4c8796ff5fc42deff8cdda446447838c4f83fc (patch) | |
tree | 5a47563280789c6cc4d4f8795e990b207f13d364 | |
parent | 20532be8b8127a3f2624e4a62c7cad80a3bbc566 (diff) |
Use maven-assembly-plugin to create zip contribution
Fix the parent pom and junit version
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@770316 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
10 files changed, 191 insertions, 105 deletions
diff --git a/java/sca/archetypes/contribution-jar/pom.xml b/java/sca/archetypes/contribution-jar/pom.xml index b77f91bd1c..6987e0ee86 100644 --- a/java/sca/archetypes/contribution-jar/pom.xml +++ b/java/sca/archetypes/contribution-jar/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml b/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml index 9bbaa237dd..35b8618378 100644 --- a/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml +++ b/java/sca/archetypes/contribution-jar/src/main/resources/archetype-resources/pom.xml @@ -42,7 +42,7 @@ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.5</version>
<scope>test</scope>
</dependency>
diff --git a/java/sca/archetypes/contribution-zip-discriptor/pom.xml b/java/sca/archetypes/contribution-zip-discriptor/pom.xml new file mode 100644 index 0000000000..2e39f23a9c --- /dev/null +++ b/java/sca/archetypes/contribution-zip-discriptor/pom.xml @@ -0,0 +1,33 @@ +<?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>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-sca</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>tuscany-zip-contribution-descriptor</artifactId>
+ <name>Tuscany SCA ZIP contribution Shared Assembly Descriptor</name>
+
+
+</project>
diff --git a/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml b/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml new file mode 100644 index 0000000000..134de76290 --- /dev/null +++ b/java/sca/archetypes/contribution-zip-discriptor/src/main/resources/assemblies/tuscany-zip-contribution.xml @@ -0,0 +1,21 @@ +<assembly>
+ <id>zip-contribution</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
diff --git a/java/sca/archetypes/contribution-zip/pom.xml b/java/sca/archetypes/contribution-zip/pom.xml index 2b93c1f2f6..e98f2ff845 100644 --- a/java/sca/archetypes/contribution-zip/pom.xml +++ b/java/sca/archetypes/contribution-zip/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> + <artifactId>tuscany-sca</artifactId> <version>2.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml b/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml index a8bbc9b0dc..35858670d2 100644 --- a/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml +++ b/java/sca/archetypes/contribution-zip/src/main/resources/archetype-resources/pom.xml @@ -7,116 +7,147 @@ * 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. + * 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"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <packaging>zip</packaging> - <version>${version}</version> - #literal()<!-- TODO project name --> - <name>quickstart</name> - <description></description> + <modelVersion>4.0.0</modelVersion> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <packaging>jar</packaging> + <version>${version}</version> + #literal() <!-- TODO project name --> + <name>quickstart</name> + <description></description> - <dependencies> - <!-- TUSCANY DEPENDENCIES --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>${tuscany.version}</version> - <scope>provided</scope> - </dependency> + <dependencies> + <!-- TUSCANY DEPENDENCIES --> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-sca-api</artifactId> + <version>${tuscany.version}</version> + <scope>provided</scope> + </dependency> - <!-- AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP --> - <dependency> - <groupId>commons-math</groupId> - <artifactId>commons-math</artifactId> - <version>1.2</version> - </dependency> + <!-- + AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP + --> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <!-- AN EXAMPLE APPLICATION DEPENDENCY TO BE INCLUDED IN ZIP --> + <dependency> + <groupId>commons-math</groupId> + <artifactId>commons-math</artifactId> + <version>1.2</version> + </dependency> - <!-- JUNIT DEPENDENCY FOR TESTING --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> + <!-- JUNIT DEPENDENCY FOR TESTING --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.5</version> + <scope>test</scope> + </dependency> - </dependencies> - <build> - <defaultGoal>install</defaultGoal> - <finalName>${artifactId}</finalName> - <resources> - <resource> - <filtering>false</filtering> - <directory>src/main/resources</directory> - </resource> - <resource> - <filtering>false</filtering> - <directory>src/main/java</directory> - <includes> - <include>**</include> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </resource> - </resources> - <testResources> - <testResource> - <filtering>false</filtering> - <directory>src/test/java</directory> - <includes> - <include>**</include> - </includes> - <excludes> - <exclude>**/*.java</exclude> - </excludes> - </testResource> - </testResources> - <plugins> - <plugin> - <inherited>true</inherited> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - <optimise>true</optimise> - <debug>true</debug> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <configuration> - <downloadSources>true</downloadSources> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-zip-plugin</artifactId> - <extensions>true</extensions> - </plugin> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - </plugin> - </plugins> - </build> - <properties> - <tuscany.version>2.0-SNAPSHOT</tuscany.version> - </properties> - #end + </dependencies> + <build> + <defaultGoal>install</defaultGoal> + <finalName>${artifactId}</finalName> + <resources> + <resource> + <filtering>false</filtering> + <directory>src/main/resources</directory> + </resource> + <resource> + <filtering>false</filtering> + <directory>src/main/java</directory> + <includes> + <include>**</include> + </includes> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <testResources> + <testResource> + <filtering>false</filtering> + <directory>src/test/java</directory> + <includes> + <include>**</include> + </includes> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + </testResources> + <plugins> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <optimise>true</optimise> + <debug>true</debug> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <downloadSources>true</downloadSources> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-3</version> + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-zip-contribution-descriptor</artifactId> + <version>${tuscany.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <!-- This is where we use our shared assembly descriptor --> + <descriptors> + <descriptor>tuscany-zip-contribution.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.tuscany.maven.plugins</groupId> + <artifactId>maven-tuscany-plugin</artifactId> + </plugin> + </plugins> + </build> + <properties> + <tuscany.version>2.0-SNAPSHOT</tuscany.version> + </properties> + #end </project>
\ No newline at end of file diff --git a/java/sca/archetypes/pom.xml b/java/sca/archetypes/pom.xml index b4b5be966c..3db873c0db 100644 --- a/java/sca/archetypes/pom.xml +++ b/java/sca/archetypes/pom.xml @@ -39,6 +39,7 @@ <modules>
<module>contribution-jar</module>
<module>contribution-zip</module>
+ <module>contribution-zip-discriptor</module>
<module>quickstart</module>
<module>quickstart-jsf</module>
<module>quickstart-stripes</module>
diff --git a/java/sca/archetypes/quickstart-jsf/pom.xml b/java/sca/archetypes/quickstart-jsf/pom.xml index bcdda4836b..a6711957fa 100644 --- a/java/sca/archetypes/quickstart-jsf/pom.xml +++ b/java/sca/archetypes/quickstart-jsf/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/java/sca/archetypes/quickstart-stripes/pom.xml b/java/sca/archetypes/quickstart-stripes/pom.xml index 69ef9c31a5..a9d1ba7431 100644 --- a/java/sca/archetypes/quickstart-stripes/pom.xml +++ b/java/sca/archetypes/quickstart-stripes/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/java/sca/archetypes/quickstart/pom.xml b/java/sca/archetypes/quickstart/pom.xml index 37f408868c..5500fc947d 100644 --- a/java/sca/archetypes/quickstart/pom.xml +++ b/java/sca/archetypes/quickstart/pom.xml @@ -21,7 +21,7 @@ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
+ <artifactId>tuscany-sca</artifactId>
<version>2.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
|