You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/04/05 04:29:11 UTC
svn commit: r1088854 - in /myfaces/shared/trunk: core/pom.xml pom.xml
shared-html5/pom.xml shared-impl/pom.xml shared-tomahawk/pom.xml
Author: lu4242
Date: Tue Apr 5 02:29:11 2011
New Revision: 1088854
URL: http://svn.apache.org/viewvc?rev=1088854&view=rev
Log:
revert release due to error on javax.faces.FactoryFinder
Modified:
myfaces/shared/trunk/core/pom.xml
myfaces/shared/trunk/pom.xml
myfaces/shared/trunk/shared-html5/pom.xml
myfaces/shared/trunk/shared-impl/pom.xml
myfaces/shared/trunk/shared-tomahawk/pom.xml
Modified: myfaces/shared/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/pom.xml?rev=1088854&r1=1088853&r2=1088854&view=diff
==============================================================================
--- myfaces/shared/trunk/core/pom.xml (original)
+++ myfaces/shared/trunk/core/pom.xml Tue Apr 5 02:29:11 2011
@@ -20,7 +20,7 @@
<parent>
<artifactId>myfaces-shared-project</artifactId>
<groupId>org.apache.myfaces.shared</groupId>
- <version>4.0.7-SNAPSHOT</version>
+ <version>4.0.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: myfaces/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/pom.xml?rev=1088854&r1=1088853&r2=1088854&view=diff
==============================================================================
--- myfaces/shared/trunk/pom.xml (original)
+++ myfaces/shared/trunk/pom.xml Tue Apr 5 02:29:11 2011
@@ -47,7 +47,7 @@
<artifactId>myfaces-shared-project</artifactId>
<packaging>pom</packaging>
<name>Apache MyFaces Shared For JSF 2.0 - Project</name>
- <version>4.0.7-SNAPSHOT</version>
+ <version>4.0.6-SNAPSHOT</version>
<description>Provides common classes for use in various MyFaces projects.</description>
<url>http://myfaces.apache.org/shared20</url>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-core</artifactId>
- <version>4.0.7-SNAPSHOT</version>
+ <version>4.0.6-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: myfaces/shared/trunk/shared-html5/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-html5/pom.xml?rev=1088854&r1=1088853&r2=1088854&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-html5/pom.xml (original)
+++ myfaces/shared/trunk/shared-html5/pom.xml Tue Apr 5 02:29:11 2011
@@ -1,196 +1,196 @@
-<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">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you 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.
--->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-project</artifactId>
- <version>4.0.7-SNAPSHOT</version>
- </parent>
-
- <artifactId>myfaces-shared-html5</artifactId>
- <packaging>jar</packaging>
- <name>MyFaces Shared Html5</name>
- <description>Shared project renamed for use in MyFaces Html5 Component Library</description>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-html5</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-html5</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-html5</url>
- </scm>
-
- <build>
-
- <resources>
- <resource>
- <!-- because adding an additional resourceRoot not possible with antrun yet -->
- <directory>target/refactored-shared-sources/main/resources</directory>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>add-source-shared</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/refactored-shared-sources/main/java</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-sources</id>
- <phase>generate-sources</phase>
- <goals><goal>unpack</goal></goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-core</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/unpacked-shared-sources</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <!-- Unpack resources to be added in source jar -->
- <id>unpack-resources-sources</id>
- <phase>generate-sources</phase>
- <goals><goal>unpack</goal></goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-core</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <includes>META-INF/internal-resources/**,META-INF/resources/**</includes>
- <outputDirectory>${project.build.directory}/refactored-shared-sources/main/resources</outputDirectory>
- </configuration>
- </execution>
- <execution>
- <!-- Unpack resources to be added in jar -->
- <id>unpack-resources</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-core</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <!-- Just include the .class files in org/** and the META-INF/services directory -->
- <!-- <includes>org/**,META-INF/services/**</includes> -->
- <includes>META-INF/internal-resources/**,META-INF/resources/**</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>refactor-shared-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources" />
- <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/java" />
- <property name="refactor.package.new" value="shared_html5" />
- <ant dir="${project.basedir}" antfile="build.xml" inheritRefs="true" inheritAll="true">
- <target name="refactor-java-sources" />
- </ant>
- </tasks>
- <sourceRoot>${project.build.directory}/refactored-shared-sources/main/java</sourceRoot>
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
- <execution>
- <id>refactor-resources</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources" />
- <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/resources" />
- <property name="refactor.package.new" value="shared_html5" />
- <ant dir="${project.basedir}" antfile="build.xml" inheritRefs="true" inheritAll="true">
- <target name="refactor-resources" />
- </ant>
- </tasks>
- <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot> <!-- not yet supported -->
- </configuration>
- <goals><goal>run</goal></goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-source</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-
-</project>
+<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">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-project</artifactId>
+ <version>4.0.6-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>myfaces-shared-html5</artifactId>
+ <packaging>jar</packaging>
+ <name>MyFaces Shared Html5</name>
+ <description>Shared project renamed for use in MyFaces Html5 Component Library</description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-html5</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-html5</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-html5</url>
+ </scm>
+
+ <build>
+
+ <resources>
+ <resource>
+ <!-- because adding an additional resourceRoot not possible with antrun yet -->
+ <directory>target/refactored-shared-sources/main/resources</directory>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>add-source-shared</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/refactored-shared-sources/main/java</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-sources</id>
+ <phase>generate-sources</phase>
+ <goals><goal>unpack</goal></goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-core</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>sources</classifier>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/unpacked-shared-sources</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- Unpack resources to be added in source jar -->
+ <id>unpack-resources-sources</id>
+ <phase>generate-sources</phase>
+ <goals><goal>unpack</goal></goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-core</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <includes>META-INF/internal-resources/**,META-INF/resources/**</includes>
+ <outputDirectory>${project.build.directory}/refactored-shared-sources/main/resources</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- Unpack resources to be added in jar -->
+ <id>unpack-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-core</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <!-- Just include the .class files in org/** and the META-INF/services directory -->
+ <!-- <includes>org/**,META-INF/services/**</includes> -->
+ <includes>META-INF/internal-resources/**,META-INF/resources/**</includes>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>refactor-shared-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources" />
+ <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/java" />
+ <property name="refactor.package.new" value="shared_html5" />
+ <ant dir="${project.basedir}" antfile="build.xml" inheritRefs="true" inheritAll="true">
+ <target name="refactor-java-sources" />
+ </ant>
+ </tasks>
+ <sourceRoot>${project.build.directory}/refactored-shared-sources/main/java</sourceRoot>
+ </configuration>
+ <goals><goal>run</goal></goals>
+ </execution>
+ <execution>
+ <id>refactor-resources</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <property name="refactor.src.dir" value="${project.build.directory}/unpacked-shared-sources" />
+ <property name="refactor.output.dir" value="${project.build.directory}/refactored-shared-sources/main/resources" />
+ <property name="refactor.package.new" value="shared_html5" />
+ <ant dir="${project.basedir}" antfile="build.xml" inheritRefs="true" inheritAll="true">
+ <target name="refactor-resources" />
+ </ant>
+ </tasks>
+ <resourceRoot>${project.build.directory}/refactored-shared-sources/main/resources</resourceRoot> <!-- not yet supported -->
+ </configuration>
+ <goals><goal>run</goal></goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-source</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+</project>
Modified: myfaces/shared/trunk/shared-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-impl/pom.xml?rev=1088854&r1=1088853&r2=1088854&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-impl/pom.xml (original)
+++ myfaces/shared/trunk/shared-impl/pom.xml Tue Apr 5 02:29:11 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-project</artifactId>
- <version>4.0.7-SNAPSHOT</version>
+ <version>4.0.6-SNAPSHOT</version>
</parent>
<artifactId>myfaces-shared-impl</artifactId>
Modified: myfaces/shared/trunk/shared-tomahawk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-tomahawk/pom.xml?rev=1088854&r1=1088853&r2=1088854&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-tomahawk/pom.xml (original)
+++ myfaces/shared/trunk/shared-tomahawk/pom.xml Tue Apr 5 02:29:11 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-project</artifactId>
- <version>4.0.7-SNAPSHOT</version>
+ <version>4.0.6-SNAPSHOT</version>
</parent>
<artifactId>myfaces-shared-tomahawk</artifactId>