incubator-any23-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1356716 - in /incubator/any23/trunk: core/ core/src/main/assembly/ plugins/basic-crawler/ plugins/basic-crawler/src/main/assembly/ plugins/html-scraper/ plugins/html-scraper/src/main/assembly/ plugins/office-scraper/ plugins/office-scraper...
Date Tue, 03 Jul 2012 13:19:38 GMT
Author: simonetripodi
Date: Tue Jul  3 13:19:36 2012
New Revision: 1356716

URL: http://svn.apache.org/viewvc?rev=1356716&view=rev
Log:
better assemblies naming and related baseDirectory that reflects the assembly name

Added:
    incubator/any23/trunk/service/src/main/assembly/server-embedded.xml
      - copied, changed from r1356676, incubator/any23/trunk/service/src/main/assembly/bin-server-embedded.xml
    incubator/any23/trunk/service/src/main/assembly/with-deps.xml
      - copied, changed from r1356705, incubator/any23/trunk/service/src/main/assembly/bin-with-deps.xml
    incubator/any23/trunk/service/src/main/assembly/without-deps.xml
      - copied, changed from r1356127, incubator/any23/trunk/service/src/main/assembly/bin-without-deps.xml
Removed:
    incubator/any23/trunk/service/src/main/assembly/bin-server-embedded.xml
    incubator/any23/trunk/service/src/main/assembly/bin-with-deps.xml
    incubator/any23/trunk/service/src/main/assembly/bin-without-deps.xml
Modified:
    incubator/any23/trunk/core/pom.xml
    incubator/any23/trunk/core/src/main/assembly/bin.xml
    incubator/any23/trunk/plugins/basic-crawler/pom.xml
    incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml
    incubator/any23/trunk/plugins/html-scraper/pom.xml
    incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml
    incubator/any23/trunk/plugins/office-scraper/pom.xml
    incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml
    incubator/any23/trunk/service/pom.xml
    incubator/any23/trunk/sources-dist/pom.xml
    incubator/any23/trunk/sources-dist/src/main/assembly/src.xml

Modified: incubator/any23/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/pom.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/core/pom.xml (original)
+++ incubator/any23/trunk/core/pom.xml Tue Jul  3 13:19:36 2012
@@ -29,10 +29,6 @@
 
   <name>Apache Any23 :: Core</name>
 
-  <properties>
-    <assembly.finalName>apache-any23-${project.version}</assembly.finalName>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -188,6 +184,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
             <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
           </descriptors>

Modified: incubator/any23/trunk/core/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/assembly/bin.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/core/src/main/assembly/bin.xml Tue Jul  3 13:19:36 2012
@@ -24,7 +24,7 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-any23-${project.version}</baseDirectory>
+  <baseDirectory>${assembly.finalName}</baseDirectory>
 
   <files>
     <file>

Modified: incubator/any23/trunk/plugins/basic-crawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/pom.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/pom.xml (original)
+++ incubator/any23/trunk/plugins/basic-crawler/pom.xml Tue Jul  3 13:19:36 2012
@@ -93,6 +93,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
             <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
           </descriptors>

Modified: incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/main/assembly/bin.xml Tue Jul  3 13:19:36
2012
@@ -24,7 +24,7 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-${project.build.finalName}</baseDirectory>
+  <baseDirectory>${assembly.finalName}</baseDirectory>
 
   <!-- Use the N&L files which apply to the included dependencies -->
   <files>

Modified: incubator/any23/trunk/plugins/html-scraper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/pom.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/pom.xml (original)
+++ incubator/any23/trunk/plugins/html-scraper/pom.xml Tue Jul  3 13:19:36 2012
@@ -92,6 +92,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
             <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
           </descriptors>

Modified: incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/plugins/html-scraper/src/main/assembly/bin.xml Tue Jul  3 13:19:36
2012
@@ -24,7 +24,7 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-${project.build.finalName}</baseDirectory>
+  <baseDirectory>${assembly.finalName}</baseDirectory>
 
   <!-- Use the N&L files which apply to the included dependencies -->
   <files>

Modified: incubator/any23/trunk/plugins/office-scraper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/pom.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/pom.xml (original)
+++ incubator/any23/trunk/plugins/office-scraper/pom.xml Tue Jul  3 13:19:36 2012
@@ -75,6 +75,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
             <descriptor>${basedir}/src/main/assembly/bin.xml</descriptor>
           </descriptors>

Modified: incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml (original)
+++ incubator/any23/trunk/plugins/office-scraper/src/main/assembly/bin.xml Tue Jul  3 13:19:36
2012
@@ -24,7 +24,7 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-${project.build.finalName}</baseDirectory>
+  <baseDirectory>${assembly.finalName}</baseDirectory>
 
   <!-- Use the N&L files which apply to the included dependencies -->
   <files>

Modified: incubator/any23/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/pom.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/service/pom.xml (original)
+++ incubator/any23/trunk/service/pom.xml Tue Jul  3 13:19:36 2012
@@ -139,9 +139,9 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>
-            <descriptor>${basedir}/src/main/assembly/bin-with-deps.xml</descriptor>
-            <descriptor>${basedir}/src/main/assembly/bin-without-deps.xml</descriptor>
-            <descriptor>${basedir}/src/main/assembly/bin-server-embedded.xml</descriptor>
+            <descriptor>${basedir}/src/main/assembly/with-deps.xml</descriptor>
+            <descriptor>${basedir}/src/main/assembly/without-deps.xml</descriptor>
+            <descriptor>${basedir}/src/main/assembly/server-embedded.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>

Copied: incubator/any23/trunk/service/src/main/assembly/server-embedded.xml (from r1356676,
incubator/any23/trunk/service/src/main/assembly/bin-server-embedded.xml)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/server-embedded.xml?p2=incubator/any23/trunk/service/src/main/assembly/server-embedded.xml&p1=incubator/any23/trunk/service/src/main/assembly/bin-server-embedded.xml&r1=1356676&r2=1356716&rev=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/bin-server-embedded.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/server-embedded.xml Tue Jul  3 13:19:36
2012
@@ -18,13 +18,13 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
 
-  <id>bin-server-embedded</id>
+  <id>server-embedded</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-${project.build.finalName}-server-embedded</baseDirectory>
+  <baseDirectory>${assembly.finalName}-server-embedded</baseDirectory>
 
   <files>
     <file>

Copied: incubator/any23/trunk/service/src/main/assembly/with-deps.xml (from r1356705, incubator/any23/trunk/service/src/main/assembly/bin-with-deps.xml)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/with-deps.xml?p2=incubator/any23/trunk/service/src/main/assembly/with-deps.xml&p1=incubator/any23/trunk/service/src/main/assembly/bin-with-deps.xml&r1=1356705&r2=1356716&rev=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/bin-with-deps.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/with-deps.xml Tue Jul  3 13:19:36 2012
@@ -18,13 +18,13 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
 
-  <id>bin-with-deps</id>
+  <id>with-deps</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-${project.build.finalName}</baseDirectory>
+  <baseDirectory>${assembly.finalName}-with-deps</baseDirectory>
 
   <files>
     <!-- with-deps -->

Copied: incubator/any23/trunk/service/src/main/assembly/without-deps.xml (from r1356127, incubator/any23/trunk/service/src/main/assembly/bin-without-deps.xml)
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/service/src/main/assembly/without-deps.xml?p2=incubator/any23/trunk/service/src/main/assembly/without-deps.xml&p1=incubator/any23/trunk/service/src/main/assembly/bin-without-deps.xml&r1=1356127&r2=1356716&rev=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/service/src/main/assembly/bin-without-deps.xml (original)
+++ incubator/any23/trunk/service/src/main/assembly/without-deps.xml Tue Jul  3 13:19:36 2012
@@ -18,13 +18,13 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd">
 
-  <id>bin-without-deps</id>
+  <id>without-deps</id>
   <formats>
     <format>tar.gz</format>
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-${project.build.finalName}-without-deps</baseDirectory>
+  <baseDirectory>${assembly.finalName}-without-deps</baseDirectory>
 
   <files>
     <!-- without-deps -->

Modified: incubator/any23/trunk/sources-dist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/sources-dist/pom.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/sources-dist/pom.xml (original)
+++ incubator/any23/trunk/sources-dist/pom.xml Tue Jul  3 13:19:36 2012
@@ -40,6 +40,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
+          <finalName>${assembly.finalName}</finalName>
           <descriptors>
             <descriptor>${basedir}/src/main/assembly/src.xml</descriptor>
           </descriptors>

Modified: incubator/any23/trunk/sources-dist/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/sources-dist/src/main/assembly/src.xml?rev=1356716&r1=1356715&r2=1356716&view=diff
==============================================================================
--- incubator/any23/trunk/sources-dist/src/main/assembly/src.xml (original)
+++ incubator/any23/trunk/sources-dist/src/main/assembly/src.xml Tue Jul  3 13:19:36 2012
@@ -24,7 +24,7 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>apache-any23-${project.version}</baseDirectory>
+  <baseDirectory>${assembly.finalName}-src</baseDirectory>
 
   <fileSets>
     <!--



Mime
View raw message