Author: [email protected]
Date: Wed Oct 26 13:51:36 2011
New Revision: 1649
Log:
[AMDATUAUTH-108] Fixed release artifact
Modified:
trunk/amdatu-auth/pom.xml
trunk/amdatu-auth/release/pom.xml
trunk/amdatu-auth/release/src/main/assembly/bin-component.xml
Modified: trunk/amdatu-auth/pom.xml
==============================================================================
--- trunk/amdatu-auth/pom.xml (original)
+++ trunk/amdatu-auth/pom.xml Wed Oct 26 13:51:36 2011
@@ -147,6 +147,20 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
@@ -166,6 +180,13 @@
<scope>provided</scope>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.example</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
<!-- Dependency setup for amdatu-core project -->
<dependency>
Modified: trunk/amdatu-auth/release/pom.xml
==============================================================================
--- trunk/amdatu-auth/release/pom.xml (original)
+++ trunk/amdatu-auth/release/pom.xml Wed Oct 26 13:51:36 2011
@@ -28,6 +28,12 @@
<name>Amdatu Auth - release</name>
<description>Release module for the Amdatu Auth project.</description>
+ <properties>
+ <amdatu.http.hostname>localhost</amdatu.http.hostname>
+ <amdatu.http.port>8080</amdatu.http.port>
+ <amdatu.https.port>8081</amdatu.https.port>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.amdatu.auth</groupId>
@@ -55,19 +61,31 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.consumerregistry</artifactId>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.example</artifactId>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.oauth.store.consumer.fs</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.server</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.consumer.mem</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <artifactId>org.amdatu.auth.oauth.store.nonce.mem</artifactId>
<scope>runtime</scope>
<type>bundle</type>
</dependency>
@@ -79,6 +97,18 @@
</dependency>
<dependency>
<groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.oauth.server</artifactId>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.tokenprovider</artifactId>
+ <scope>runtime</scope>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
<artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
<scope>runtime</scope>
<type>bundle</type>
@@ -107,6 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
<executions>
<execution>
<id>create-release</id>
Modified: trunk/amdatu-auth/release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-auth/release/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-auth/release/src/main/assembly/bin-component.xml Wed Oct
26 13:51:36 2011
@@ -23,15 +23,11 @@
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.amdatu.auth:org.amdatu.auth.login.service</include>
- <include>org.amdatu.auth:org.amdatu.auth.oauth.api</include>
- <include>org.amdatu.auth:org.amdatu.auth.oauth.client</include>
- <include>org.amdatu.auth:org.amdatu.auth.oauth.server</include>
-
<include>org.amdatu.auth:org.amdatu.auth.oauth.store.consumer.fs</include>
- <include>org.amdatu.auth:org.amdatu.auth.tokenprovider</include>
- <include>org.amdatu.auth:org.amdatu.auth.tokenstore.mem</include>
- <include>org.amdatu.auth:org.amdatu.auth.useradmin.rest</include>
+ <include>org.amdatu.auth:*</include>
</includes>
+ <excludes>
+ <exclude>org.amdatu.auth:org.amdatu.auth.config</exclude>
+ </excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
@@ -44,6 +40,7 @@
</includes>
<unpack>true</unpack>
<unpackOptions>
+ <filtered>true</filtered>
<includes>
<include>*.cfg</include>
</includes>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
