You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by da...@apache.org on 2008/02/26 01:21:47 UTC
svn commit: r631047 - in /incubator/abdera/java/trunk: bundle/pom.xml
distribution/ distribution/pom.xml distribution/src/ distribution/src/main/
distribution/src/main/assembly/ distribution/src/main/assembly/bin.xml
pom.xml
Author: dandiep
Date: Mon Feb 25 16:21:37 2008
New Revision: 631047
URL: http://svn.apache.org/viewvc?rev=631047&view=rev
Log:
Abdera distribution module.
Added:
incubator/abdera/java/trunk/distribution/ (with props)
incubator/abdera/java/trunk/distribution/pom.xml (with props)
incubator/abdera/java/trunk/distribution/src/
incubator/abdera/java/trunk/distribution/src/main/
incubator/abdera/java/trunk/distribution/src/main/assembly/
incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml (with props)
Modified:
incubator/abdera/java/trunk/bundle/pom.xml
incubator/abdera/java/trunk/pom.xml
Modified: incubator/abdera/java/trunk/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/bundle/pom.xml?rev=631047&r1=631046&r2=631047&view=diff
==============================================================================
--- incubator/abdera/java/trunk/bundle/pom.xml (original)
+++ incubator/abdera/java/trunk/bundle/pom.xml Mon Feb 25 16:21:37 2008
@@ -33,7 +33,9 @@
<url>http://incubator.apache.org/abdera</url>
<properties>
+ <!-- Not quite working yet... -->
<createSourcesJar>false</createSourcesJar>
+
<shade.version>1.0-beta-1</shade.version>
</properties>
@@ -152,21 +154,11 @@
<goal>shade</goal>
</goals>
<configuration>
- <shadedGroupFilter>
- org.apache.abdera
- </shadedGroupFilter>
- <shadedArtifactAttached>
- false
- </shadedArtifactAttached>
- <createSourcesJar>
- ${createSourcesJar}
- </createSourcesJar>
- <promoteTransitiveDependencies>
- true
- </promoteTransitiveDependencies>
- <createDependencyReducedPom>
- true
- </createDependencyReducedPom>
+ <shadedGroupFilter>org.apache.abdera</shadedGroupFilter>
+ <shadedArtifactAttached>false</shadedArtifactAttached>
+ <createSourcesJar>${createSourcesJar}</createSourcesJar>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <createDependencyReducedPom>true</createDependencyReducedPom>
<transformers>
<transformer
@@ -211,9 +203,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
- <includeGroupIds>
- org.apache.abdera
- </includeGroupIds>
+ <includeGroupIds>org.apache.abdera</includeGroupIds>
<classifier>sources</classifier>
<outputDirectory>
${project.build.directory}/sources
@@ -222,7 +212,7 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -243,6 +233,7 @@
</sourcepath>
</configuration>
</plugin>
+
</plugins>
</build>
</profile>
Propchange: incubator/abdera/java/trunk/distribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 25 16:21:37 2008
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+target
Added: incubator/abdera/java/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/distribution/pom.xml?rev=631047&view=auto
==============================================================================
--- incubator/abdera/java/trunk/distribution/pom.xml (added)
+++ incubator/abdera/java/trunk/distribution/pom.xml Mon Feb 25 16:21:37 2008
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. 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. For additional information regarding
+ copyright in this work, please see the NOTICE file in the top level
+ directory of this distribution. -->
+<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>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera</artifactId>
+ <version>0.4.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>abdera-distribution</artifactId>
+ <packaging>pom</packaging>
+ <name>Abdera Distribution</name>
+ <version>0.4.0-incubating-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-bundle</artifactId>
+ <version>0.4.0-incubating-SNAPSHOT</version>
+ <!-- Silly hack because only want to include this in some dependency sets -->
+ <scope>test</scope>
+ </dependency>
+
+ <!-- We pull in any dependencies from the jars below this line into the lib/ directory -->
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-client</artifactId>
+ <version>0.4.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-server</artifactId>
+ <version>0.4.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-security</artifactId>
+ <version>0.4.0-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: incubator/abdera/java/trunk/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/distribution/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/abdera/java/trunk/distribution/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml?rev=631047&view=auto
==============================================================================
--- incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml (added)
+++ incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml Mon Feb 25 16:21:37 2008
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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 typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id></id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <fileSet>
+ <directory>../</directory>
+ <outputDirectory>apache-abdera-${abdera.version}</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <outputDirectory>apache-abdera-${abdera.version}/docs</outputDirectory>
+ <includes>
+ <include>**/*.html</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../examples/src/main/java</directory>
+ <outputDirectory>apache-abdera-${abdera.version}/examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../examples/src/main/resources</directory>
+ <outputDirectory>apache-abdera-${abdera.version}/examples</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>../bundle/target/apidocs</directory>
+ <outputDirectory>apache-abdera-${abdera.version}/docs/api</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>apache-abdera-${abdera.version}/lib</outputDirectory>
+ <unpack>false</unpack>
+ <excludes>
+ <exclude>org.apache.abdera:*</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet>
+ <!-- We could uncomment this if we want to include individual jars -->
+ <!-- dependencySet>
+ <outputDirectory>apache-abdera-${abdera.version}/modules</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.apache.abdera:*</include>
+ </includes>
+ <excludes>
+ <exclude>org.apache.abdera:abdera-bundle</exclude>
+ </excludes>
+ <scope>runtime</scope>
+ </dependencySet -->
+ <dependencySet>
+ <outputDirectory>apache-abdera-${abdera.version}</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.apache.abdera:abdera-bundle</include>
+ </includes>
+ <scope>test</scope>
+ <outputFileNameMapping>abdera-${version}.${extension}</outputFileNameMapping>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
Propchange: incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/abdera/java/trunk/distribution/src/main/assembly/bin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/abdera/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/pom.xml?rev=631047&r1=631046&r2=631047&view=diff
==============================================================================
--- incubator/abdera/java/trunk/pom.xml (original)
+++ incubator/abdera/java/trunk/pom.xml Mon Feb 25 16:21:37 2008
@@ -165,34 +165,40 @@
</build>
<profiles>
- <profile>
- <id>no-online-tests</id>
- <activation>
- <property>
- <name>offline-tests</name>
- <value>false</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*TestSuite*</exclude>
- <exclude>**/*$Test*</exclude>
- <exclude>**/FeedValidatorTest.java</exclude>
- <exclude>**/DSigThirdPartyVerifyTest.java</exclude>
- <exclude>**/AtomConformanceTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>deploy</id>
+ <modules>
+ <module>distribution</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>no-online-tests</id>
+ <activation>
+ <property>
+ <name>offline-tests</name>
+ <value>false</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*TestSuite*</exclude>
+ <exclude>**/*$Test*</exclude>
+ <exclude>**/FeedValidatorTest.java</exclude>
+ <exclude>**/DSigThirdPartyVerifyTest.java</exclude>
+ <exclude>**/AtomConformanceTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -254,7 +260,21 @@
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>1.1.1</version>
+ <version>1.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -273,7 +293,8 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
- </dependency>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -300,7 +321,7 @@
<module>extensions/serializer</module>
<module>spring</module>
<module>examples</module>
- </modules>
+ </modules>
<distributionManagement>
<snapshotRepository>