Permalink
Browse files

CDITCK-41 Cleanup CDI TCK dist

  • Loading branch information...
mkouba committed Jan 9, 2013
1 parent 0157e79 commit 17ef24bfe99355043b33d664fd668b769eafa4e5
View
@@ -0,0 +1,78 @@
+<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>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>17</version>
+ </parent>
+
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-dist-libs</artifactId>
+ <version>${cdi.tck.version}</version>
+ <packaging>pom</packaging>
+ <name>CDI TCK Distribution - Libraries</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <!-- Following configuration shouldn't be needed once the finalName property is fixed in weld-parent -->
+ <executions>
+ <execution>
+ <id>dist</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <finalName>${project.build.finalName}</finalName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeGroupIds>org.jboss.cdi.tck</excludeGroupIds>
+ <stripVersion>true</stripVersion>
+ <overWriteReleases>true</overWriteReleases>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-api</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-impl</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
@@ -0,0 +1,8 @@
+CDI TCK - Libraries
+===================
+
+Run the build to copy all CDI TCK dependencies into /target/dependency dir.
+
+Specify the version of CDI TCK explicitly.
+
+> mvn clean package -Dcdi.tck.version=1.1.0.Beta2
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly 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/assembly-1.1.1.xsd">
+
+ <id>dist</id>
+ <baseDirectory>/</baseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>false</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+</assembly>
View
@@ -15,6 +15,7 @@
<modules>
<module>porting-package</module>
+ <module>libs</module>
</modules>
<dependencies>
@@ -31,6 +32,13 @@
<classifier>sources</classifier>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-api</artifactId>
+ <version>${cdi.tck.version}</version>
+ <classifier>javadoc</classifier>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.jboss.cdi.tck</groupId>
<artifactId>cdi-tck-reference-guide</artifactId>
@@ -115,14 +123,14 @@
<type>sig</type>
<optional>true</optional>
</dependency>
- <!-- dependency>
+ <dependency>
<groupId>org.jboss.cdi.tck</groupId>
<artifactId>cdi-tck-impl</artifactId>
<version>${cdi.tck.version}</version>
<classifier>sigtest-jdk7</classifier>
<type>sig</type>
<optional>true</optional>
- </dependency-->
+ </dependency>
<dependency>
<groupId>org.jboss.cdi.tck</groupId>
<artifactId>cdi-tck-dist-porting-package</artifactId>
@@ -131,6 +139,14 @@
<optional>true</optional>
<classifier>dist</classifier>
</dependency>
+ <dependency>
+ <groupId>org.jboss.cdi.tck</groupId>
+ <artifactId>cdi-tck-dist-libs</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <optional>true</optional>
+ <classifier>dist</classifier>
+ </dependency>
</dependencies>
<build>
Oops, something went wrong.

0 comments on commit 17ef24b

Please sign in to comment.