jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From casta...@apache.org
Subject svn commit: r1204870 - in /incubator/jena/Jena2/JenaDist/trunk: .project README.txt assembly-binary.xml assembly-sources.xml pom.xml
Date Tue, 22 Nov 2011 09:23:16 GMT
Author: castagna
Date: Tue Nov 22 09:23:14 2011
New Revision: 1204870

URL: http://svn.apache.org/viewvc?rev=1204870&view=rev
Log:
It's not possible to use <finalName> (see: MDEPLOY-93): jena-dist artifactId renamed
to apache-jena.

Modified:
    incubator/jena/Jena2/JenaDist/trunk/.project
    incubator/jena/Jena2/JenaDist/trunk/README.txt
    incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml
    incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml
    incubator/jena/Jena2/JenaDist/trunk/pom.xml

Modified: incubator/jena/Jena2/JenaDist/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/.project?rev=1204870&r1=1204869&r2=1204870&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/.project (original)
+++ incubator/jena/Jena2/JenaDist/trunk/.project Tue Nov 22 09:23:14 2011
@@ -1,5 +1,5 @@
 <projectDescription>
-  <name>jena-dist</name>
+  <name>apache-jena</name>
   <comment>Apache Jena Distribution (it includes jena-core, jena-iri, jena-arq and
jena-tdb. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not
supported in M2Eclipse.</comment>
   <projects/>
   <buildSpec/>

Modified: incubator/jena/Jena2/JenaDist/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/README.txt?rev=1204870&r1=1204869&r2=1204870&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/README.txt (original)
+++ incubator/jena/Jena2/JenaDist/trunk/README.txt Tue Nov 22 09:23:14 2011
@@ -68,7 +68,7 @@
   build the binary distribution (provided you have Java 1.6 and Apache Maven
   2.2.1 or greated installed) doing:
 
-    cd jena-dist
+    cd apache-jena
     mvn package   
 
 

Modified: incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml?rev=1204870&r1=1204869&r2=1204870&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml (original)
+++ incubator/jena/Jena2/JenaDist/trunk/assembly-binary.xml Tue Nov 22 09:23:14 2011
@@ -64,6 +64,16 @@
           <dependencySet>
             <outputDirectory>lib</outputDirectory>
           </dependencySet>
+          <!-- 
+               This does not seem to work. 
+               See also: http://markmail.org/thread/66ro3nlaor23dn6l
+          -->
+          <dependencySet>
+            <outputDirectory>lib-src</outputDirectory>
+            <includes>
+              <include>org.apache.jena:jena-*:*:*:sources</include>
+            </includes>
+          </dependencySet>
         </dependencySets>
       </binaries>
 

Modified: incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml?rev=1204870&r1=1204869&r2=1204870&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml (original)
+++ incubator/jena/Jena2/JenaDist/trunk/assembly-sources.xml Tue Nov 22 09:23:14 2011
@@ -30,10 +30,6 @@
   <moduleSets>
     <moduleSet>
       <useAllReactorProjects>false</useAllReactorProjects>
-      
-      <includes>
-        <include>*:jena-*</include>
-      </includes>
 
       <sources>
         <outputDirectoryMapping>${module.artifactId}</outputDirectoryMapping>

Modified: incubator/jena/Jena2/JenaDist/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/JenaDist/trunk/pom.xml?rev=1204870&r1=1204869&r2=1204870&view=diff
==============================================================================
--- incubator/jena/Jena2/JenaDist/trunk/pom.xml (original)
+++ incubator/jena/Jena2/JenaDist/trunk/pom.xml Tue Nov 22 09:23:14 2011
@@ -27,7 +27,7 @@
   </parent>
 
   <groupId>org.apache.jena</groupId>
-  <artifactId>jena-dist</artifactId>
+  <artifactId>apache-jena</artifactId>
   <packaging>pom</packaging>
   <version>2.6.5-incubating-SNAPSHOT</version>
 
@@ -46,11 +46,10 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>create-assembly</id>
+            <id>source-release-assembly</id>
             <phase>package</phase>
             <goals><goal>single</goal></goals>
             <configuration>
-              <finalName>apache-jena-${project.version}</finalName>
               <appendAssemblyId>true</appendAssemblyId>
               <descriptors>
                 <descriptor>assembly-binary.xml</descriptor>
@@ -96,5 +95,48 @@
     
   </modules>
 
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>source-release-assembly</id>
+                <phase>package</phase>
+                <goals><goal>single</goal></goals>
+                <configuration>
+                  <appendAssemblyId>true</appendAssemblyId>
+                  <descriptors>
+                    <descriptor>assembly-binary.xml</descriptor>
+                    <descriptor>assembly-sources.xml</descriptor>
+                  </descriptors>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <configuration>
+              <passphrase>${gpg.passphrase}</passphrase>
+              <useAgent>${gpg.useagent}</useAgent>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
 



Mime
View raw message