You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ja...@apache.org on 2016/01/27 16:55:02 UTC

svn commit: r1727101 - in /ace/trunk: build/build.gradle cnf/ext/defaults.bnd org.apache.ace.agent.launcher/bnd.bnd org.apache.ace.agent/bnd.bnd

Author: jawi
Date: Wed Jan 27 15:55:01 2016
New Revision: 1727101

URL: http://svn.apache.org/viewvc?rev=1727101&view=rev
Log:
ACE-390 - generate Maven POM files for agent:

- when staging the artifacts for a release, a distribution for the agent is
  created that contains POM files.


Modified:
    ace/trunk/build/build.gradle
    ace/trunk/cnf/ext/defaults.bnd
    ace/trunk/org.apache.ace.agent.launcher/bnd.bnd
    ace/trunk/org.apache.ace.agent/bnd.bnd

Modified: ace/trunk/build/build.gradle
URL: http://svn.apache.org/viewvc/ace/trunk/build/build.gradle?rev=1727101&r1=1727100&r2=1727101&view=diff
==============================================================================
--- ace/trunk/build/build.gradle (original)
+++ ace/trunk/build/build.gradle Wed Jan 27 15:55:01 2016
@@ -223,9 +223,34 @@ task stageBin(type: Zip) {
 	into "${archivesBaseName}-${version}"
 }
 
+task stageMaven(type: Zip) {
+	description = 'Create an archive in the local staging folder containing artifacts that can be uploaded to a maven repo'
+	
+	classifier = 'maven'
+	destinationDir = file('staging')
+	
+	with([
+	    // LICENSE, NOTICE, README
+	    copySpec {
+	    	from 'resources/bin'
+	    },
+	    // agent
+		copySpec {
+			from '../org.apache.ace.agent/generated'
+			into 'org.apache.ace.agent'
+			include('org.apache.ace.agent.pom', 
+					'org.apache.ace.agent.jar', 
+					'org.apache.ace.agent-sources.jar', 
+					'org.apache.ace.agent-javadoc.jar')
+		}
+	] as CopySpec[]);
+	into "${archivesBaseName}-${version}-maven"	 
+}
+
+
 task signStaging() {
     description = 'Signs the local staging distribution.'
-    dependsOn = ['stageSrc', 'stageDeps', 'stageBin' ]
+    dependsOn = ['stageSrc', 'stageDeps', 'stageBin', 'stageMaven' ]
     
     doLast {
 		fileTree("staging").visit { FileVisitDetails details -> 

Modified: ace/trunk/cnf/ext/defaults.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/ext/defaults.bnd?rev=1727101&r1=1727100&r2=1727101&view=diff
==============================================================================
--- ace/trunk/cnf/ext/defaults.bnd (original)
+++ ace/trunk/cnf/ext/defaults.bnd Wed Jan 27 15:55:01 2016
@@ -31,7 +31,7 @@ javac.debug:  on
 
 # Default Bundle headers
 Bundle-DocURL: http://ace.apache.org/
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt;name="The Apache License, Version 2.0"
 Bundle-Vendor: The Apache Software Foundation
 
 # Remove certain generated headers that we don't need

Modified: ace/trunk/org.apache.ace.agent.launcher/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.launcher/bnd.bnd?rev=1727101&r1=1727100&r2=1727101&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.launcher/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent.launcher/bnd.bnd Wed Jan 27 15:55:01 2016
@@ -7,4 +7,4 @@
 	org.apache.ace.agent;version=latest
 -sub: *.bnd
 
--diffignore: org.apache.ace.agent.jar
\ No newline at end of file
+-diffignore: org.apache.ace.agent-*.jar
\ No newline at end of file

Modified: ace/trunk/org.apache.ace.agent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/bnd.bnd?rev=1727101&r1=1727100&r2=1727101&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent/bnd.bnd Wed Jan 27 15:55:01 2016
@@ -26,6 +26,11 @@ Export-Package: org.apache.ace.agent,\
 	org.osgi.service.deploymentadmin;-split-package:=merge-last,\
 	org.osgi.service.deploymentadmin.spi;-split-package:=merge-last
 
+mavenGroup: org.apache.ace
+
+-pom: \
+	groupid=${mavenGroup},\
+	version=${Bundle-Version}
 
 # Keeping the agent as lean as possible. Remove debug when compiling
 # offline