[weld-commits] Weld SVN: r5004 - in core/branches: 1.0.0 and 2 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Nov 12 18:46:37 EST 2009
Author: rogerk
Date: 2009-11-12 18:46:37 -0500 (Thu, 12 Nov 2009)
New Revision: 5004
Added:
core/branches/1.0.0/
core/branches/1.0.0/bom/pom.xml
core/branches/1.0.0/osgi-bundle/pom.xml
core/branches/1.0.0/pom.xml
Removed:
core/branches/1.0.0/bom/pom.xml
core/branches/1.0.0/osgi-bundle/pom.xml
core/branches/1.0.0/pom.xml
Log:
[maven-release-plugin] copy for branch 1.0.0
Copied: core/branches/1.0.0 (from rev 4920, core/tags/1.0.0)
Deleted: core/branches/1.0.0/bom/pom.xml
===================================================================
--- core/tags/1.0.0/bom/pom.xml 2009-11-10 00:14:11 UTC (rev 4920)
+++ core/branches/1.0.0/bom/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -1,183 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-bom</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>6</version>
- </parent>
-
- <name>Weld Core BOM</name>
- <url>http://www.seamframework.org/Weld</url>
-
- <!-- Minimal project metadata, for more see parent/pom.xml -->
- <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <distribution>repo</distribution>
- <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
- </license>
- </licenses>
-
- <developers>
- <developer>
- <name>Weld committers</name>
- </developer>
- </developers>
-
- <!-- Dependency management, including extra repositories if needed -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Release Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <properties>
- <weld.api.version>1.0</weld.api.version>
- <google.collections.version>1.0-rc3</google.collections.version>
- <javassist.version>3.11.0.GA</javassist.version>
- <cdi.tck.version>1.0.0-CR7</cdi.tck.version>
- <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
- <jboss.interceptor.version>1.0.0-CR8</jboss.interceptor.version>
- <slf4j.version>1.5.9.RC1</slf4j.version>
- <cal10n.version>0.7.2</cal10n.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-bom</artifactId>
- <version>${weld.api.version}</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-porting-package</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-test</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <version>${cdi.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <version>${cdi.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.atinject</groupId>
- <artifactId>inject-tck</artifactId>
- <version>${atinject.tck.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- <version>${jboss.interceptor.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${google.collections.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-ext</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ch.qos</groupId>
- <artifactId>cal10n-api</artifactId>
- <version>${cal10n.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/bom</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/core/bom</url>
- </scm>
-
-</project>
Copied: core/branches/1.0.0/bom/pom.xml (from rev 5003, core/tags/1.0.0/bom/pom.xml)
===================================================================
--- core/branches/1.0.0/bom/pom.xml (rev 0)
+++ core/branches/1.0.0/bom/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -0,0 +1,183 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-bom</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>6</version>
+ </parent>
+
+ <name>Weld Core BOM</name>
+ <url>http://www.seamframework.org/Weld</url>
+
+ <!-- Minimal project metadata, for more see parent/pom.xml -->
+ <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <distribution>repo</distribution>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Weld committers</name>
+ </developer>
+ </developers>
+
+ <!-- Dependency management, including extra repositories if needed -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Release Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <properties>
+ <weld.api.version>1.0</weld.api.version>
+ <google.collections.version>1.0-rc3</google.collections.version>
+ <javassist.version>3.11.0.GA</javassist.version>
+ <cdi.tck.version>1.0.0-CR7</cdi.tck.version>
+ <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
+ <jboss.interceptor.version>1.0.0-CR8</jboss.interceptor.version>
+ <slf4j.version>1.5.9.RC1</slf4j.version>
+ <cal10n.version>0.7.2</cal10n.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api-bom</artifactId>
+ <version>${weld.api.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-porting-package</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <version>${cdi.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.atinject</groupId>
+ <artifactId>inject-tck</artifactId>
+ <version>${atinject.tck.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ <version>${jboss.interceptor.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ <version>${google.collections.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-ext</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>ch.qos</groupId>
+ <artifactId>cal10n-api</artifactId>
+ <version>${cal10n.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0/bom</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0/bom</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0/core/bom</url>
+ </scm>
+
+</project>
Deleted: core/branches/1.0.0/osgi-bundle/pom.xml
===================================================================
--- core/tags/1.0.0/osgi-bundle/pom.xml 2009-11-10 00:14:11 UTC (rev 4920)
+++ core/branches/1.0.0/osgi-bundle/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -1,185 +0,0 @@
-
- <!--
- /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
- Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
- * Use is subject to license terms. * * 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/maven-v4_0_0.xsd">
- <parent>
- <artifactId>weld-core-parent</artifactId>
- <groupId>org.jboss.weld</groupId>
- <version>1.0.0</version>
- <relativePath>../parent/pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-osgi-bundle</artifactId>
- <name>Weld OSGi Bundle</name>
- <description>Weld runtime packaged as an OSGi bundle</description>
-
- <developers>
- <developer>
- <id>ss141213</id>
- <name>Sanjeeb Sahoo</name>
- <url>http://weblogs.dev.java.net/ss141213</url>
- <organization>Sun Microsystems, Inc.</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <name>Roger Kitain</name>
- <id>rogerk</id>
- <organization>Sun Microsystems, Inc.</organization>
- </developer>
- </developers>
-
- <properties>
- <osgi.version>1.0</osgi.version>
- </properties>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <_include>-osgi.bundle</_include>
-
- <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
-
- <_exportcontents>
- javax.inject;
- javax.enterprise.*;
- version=${osgi.version},
- org.jboss.weld.context;
- org.jboss.weld.ejb;
- org.jboss.weld.bean;
- org.jboss.weld.bean.proxy;
- org.jboss.weld.*.api.*;
- org.jboss.weld.*.spi.*;
- org.jboss.weld.conversation;
- org.jboss.weld;
- org.jboss.weld.bootstrap;
- org.jboss.weld.introspector;
- org.jboss.weld.servlet;
- org.jboss.interceptor.*;
- version=${osgi.version},
- org.jboss.weld.el;
- version=${osgi.version},
- org.jboss.weld.jsf;
- include:="WeldPhaseListener";
- version=${osgi.version},
- javassist.util.proxy;version=${javassist.version}
- </_exportcontents>
-
- <!-- A note about how slf4j is handled:
- We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
- We also bundle them privately along with the jdk14-logging binding.
- This allows us to function even when there is no separate slf4j bundle.
- When there is a separate slf4j bundle, because of our optional Import-Package header,
- we will get wired to that bundle. Please also note that we don't import impl package,
- as it is sufficient to import just the api. In some other environment, user can
- deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
- a fragement which attaches itself to the api bundle. We will get wired to the
- api bundle and everything will work.
- We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
- on foreign bundles.
- -->
- <Import-Package>
- org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
- ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
- javax.interceptor.*, *;
- resolution:=optional
- </Import-Package>
-
- <Private-Package>
- !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
- </Private-Package>
-
- </instructions>
-
- <!--
- Maven uses the output directory (target/classes)
- rather than the final bundle, when compiling against
- projects in the same reactor (ie. the same build).
- Since this jar comprises of classes that come from
- some other jar and other modules may depend on this
- artifact, we need to unpack.
- -->
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <goals>
- <goal>bundle</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-spi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor</artifactId>
- </dependency>
-
- <!-- We bundle jdk binding inside this OSGi bundle -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
-</project>
Copied: core/branches/1.0.0/osgi-bundle/pom.xml (from rev 5003, core/tags/1.0.0/osgi-bundle/pom.xml)
===================================================================
--- core/branches/1.0.0/osgi-bundle/pom.xml (rev 0)
+++ core/branches/1.0.0/osgi-bundle/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -0,0 +1,186 @@
+
+ <!--
+ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * *
+ Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved. *
+ * Use is subject to license terms. * * 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/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>weld-core-parent</artifactId>
+ <groupId>org.jboss.weld</groupId>
+ <version>1.0.0</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-osgi-bundle</artifactId>
+ <name>Weld OSGi Bundle</name>
+ <description>Weld runtime packaged as an OSGi bundle</description>
+
+ <developers>
+ <developer>
+ <id>ss141213</id>
+ <name>Sanjeeb Sahoo</name>
+ <url>http://weblogs.dev.java.net/ss141213</url>
+ <organization>Sun Microsystems, Inc.</organization>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Roger Kitain</name>
+ <id>rogerk</id>
+ <organization>Sun Microsystems, Inc.</organization>
+ </developer>
+ </developers>
+
+ <properties>
+ <osgi.version>1.0</osgi.version>
+ </properties>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <_include>-osgi.bundle</_include>
+
+ <Embed-Dependency>*; scope=compile; inline=true, slf4j-jdk14; inline=true</Embed-Dependency>
+
+ <_exportcontents>
+ javax.inject;
+ javax.enterprise.*;
+ javax.decorator.*;
+ version=${osgi.version},
+ org.jboss.weld.context;
+ org.jboss.weld.ejb;
+ org.jboss.weld.bean;
+ org.jboss.weld.bean.proxy;
+ org.jboss.weld.*.api.*;
+ org.jboss.weld.*.spi.*;
+ org.jboss.weld.conversation;
+ org.jboss.weld;
+ org.jboss.weld.bootstrap;
+ org.jboss.weld.introspector;
+ org.jboss.weld.servlet;
+ org.jboss.interceptor.*;
+ version=${osgi.version},
+ org.jboss.weld.el;
+ version=${osgi.version},
+ org.jboss.weld.jsf;
+ include:="WeldPhaseListener";
+ version=${osgi.version},
+ javassist.util.proxy;version=${javassist.version}
+ </_exportcontents>
+
+ <!-- A note about how slf4j is handled:
+ We optionally import slf4j APIs (i.e. packages that are part of slf4j-api.jar).
+ We also bundle them privately along with the jdk14-logging binding.
+ This allows us to function even when there is no separate slf4j bundle.
+ When there is a separate slf4j bundle, because of our optional Import-Package header,
+ we will get wired to that bundle. Please also note that we don't import impl package,
+ as it is sufficient to import just the api. In some other environment, user can
+ deploy slf4j-api bundle and their desired binding bundle. The binding bundle is
+ a fragement which attaches itself to the api bundle. We will get wired to the
+ api bundle and everything will work.
+ We also bundle all the slf4j extension and cal10n stuff to avoid having dependency
+ on foreign bundles.
+ -->
+ <Import-Package>
+ org.slf4j; org.slf4j.spi; org.slf4j.helpers; version=${slf4j.version}; resolution:=optional,
+ ch.qos.cal10n; version=${cal10n.version}; resolution:=optional,
+ javax.interceptor.*, *;
+ resolution:=optional
+ </Import-Package>
+
+ <Private-Package>
+ !javax.interceptor.*, org.slf4j.*; -split-package:=merge-first, ch.qos.cal10n.*
+ </Private-Package>
+
+ </instructions>
+
+ <!--
+ Maven uses the output directory (target/classes)
+ rather than the final bundle, when compiling against
+ projects in the same reactor (ie. the same build).
+ Since this jar comprises of classes that come from
+ some other jar and other modules may depend on this
+ artifact, we need to unpack.
+ -->
+ <unpackBundle>true</unpackBundle>
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor</artifactId>
+ </dependency>
+
+ <!-- We bundle jdk binding inside this OSGi bundle -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Deleted: core/branches/1.0.0/pom.xml
===================================================================
--- core/tags/1.0.0/pom.xml 2009-11-10 00:14:11 UTC (rev 4920)
+++ core/branches/1.0.0/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -1,76 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-build-aggregator</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0</version>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>6</version>
- </parent>
-
- <name>Weld Build Aggregator</name>
-
- <!-- Minimal metadata -->
- <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
-
- <!-- SCM and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</url>
- </scm>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
- <module>osgi-bundle</module>
- </modules>
- </profile>
- <profile>
- <id>skip-tests</id>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>impl</module>
- <module>osgi-bundle</module>
- </modules>
- </profile>
- </profiles>
-
- <!-- Minimal build configuration -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase>
- <!-- As we need access to our own artifacts -->
- <preparationGoals>install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: core/branches/1.0.0/pom.xml (from rev 5003, core/tags/1.0.0/pom.xml)
===================================================================
--- core/branches/1.0.0/pom.xml (rev 0)
+++ core/branches/1.0.0/pom.xml 2009-11-12 23:46:37 UTC (rev 5004)
@@ -0,0 +1,76 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-core-build-aggregator</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0</version>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>6</version>
+ </parent>
+
+ <name>Weld Build Aggregator</name>
+
+ <!-- Minimal metadata -->
+ <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description>
+
+ <!-- SCM and distribution management -->
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0</developerConnection>
+ <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0</url>
+ </scm>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>tests</module>
+ <module>porting-package</module>
+ <module>inject-tck-runner</module>
+ <module>jboss-tck-runner</module>
+ <module>osgi-bundle</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>skip-tests</id>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>impl</module>
+ <module>osgi-bundle</module>
+ </modules>
+ </profile>
+ </profiles>
+
+ <!-- Minimal build configuration -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase>
+ <!-- As we need access to our own artifacts -->
+ <preparationGoals>install</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
More information about the weld-commits
mailing list