[infinispan-commits] Infinispan SVN: r1972 - in trunk: core/src/main/release and 1 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Jul 5 06:03:22 EDT 2010
Author: manik.surtani at jboss.com
Date: 2010-07-05 06:03:22 -0400 (Mon, 05 Jul 2010)
New Revision: 1972
Removed:
trunk/src/main/resources/assemblies/single_jar.xml
Modified:
trunk/core/src/main/release/README.txt
trunk/pom.xml
Log:
[ISPN-521] (Remove the single_jar distribution archive)
Modified: trunk/core/src/main/release/README.txt
===================================================================
--- trunk/core/src/main/release/README.txt 2010-07-05 10:00:42 UTC (rev 1971)
+++ trunk/core/src/main/release/README.txt 2010-07-05 10:03:22 UTC (rev 1972)
@@ -6,6 +6,7 @@
* infinispan-X.Y.Z-all.ZIP
* contains core jar + dependencies
* additional optional modules + dependencies
+ * client/server modules
* test classes
* sample configurations
* API documentation
@@ -18,18 +19,13 @@
* API documentation
* GUI demo
-* infinispan-X.Y.Z-single_jar.ZIP
- * contains a single jar containing infinispan-core and all optional modules + dependencies
- * sample configurations
- * API documentation
-
* infinispan-X.Y.Z-src.ZIP
* snapshot of the source code tree from subversion for this release
Requirements
------------
-Infinispan needs a JDK 5.0 compliant Java virtual machine. And nothing else.
+Infinispan needs a JDK 6 compliant Java virtual machine.
Problems
--------
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-07-05 10:00:42 UTC (rev 1971)
+++ trunk/pom.xml 2010-07-05 10:03:22 UTC (rev 1972)
@@ -97,56 +97,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>create-consolidated-jar</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <!-- this is a dependency of single_jar assembly -->
- <mkdir dir="target"/>
- <jar destfile="target/infinispan-all.jar">
- <fileset dir="cachestore/bdbje/target/classes"/>
- <fileset dir="cachestore/jdbc/target/classes"/>
- <fileset dir="cachestore/jdbm/target/classes"/>
- <fileset dir="core/target/classes"/>
- <fileset dir="tree/target/classes"/>
- <fileset dir="query/target/classes"/>
- <manifest>
- <attribute name="Main-Class" value="org.infinispan.Version"/>
- </manifest>
- </jar>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>remove-dot-ignore</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="file"
- value="${project.build.directory}/distribution/${artifactId}-${project.version}-single_jar.zip"/>
- <zip destfile="${file}.new">
- <zipfileset src="${file}">
- <exclude name="**/.ignore/**"/>
- </zipfileset>
- </zip>
- <move file="${file}.new" tofile="${file}"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -170,7 +120,6 @@
</executions>
<configuration>
<descriptors>
- <descriptor>src/main/resources/assemblies/single_jar.xml</descriptor>
<descriptor>src/main/resources/assemblies/bin.xml</descriptor>
<descriptor>src/main/resources/assemblies/all.xml</descriptor>
<descriptor>src/main/resources/assemblies/src.xml</descriptor>
Deleted: trunk/src/main/resources/assemblies/single_jar.xml
===================================================================
--- trunk/src/main/resources/assemblies/single_jar.xml 2010-07-05 10:00:42 UTC (rev 1971)
+++ trunk/src/main/resources/assemblies/single_jar.xml 2010-07-05 10:03:22 UTC (rev 1972)
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- This package will build a ZIP containing a single jar, containing classes from ALL modules.
-
- - infinispan-all.jar
- + lib (all dependencies)
-
- + bin (any scripts, etc)
- + etc (sample configs, resources, etc from src/main/resources)
- + doc (release notes, etc from src/main/release)
--->
-<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>single_jar</id>
-
- <formats>
- <format>zip</format>
- </formats>
-
- <moduleSets>
- <moduleSet>
- <includeSubModules>false</includeSubModules>
- <excludes>
- <exclude>org.infinispan:infinispan-tools</exclude>
- <exclude>org.infinispan:infinispan-jopr-plugin</exclude>
- </excludes>
-
- <sources>
- <includeModuleDirectory>false</includeModuleDirectory>
-
- <fileSets>
-
- <!-- resources -->
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory>etc</outputDirectory>
- <lineEnding>unix</lineEnding>
- <excludes>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.bat</exclude>
- <exclude>**/*.cmd</exclude>
- <exclude>**/*.py</exclude>
- </excludes>
- </fileSet>
-
- <!-- Executable resources -->
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory>bin</outputDirectory>
- <lineEnding>unix</lineEnding>
- <includes>
- <include>**/*.sh</include>
- <include>**/*.py</include>
- <include>**/*.rb</include>
- </includes>
- <excludes>
- <exclude>**/runGuiDemo*</exclude>
- </excludes>
- <fileMode>0777</fileMode>
- </fileSet>
-
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory>bin</outputDirectory>
- <lineEnding>dos</lineEnding>
- <includes>
- <include>**/*.bat</include>
- <include>**/*.cmd</include>
- </includes>
- <excludes>
- <exclude>**/runGuiDemo*</exclude>
- </excludes>
- <fileMode>0777</fileMode>
- </fileSet>
-
- <!-- Log4j XML -->
- <fileSet>
- <directory>src/test/resources</directory>
- <outputDirectory>etc</outputDirectory>
- <includes>
- <include>log4j.xml</include>
- </includes>
- </fileSet>
-
- <!-- EULAs and license files -->
- <fileSet>
- <directory>src/main/release</directory>
- <outputDirectory></outputDirectory>
- <includes>
- <include>**/*.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- </sources>
-
- <binaries>
- <unpack>false</unpack>
- <outputDirectory>/.ignore</outputDirectory>
- <dependencySets>
- <dependencySet>
- <excludes>
- <exclude>infinispan-*</exclude>
- </excludes>
- <outputDirectory>lib</outputDirectory>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
-
- </moduleSets>
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <includes>
- <include>infinispan-all.jar</include>
- </includes>
- <outputDirectory>/</outputDirectory>
- </fileSet>
-
- <!-- docs -->
- <fileSet>
- <directory>target/site/apidocs</directory>
- <outputDirectory>doc/apidocs</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
More information about the infinispan-commits
mailing list