Author: ivol37 at gmail.com
Date: Thu Nov 11 15:11:39 2010
New Revision: 406
Log:
[AMDATU-167] Fixed incorrect group ids and artifact ids used in release pom and
assembly
Modified:
trunk/amdatu-release/pom.xml
trunk/amdatu-release/src/main/assembly/bin-release.xml
Modified: trunk/amdatu-release/pom.xml
==============================================================================
--- trunk/amdatu-release/pom.xml (original)
+++ trunk/amdatu-release/pom.xml Thu Nov 11 15:11:39 2010
@@ -240,10 +240,16 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.bundle</artifactId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
<version>${org.apache.felix.http.version}</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.whiteboard</artifactId>
+ <version>${org.apache.felix.http.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.swissbox</groupId>
<artifactId>pax-swissbox-core</artifactId>
Modified: trunk/amdatu-release/src/main/assembly/bin-release.xml
==============================================================================
--- trunk/amdatu-release/src/main/assembly/bin-release.xml (original)
+++ trunk/amdatu-release/src/main/assembly/bin-release.xml Thu Nov 11
15:11:39 2010
@@ -16,32 +16,30 @@
<outputDirectory>amdatu-application</outputDirectory>
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.amdatu.application:*</include>
+ <include>org.amdatu.authorization:*</include>
+ <include>org.amdatu.authorization.*:*</include>
+ <include>org.amdatu.opensocial:*</include>
+ <include>org.amdatu.opensocial.*:*</include>
+ <include>org.amdatu.semanticweb:*</include>
+ <include>org.amdatu.semanticweb.*:*</include>
+ <include>org.amdatu.web:*</include>
+ <include>org.amdatu.web.*:*</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
<dependencySet>
+ <scope>runtime</scope>
<outputDirectory>amdatu-examples</outputDirectory>
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.amdatu.example:*</include>
+ <include>org.amdatu.example.*:*</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
-
- <dependencySet>
- <scope>runtime</scope>
- <outputDirectory>gadget-bundles</outputDirectory>
-
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
- <includes>
- <include>org.amdatu.gadget:*</include>
- </includes>
- <unpack>false</unpack>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
+ </dependencySet>
<dependencySet>
<scope>runtime</scope>
@@ -49,6 +47,7 @@
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.amdatu.core:*</include>
+ <include>org.amdatu.core.*:*</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
@@ -62,6 +61,8 @@
<include>org.apache.sling:*</include>
<include>org.ops4j.pax.web:*</include>
<include>org.ops4j.pax.useradmin:*</include>
+ <include>org.ops4j.pax.swissbox:*</include>
+ <include>org.ops4j.base:*</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
