Weld SVN: r4000 - core/trunk/jboss-tck-runner/src/main/assembly.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 20:11:04 -0400 (Mon, 12 Oct 2009)
New Revision: 4000
Modified:
core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml
Log:
minor
Modified: core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml 2009-10-13 00:10:48 UTC (rev 3999)
+++ core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml 2009-10-13 00:11:04 UTC (rev 4000)
@@ -17,7 +17,7 @@
<include>src/**</include>
<include>pom.xml</include>
</includes>
- <outputDirectory>/weld-tck-runner</outputDirectory>
+ <outputDirectory>/jboss-tck-runner</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.basedir}/../jboss-as</directory>
15 years, 1 month
Weld SVN: r3999 - in cdi-tck/trunk: dist and 6 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 20:10:48 -0400 (Mon, 12 Oct 2009)
New Revision: 3999
Added:
cdi-tck/trunk/dist/porting-package/
cdi-tck/trunk/dist/porting-package/pom.xml
cdi-tck/trunk/dist/porting-package/src/
cdi-tck/trunk/dist/porting-package/src/main/
cdi-tck/trunk/dist/porting-package/src/main/assembly/
cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml
Modified:
cdi-tck/trunk/dist/pom.xml
cdi-tck/trunk/dist/src/main/assembly/assembly.xml
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
cdi-tck/trunk/pom.xml
Log:
CDITCK-5
Modified: cdi-tck/trunk/dist/pom.xml
===================================================================
--- cdi-tck/trunk/dist/pom.xml 2009-10-13 00:07:35 UTC (rev 3998)
+++ cdi-tck/trunk/dist/pom.xml 2009-10-13 00:10:48 UTC (rev 3999)
@@ -5,41 +5,55 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-dist</artifactId>
<packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>JSR-299 TCK Distribution</name>
+
+ <properties>
+ <weld.version>1.0.0-SNAPSHOT</weld.version>
+ </properties>
+
+ <modules>
+ <module>porting-package</module>
+ </modules>
<dependencies>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-api</artifactId>
<version>${project.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-api</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-reference-guide</artifactId>
<version>${project.version}</version>
<type>war</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-impl</artifactId>
<version>${project.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-impl</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -47,6 +61,7 @@
<version>${project.version}</version>
<classifier>audit-cdi</classifier>
<type>xml</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -54,6 +69,7 @@
<version>${project.version}</version>
<classifier>audit-mb</classifier>
<type>xml</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -61,6 +77,7 @@
<version>${project.version}</version>
<classifier>suite</classifier>
<type>xml</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -68,6 +85,7 @@
<version>${project.version}</version>
<classifier>coverage-cdi</classifier>
<type>html</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -75,18 +93,19 @@
<version>${project.version}</version>
<classifier>coverage-mb</classifier>
<type>html</type>
+ <optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-dist-porting-package</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ <optional>true</optional>
+ <classifier>dist</classifier>
+ </dependency>
</dependencies>
<build>
- <defaultGoal>deploy</defaultGoal>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
Property changes on: cdi-tck/trunk/dist/porting-package
___________________________________________________________________
Name: svn:ignore
+ target
Added: cdi-tck/trunk/dist/porting-package/pom.xml
===================================================================
--- cdi-tck/trunk/dist/porting-package/pom.xml (rev 0)
+++ cdi-tck/trunk/dist/porting-package/pom.xml 2009-10-13 00:10:48 UTC (rev 3999)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <parent>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-dist-porting-package</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>JSR-299 TCK Distribution - Weld Porting Package</name>
+
+ <properties>
+ <weld.version>1.0.0-SNAPSHOT</weld.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-jboss-tck-runner</artifactId>
+ <version>${weld.version}</version>
+ <optional>true</optional>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <finalName>jsr299-tck-porting-package-${project.version}</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </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</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-jboss-tck-runner</artifactId>
+ <version>${weld.version}</version>
+ <classifier>dist</classifier>
+ <type>zip</type>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml
===================================================================
--- cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml (rev 0)
+++ cdi-tck/trunk/dist/porting-package/src/main/assembly/assembly.xml 2009-10-13 00:10:48 UTC (rev 3999)
@@ -0,0 +1,28 @@
+<?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>
+ <directory>${project.build.directory}/dependency</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <outputDirectory>/porting-package-lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Modified: cdi-tck/trunk/dist/src/main/assembly/assembly.xml
===================================================================
--- cdi-tck/trunk/dist/src/main/assembly/assembly.xml 2009-10-13 00:07:35 UTC (rev 3998)
+++ cdi-tck/trunk/dist/src/main/assembly/assembly.xml 2009-10-13 00:10:48 UTC (rev 3999)
@@ -2,7 +2,7 @@
<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.0.xsd
+ http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.1.xsd
">
<id>dist</id>
<baseDirectory>jsr299-tck-${project.version}</baseDirectory>
@@ -36,6 +36,7 @@
<exclude>org.jboss.jsr299.tck:jsr299-tck-impl</exclude>
<exclude>org.jboss.jsr299.tck:jsr299-tck-api</exclude>
<exclude>org.jboss.jsr299.tck:jsr299-tck-reference-guide</exclude>
+ <exclude>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</exclude>
</excludes>
<useTransitiveDependencies>true</useTransitiveDependencies>
<outputDirectory>lib</outputDirectory>
@@ -43,6 +44,15 @@
</dependencySet>
<dependencySet>
<includes>
+ <include>org.jboss.jsr299.tck:jsr299-tck-dist-porting-package</include>
+ </includes>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <outputDirectory>/weld</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <includes>
<include>org.jboss.jsr299.tck:jsr299-tck-reference-guide</include>
</includes>
<unpack>true</unpack>
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-13 00:07:35 UTC (rev 3998)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/DecoratorInvocationTest.java 2009-10-13 00:10:48 UTC (rev 3999)
@@ -51,7 +51,6 @@
getInstanceByType(CowShed.class).milk();
assert TimestampLogger.getMessage().equals(CowShed.MESSAGE);
assert MockLogger.getMessage().equals(TimestampLogger.PREFIX + CowShed.MESSAGE);
- assert !TimestampLogger.isInitializeCalled();
assert MockLogger.isInitializeCalled();
}
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-10-13 00:07:35 UTC (rev 3998)
+++ cdi-tck/trunk/pom.xml 2009-10-13 00:10:48 UTC (rev 3999)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>2-SNAPSHOT</version>
</parent>
<!-- Metadata -->
15 years, 1 month
Weld SVN: r3998 - in core/trunk/jboss-tck-runner: src/main and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 20:07:35 -0400 (Mon, 12 Oct 2009)
New Revision: 3998
Added:
core/trunk/jboss-tck-runner/src/main/assembly/
core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml
Modified:
core/trunk/jboss-tck-runner/pom.xml
Log:
add assembly for tck-runner, allowing reuse
Modified: core/trunk/jboss-tck-runner/pom.xml
===================================================================
--- core/trunk/jboss-tck-runner/pom.xml 2009-10-12 23:20:32 UTC (rev 3997)
+++ core/trunk/jboss-tck-runner/pom.xml 2009-10-13 00:07:35 UTC (rev 3998)
@@ -31,11 +31,13 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<classifier>jdk15</classifier>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.test-harness</groupId>
<artifactId>jboss-test-harness-jboss-as-52</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -113,6 +115,24 @@
<outputName>test-report</outputName>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Added: core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml (rev 0)
+++ core/trunk/jboss-tck-runner/src/main/assembly/assembly.xml 2009-10-13 00:07:35 UTC (rev 3998)
@@ -0,0 +1,32 @@
+<?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>
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>src/**</include>
+ <include>pom.xml</include>
+ </includes>
+ <outputDirectory>/weld-tck-runner</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/../jboss-as</directory>
+ <includes>
+ <include>build.properties</include>
+ <include>build.xml</include>
+ </includes>
+ <outputDirectory>/jboss-as</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+</assembly>
15 years, 1 month
Weld SVN: r3997 - api/trunk/cdi.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:20:32 -0400 (Mon, 12 Oct 2009)
New Revision: 3997
Modified:
api/trunk/cdi/pom.xml
Log:
ws
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
+++ api/trunk/cdi/pom.xml 2009-10-12 23:20:32 UTC (rev 3997)
@@ -1,36 +1,37 @@
-<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>
+<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>
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-api-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-api-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
- </parent>
+ </parent>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <packaging>jar</packaging>
-
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <packaging>jar</packaging>
+
<name>CDI APIs</name>
- <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description>
+ <description>APIs for JSR-299: Contexts and Dependency Injection for Java EE</description>
- <dependencies>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
<optional>true</optional>
- </dependency>
-
- <dependency>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-api</artifactId>
<optional>true</optional>
</dependency>
-
+
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
</dependency>
- </dependencies>
+ </dependencies>
</project>
15 years, 1 month
Weld SVN: r3996 - in api/trunk: bom and 4 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:15:28 -0400 (Mon, 12 Oct 2009)
New Revision: 3996
Modified:
api/trunk/bom/pom.xml
api/trunk/cdi/pom.xml
api/trunk/parent/pom.xml
api/trunk/pom.xml
api/trunk/weld-spi/pom.xml
api/trunk/weld/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-12 23:15:15 UTC (rev 3995)
+++ api/trunk/bom/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0-CR1</version>
+ <version>1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -223,11 +223,4 @@
</dependencies>
</dependencyManagement>
-
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0-CR1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR1</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld/api/tags/1.0-CR1/build/tags/weld-par...</url>
- </scm>
</project>
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-10-12 23:15:15 UTC (rev 3995)
+++ api/trunk/cdi/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
- <version>1.0-CR1</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-10-12 23:15:15 UTC (rev 3995)
+++ api/trunk/parent/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-CR1</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../bom</relativePath>
</parent>
<groupId>org.jboss.weld</groupId>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-12 23:15:15 UTC (rev 3995)
+++ api/trunk/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0-CR1</version>
+ <version>1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -18,9 +18,9 @@
<!-- SCM and Distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0-CR1</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR1</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR1</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld</url>
</scm>
<modules>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2009-10-12 23:15:15 UTC (rev 3995)
+++ api/trunk/weld/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-CR1</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: api/trunk/weld-spi/pom.xml
===================================================================
--- api/trunk/weld-spi/pom.xml 2009-10-12 23:15:15 UTC (rev 3995)
+++ api/trunk/weld-spi/pom.xml 2009-10-12 23:15:28 UTC (rev 3996)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-CR1</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 1 month
Weld SVN: r3995 - api/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:15:15 -0400 (Mon, 12 Oct 2009)
New Revision: 3995
Added:
api/tags/1.0-CR1/
Log:
[maven-scm] copy for tag 1.0-CR1
Copied: api/tags/1.0-CR1 (from rev 3994, api/trunk)
15 years, 1 month
Weld SVN: r3994 - in api/trunk: bom and 4 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:14:55 -0400 (Mon, 12 Oct 2009)
New Revision: 3994
Modified:
api/trunk/bom/pom.xml
api/trunk/cdi/pom.xml
api/trunk/parent/pom.xml
api/trunk/pom.xml
api/trunk/weld-spi/pom.xml
api/trunk/weld/pom.xml
Log:
[maven-release-plugin] prepare release 1.0-CR1
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
+++ api/trunk/bom/pom.xml 2009-10-12 23:14:55 UTC (rev 3994)
@@ -1,10 +1,9 @@
-<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">
+<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-api-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR1</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -225,4 +224,10 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0-CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR1</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/api/tags/1.0-CR1/build/tags/weld-par...</url>
+ </scm>
</project>
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
+++ api/trunk/cdi/pom.xml 2009-10-12 23:14:55 UTC (rev 3994)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR1</version>
<relativePath>../parent</relativePath>
</parent>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
+++ api/trunk/parent/pom.xml 2009-10-12 23:14:55 UTC (rev 3994)
@@ -1,10 +1,9 @@
-<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">
+<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>
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR1</version>
<relativePath>../bom</relativePath>
</parent>
<groupId>org.jboss.weld</groupId>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
+++ api/trunk/pom.xml 2009-10-12 23:14:55 UTC (rev 3994)
@@ -1,10 +1,9 @@
-<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">
+<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-api-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR1</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -19,9 +18,9 @@
<!-- SCM and Distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0-CR1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR1</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR1</url>
</scm>
<modules>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
+++ api/trunk/weld/pom.xml 2009-10-12 23:14:55 UTC (rev 3994)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR1</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: api/trunk/weld-spi/pom.xml
===================================================================
--- api/trunk/weld-spi/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
+++ api/trunk/weld-spi/pom.xml 2009-10-12 23:14:55 UTC (rev 3994)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR1</version>
<relativePath>../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
15 years, 1 month
Weld SVN: r3993 - api/trunk/bom.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:12:18 -0400 (Mon, 12 Oct 2009)
New Revision: 3993
Modified:
api/trunk/bom/pom.xml
Log:
have to use project.version
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-12 23:08:34 UTC (rev 3992)
+++ api/trunk/bom/pom.xml 2009-10-12 23:12:18 UTC (rev 3993)
@@ -73,8 +73,6 @@
</repositories>
<properties>
- <cdi.api.version>${project.version}</cdi.api.version>
- <weld.api.version>${project.version}</weld.api.version>
<atinject.api.version>1.0-PFD-1</atinject.api.version>
<ejb.api.version>3.1.0-Alpha1</ejb.api.version>
<jsr250.api.version>1.0</jsr250.api.version>
@@ -197,19 +195,19 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi.api.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api</artifactId>
- <version>${weld.api.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-spi</artifactId>
- <version>${weld.api.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
15 years, 1 month
Weld SVN: r3992 - in api/trunk: bom and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-12 19:08:34 -0400 (Mon, 12 Oct 2009)
New Revision: 3992
Modified:
api/trunk/bom/pom.xml
api/trunk/pom.xml
Log:
cleanup pom, switch to parent-2
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-10-12 23:03:05 UTC (rev 3991)
+++ api/trunk/bom/pom.xml 2009-10-12 23:08:34 UTC (rev 3992)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>2</version>
</parent>
<name>Weld and CDI APIs BOM</name>
@@ -88,7 +88,7 @@
<uel.api.version>2.1.2-b04</uel.api.version>
<jsf.api.version>1.2_13</jsf.api.version>
<jaxws.api.version>2.1</jaxws.api.version>
- <interceptor.api.version>3.1.0-SNAPSHOT</interceptor.api.version>
+ <interceptor.api.version>3.1.0-CR1</interceptor.api.version>
</properties>
<dependencyManagement>
@@ -227,48 +227,4 @@
</dependencies>
</dependencyManagement>
- <!-- The release profile -->
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0.0-alpha-4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <!-- SCM info and distribution management -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk/bom</developerConnection>
- </scm>
-
- <distributionManagement>
- <repository>
- <id>oss.sonatype.org/jboss-staging</id>
- <name>Sonatype Nexus Maven Repository</name>
- <url>http://oss.sonatype.org/service/local/staging/deploy/maven2</url>
- </repository>
- <snapshotRepository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>Sonatype Nexus Snapshot Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-10-12 23:03:05 UTC (rev 3991)
+++ api/trunk/pom.xml 2009-10-12 23:08:34 UTC (rev 3992)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>2-SNAPSHOT</version>
+ <version>2</version>
</parent>
<name>Weld and CDI APIs Build Aggregator</name>
15 years, 1 month