clerezza-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r1233131 - in /incubator/clerezza/trunk/parent: clerezza-jar-resource-bundle/ clerezza-jar-resource-bundle/pom.xml clerezza-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml pom.xml
Date Wed, 18 Jan 2012 23:56:33 GMT
Author: reto
Date: Wed Jan 18 23:56:33 2012
New Revision: 1233131

URL: http://svn.apache.org/viewvc?rev=1233131&view=rev
Log:
CLEREZZA-673: added own assembly descriptor

Added:
    incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/
      - copied from r1232459, uima/build/trunk/uima-jar-resource-bundle/
Modified:
    incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/pom.xml
    incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
    incubator/clerezza/trunk/parent/pom.xml

Modified: incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/pom.xml?rev=1233131&r1=1232459&r2=1233131&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/pom.xml (original)
+++ incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/pom.xml Wed Jan 18 23:56:33
2012
@@ -20,45 +20,25 @@
 <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.apache.uima</groupId>
-    <artifactId>parent-pom-top</artifactId>
-    <version>4</version>
-    <relativePath>../parent-poms/parent-pom-top</relativePath>
-  </parent>
+  	<artifactId>clerezza</artifactId>
+		<groupId>org.apache.clerezza</groupId>
+		<version>0.2-incubating-SNAPSHOT</version>
+	</parent>
   
-  <artifactId>uima-jar-resource-bundle</artifactId>
-  <version>4-SNAPSHOT</version>
-  <name>UIMA Jar shared resources</name>
+  <artifactId>clerezza-jar-resource-bundle</artifactId>
+  <version>1-SNAPSHOT</version>
+  <name>Clerezza Jar shared resources</name>
   <description>An archive which contains templates for generating 
     the necessary license files and notices for all Apache releases.
     Include via remote-resources plugin, to have the LICENSE,
-    NOTICE and DEPENDENCIES files added to the META-INF</description>
-  <url>${uimaWebsiteUrl}</url>
+    NOTICE and DEPENDENCIES files added to the META-INF. This is a modified 
+	version of uima-jar-resource-bundle</description>
   
-  <!-- Special inheritance note
-       even though the <scm> element that follows is exactly the 
-       same as those in super poms, it cannot be inherited because 
-       there is some special code that computes the connection elements
-       from the chain of parent poms, if this is omitted. 
-       
-       Keeping this a bit factored allows cutting/pasting the <scm>
-       element, and just changing the following two properties -->  
-  <scm>
-    <connection>
-      scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle
-    </connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-jar-resource-bundle
-    </developerConnection>
-    <url>
-      http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle
-    </url>
-  </scm>
   
-  <properties>
+  <!-- <properties>
     <uimaScmRoot>build</uimaScmRoot>
     <uimaScmProject>${project.artifactId}</uimaScmProject>
-  </properties>
+  </properties> -->
 
   <build>
     <plugins>

Modified: incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml?rev=1233131&r1=1232459&r2=1233131&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
(original)
+++ incubator/clerezza/trunk/parent/clerezza-jar-resource-bundle/src/main/resources/assemblies/multimodule-source-release.xml
Wed Jan 18 23:56:33 2012
@@ -22,20 +22,26 @@
      Runs only at the top level -->
      
 <assembly>
-  <id>source-release</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <moduleSets>
-    <moduleSet>
-      <sources>
-        <fileSets>
-          <fileSet>
-            <outputDirectory>/</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <excludes>
+	<id>source-release</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<moduleSets>
+		<moduleSet>
+			<includeSubModules>false</includeSubModules>
+			<sources>
+				<excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+				<outputDirectoryMapping>
+					${module.basedir.name}
+				</outputDirectoryMapping>
+				<fileSets>
+					<fileSet>
+						<outputDirectory>/</outputDirectory>
+						<useDefaultExcludes>true</useDefaultExcludes>
+						 
+						<excludes>
               <!-- build output -->
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
       
               <!-- NOTE: Most of the following excludes should not be required
                    if the standard release process is followed. This is because the
@@ -50,75 +56,46 @@
               -->
       
               <!-- IDEs -->
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
       
               <!-- misc -->
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
       
               <!-- release-plugin temp files -->
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
-              <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
-            </excludes>
-          </fileSet>
-        </fileSets>
-      </sources>
-    </moduleSet>
-  </moduleSets>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
+							<exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
+						</excludes>
+					</fileSet>
+				</fileSets>
+			</sources>
+		</moduleSet>
+	</moduleSets>
     
-  <fileSets>
-    <fileSet>
-      <directory>.</directory>
-      <outputDirectory>/${project.artifactId}</outputDirectory>
-      <useDefaultExcludes>true</useDefaultExcludes>
-      <excludes>
-        <!-- build output -->
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
-
-        <!-- NOTE: Most of the following excludes should not be required
-             if the standard release process is followed. This is because the
-             release plugin checks out project sources into a location like
-             target/checkout, then runs the build from there. The result is
-             a source-release archive that comes from a pretty clean directory
-             structure.
-
-             HOWEVER, if the release plugin is configured to run extra goals
-             or generate a project website, it's definitely possible that some
-             of these files will be present. So, it's safer to exclude them.
-        -->
-
-        <!-- IDEs -->
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude>
-
-        <!-- misc -->
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude>
-
-        <!-- release-plugin temp files -->
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude>
-        <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude>
-      </excludes>      
-    </fileSet>
+	<fileSets>
+		<fileSet>
+			<directory>.</directory>
+			<outputDirectory>/</outputDirectory>
+			<useDefaultExcludes>true</useDefaultExcludes>
+			<includes>
+				<include>pom.xml</include>
+				<include>NOTICE</include>
+				<include>LICENSE</include>
+				<include>src/**</include>
+			</includes>
+		</fileSet>
     <!-- license, readme, etc. calculated at build time -->
-    <fileSet>
-      <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
+		<fileSet>
+			<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+			<outputDirectory>/</outputDirectory>
+		</fileSet>
+	</fileSets>
 </assembly>

Modified: incubator/clerezza/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1233131&r1=1233130&r2=1233131&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/pom.xml (original)
+++ incubator/clerezza/trunk/parent/pom.xml Wed Jan 18 23:56:33 2012
@@ -36,6 +36,7 @@
 	<description>The direct or indirect parent of all Clerezza Artifacts</description>
 	<properties>
 		<scala.version>2.8.1</scala.version>
+		<sourceReleaseAssemblyDescriptor>multimodule-source-release</sourceReleaseAssemblyDescriptor>
 	</properties>
 	<licenses>
 		<license>
@@ -44,13 +45,33 @@
 			<distribution>repo</distribution>
 		</license>
 	</licenses>
+
 	<profiles>
 		<profile>
+			<id>apache-release</id>
+			<build>
+				<plugins>
+					  <plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<dependencies>          
+						  <dependency>  <!-- here I stuck in the dependency on the above
+					saved asm descriptor -->
+							<groupId>org.apache.clerezza</groupId>
+							<artifactId>clerezza-jar-resource-bundle</artifactId>
+							<version>1-SNAPSHOT</version>
+							</dependency>
+						</dependencies>
+					  </plugin> 
+				</plugins>
+				</build>
+			</profile>
+		<profile>
 			<id>release</id>
 			<activation>
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
+				<module>clerezza-jar-resource-bundle</module>
 				<module>platform.style.classic.webguiexamples</module>
 				<module>ext.com.hp.hpl.jena</module>
 				<module>ext.com.hp.hpl.jena.tdb</module>
@@ -320,6 +341,11 @@
 					<version>2.4</version>
 				</plugin>
 				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.2.2</version>
+				</plugin>
+				<plugin>
 					<artifactId>maven-clean-plugin</artifactId>
 					<version>2.3</version>
 				</plugin>



Mime
View raw message