Author: ptahchiev
Date: Tue Apr  1 03:43:54 2008
New Revision: 643355

URL: http://svn.apache.org/viewvc?rev=643355&view=rev
Log:
Added the changes which we should be able to use once the assembly 2.2-beta3 
plugin is out.

Modified:
    jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
    jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
    jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
    jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml

Modified: 
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/pom.xml?rev=643355&r1=643354&r2=643355&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/pom.xml 
(original)
+++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/pom.xml 
Tue Apr  1 03:43:54 2008
@@ -50,6 +50,21 @@
                                        </descriptors>
                                        <archive>
                                                
<manifestFile>src/conf/MANIFEST.MF</manifestFile>
+                                               
+                                               <!-- When assembly plugin 
2.2-beta-3 is released, we should be able to use
+                                                                this 
configuration instead of getting the MANIFEST from outside.
+                                                                
+                                                                
<manifestEntries>
+                                                                        
<Specification-Title>${project.name}</Specification-Title>
+                                                                        
<Specification-Version>${project.version}</Specification-Version>
+                                                                        
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                                                                        
<Implementation-Title>${project.name}</Implementation-Title>
+                                                                        
<Implementation-Version>${project.version}</Implementation-Version>
+                                                                        
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                                                                        
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                                                                        
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+                                                                        
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+                                               </manifestEntries-->
                                        </archive>
                                </configuration>
                                <executions>

Modified: 
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/pom.xml?rev=643355&r1=643354&r2=643355&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/pom.xml 
(original)
+++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/pom.xml 
Tue Apr  1 03:43:54 2008
@@ -50,6 +50,21 @@
                                        </descriptors>
                                        <archive>
                                                
<manifestFile>src/conf/MANIFEST.MF</manifestFile>
+                                               
+                                               <!-- When assembly plugin 
2.2-beta-3 is released, we should be able to use
+                                                                this 
configuration instead of getting the MANIFEST from outside.
+                                                                
+                                                                
<manifestEntries>
+                                                                        
<Specification-Title>${project.name}</Specification-Title>
+                                                                        
<Specification-Version>${project.version}</Specification-Version>
+                                                                        
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                                                                        
<Implementation-Title>${project.name}</Implementation-Title>
+                                                                        
<Implementation-Version>${project.version}</Implementation-Version>
+                                                                        
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                                                                        
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                                                                        
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+                                                                        
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+                                               </manifestEntries-->
                                        </archive>
                                </configuration>
                                <executions>

Modified: 
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/pom.xml?rev=643355&r1=643354&r2=643355&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/pom.xml 
(original)
+++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/pom.xml 
Tue Apr  1 03:43:54 2008
@@ -50,6 +50,21 @@
                                        </descriptors>
                                        <archive>
                                                
<manifestFile>src/conf/MANIFEST.MF</manifestFile>
+                                               
+                                               <!-- When assembly plugin 
2.2-beta-3 is released, we should be able to use
+                                                                this 
configuration instead of getting the MANIFEST from outside.
+                                                                
+                                                                
<manifestEntries>
+                                                                        
<Specification-Title>${project.name}</Specification-Title>
+                                                                        
<Specification-Version>${project.version}</Specification-Version>
+                                                                        
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                                                                        
<Implementation-Title>${project.name}</Implementation-Title>
+                                                                        
<Implementation-Version>${project.version}</Implementation-Version>
+                                                                        
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                                                                        
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                                                                        
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+                                                                        
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+                                               </manifestEntries-->
                                        </archive>
                                </configuration>
                                <executions>

Modified: 
jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml
URL: 
http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml?rev=643355&r1=643354&r2=643355&view=diff
==============================================================================
--- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml 
(original)
+++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/pom.xml 
Tue Apr  1 03:43:54 2008
@@ -40,13 +40,28 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.2-beta-1</version>
+                               <version>2.2-beta-2</version>
                                <configuration>
                                        <descriptors>
                                                
<descriptor>src/assemble/main.xml</descriptor>
                                        </descriptors>
                                        <archive>
                                                
<manifestFile>src/conf/MANIFEST.MF</manifestFile>
+                                               
+                                               <!-- When assembly plugin 
2.2-beta-3 is released, we should be able to use
+                                                       this configuration 
instead of getting the MANIFEST from outside.
+                                                       
+                                               <manifestEntries>
+                                                       
<Specification-Title>${project.name}</Specification-Title>
+                                                       
<Specification-Version>${project.version}</Specification-Version>
+                                                       
<Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                                                       
<Implementation-Title>${project.name}</Implementation-Title>
+                                                       
<Implementation-Version>${project.version}</Implementation-Version>
+                                                       
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                                                       
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                                                       
<X-Compile-Source-JDK>${maven.compile.source}</X-Compile-Source-JDK>
+                                                       
<X-Compile-Target-JDK>${maven.compile.target}</X-Compile-Target-JDK>
+                                               </manifestEntries-->
                                        </archive>
                                </configuration>
                                <executions>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to