You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2012/06/02 13:27:39 UTC

svn commit: r1345490 - in /incubator/stanbol/trunk: parent/pom.xml pom.xml

Author: fchrist
Date: Sat Jun  2 11:27:38 2012
New Revision: 1345490

URL: http://svn.apache.org/viewvc?rev=1345490&view=rev
Log:
STANBOL-650 This moves the release config from the top level POM into the parent POM

Modified:
    incubator/stanbol/trunk/parent/pom.xml
    incubator/stanbol/trunk/pom.xml

Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1345490&r1=1345489&r2=1345490&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Sat Jun  2 11:27:38 2012
@@ -59,6 +59,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jersey-version>1.12</jersey-version>
     <pax-exam-version>2.3.0.M1</pax-exam-version>
+    <sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor>    
   </properties>
 
   <build>
@@ -1420,7 +1421,7 @@
             <executions>
               <execution>
                 <goals>
-                  <goal>add-third-party</goal>
+                  <goal>aggregate-add-third-party</goal>
                 </goals>
               </execution>
             </executions>
@@ -1441,7 +1442,7 @@
               <dependency>
                 <groupId>org.apache.stanbol</groupId>
                 <artifactId>source-assembly</artifactId>
-                <version>0.10.0-incubating</version>
+                <version>0.10.1-incubating-SNAPSHOT</version>
               </dependency>
             </dependencies>
           </plugin>

Modified: incubator/stanbol/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1345490&r1=1345489&r2=1345490&view=diff
==============================================================================
--- incubator/stanbol/trunk/pom.xml (original)
+++ incubator/stanbol/trunk/pom.xml Sat Jun  2 11:27:38 2012
@@ -54,18 +54,14 @@
     <url>http://incubator.apache.org/stanbol/</url>
   </scm>
 
-  <properties>
-    <sourceReleaseAssemblyDescriptor>
-      stanbol-source-release-zip-tar
-    </sourceReleaseAssemblyDescriptor>
-  </properties>  
-
   <build>
     <finalName>apache-stanbol-${project.version}</finalName>  
   </build>
 
   <!-- These modules form the Stanbol Framework -->
   <modules>
+    <module>releasing/source-assembly</module>    
+    
     <module>parent</module>
     <module>data</module>
     <module>commons</module>
@@ -184,30 +180,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>apache-release</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>license-maven-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>aggregate-add-third-party</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-      <modules>
-        <module>releasing/source-assembly</module>
-      </modules>
-    </profile>
 
     <!-- One day the KReS profile will disappear -->
     <profile>