You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/10/10 14:44:48 UTC
svn commit: r583458 - in /myfaces/orchestra/trunk/core: RELEASE-NOTES.txt
pom.xml src/main/assembly/ src/main/assembly/assembly.xml
Author: imario
Date: Wed Oct 10 05:44:48 2007
New Revision: 583458
URL: http://svn.apache.org/viewvc?rev=583458&view=rev
Log:
backport changeds from 1.0
Added:
myfaces/orchestra/trunk/core/RELEASE-NOTES.txt (with props)
myfaces/orchestra/trunk/core/src/main/assembly/
myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml (with props)
Modified:
myfaces/orchestra/trunk/core/pom.xml
Added: myfaces/orchestra/trunk/core/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/RELEASE-NOTES.txt?rev=583458&view=auto
==============================================================================
--- myfaces/orchestra/trunk/core/RELEASE-NOTES.txt (added)
+++ myfaces/orchestra/trunk/core/RELEASE-NOTES.txt Wed Oct 10 05:44:48 2007
@@ -0,0 +1,24 @@
+<!--
+
+ 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.
+
+-->
+
+$Id$
+
+
+== 1.0 ==
+the first release
Propchange: myfaces/orchestra/trunk/core/RELEASE-NOTES.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/orchestra/trunk/core/RELEASE-NOTES.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/orchestra/trunk/core/RELEASE-NOTES.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: myfaces/orchestra/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/pom.xml?rev=583458&r1=583457&r2=583458&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/pom.xml (original)
+++ myfaces/orchestra/trunk/core/pom.xml Wed Oct 10 05:44:48 2007
@@ -1,4 +1,5 @@
-<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.apache.myfaces.orchestra</groupId>
@@ -21,8 +22,6 @@
<dependencies>
- <!-- compile dependencies -->
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -31,23 +30,16 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.3</version>
- </dependency>
-
- <!-- provided dependencies -->
-
- <dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.shared</groupId>
<artifactId>myfaces-shared-orchestra</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
<!-- because we add all classes to the jar directly -->
</dependency>
@@ -56,9 +48,9 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
-
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -71,6 +63,7 @@
<artifactId>persistence-api</artifactId>
<version>1.0</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -78,6 +71,7 @@
<artifactId>spring</artifactId>
<version>2.0.6</version>
<scope>compile</scope>
+ <optional>true</optional>
</dependency>
<!-- test dependencies -->
@@ -193,6 +187,34 @@
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+
<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -279,6 +301,7 @@
</reporting>
<profiles>
+
<profile>
<id>generate-site</id>
<build>
Added: myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml?rev=583458&view=auto
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml (added)
+++ myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml Wed Oct 10 05:44:48 2007
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<assembly>
+ <id></id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <!-- The generated documentation -->
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <includes>
+ <include>pom.xml</include>
+ <include>RELEASE-NOTES.txt</include>
+ <!-- The source -->
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <!-- All the jar files -->
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Propchange: myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/orchestra/trunk/core/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml