ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1727562 - in /ace/trunk: org.apache.ace.agent/bnd.bnd org.apache.ace.agent/build.gradle org.apache.ace.deployment/test/org/apache/ace/deployment/provider/filebased/
Date Fri, 29 Jan 2016 12:23:13 GMT
Author: jawi
Date: Fri Jan 29 12:23:12 2016
New Revision: 1727562

URL: http://svn.apache.org/viewvc?rev=1727562&view=rev
Log:
Some dings and dents fixed:

- the agent was missing a Gradle task to generate the right Maven artifacts;
- an empty test file was present (probably due to SVN b0rking up file moves
  through patch files).


Added:
    ace/trunk/org.apache.ace.agent/build.gradle
Removed:
    ace/trunk/org.apache.ace.deployment/test/org/apache/ace/deployment/provider/filebased/
Modified:
    ace/trunk/org.apache.ace.agent/bnd.bnd

Modified: ace/trunk/org.apache.ace.agent/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/bnd.bnd?rev=1727562&r1=1727561&r2=1727562&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.agent/bnd.bnd Fri Jan 29 12:23:12 2016
@@ -26,10 +26,10 @@ 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
+mavenGroupId: org.apache.ace
 
 -pom: \
-	groupid=${mavenGroup},\
+	groupid=${mavenGroupId},\
 	version=${Bundle-Version}
 
 # Keeping the agent as lean as possible. Remove debug when compiling

Added: ace/trunk/org.apache.ace.agent/build.gradle
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent/build.gradle?rev=1727562&view=auto
==============================================================================
--- ace/trunk/org.apache.ace.agent/build.gradle (added)
+++ ace/trunk/org.apache.ace.agent/build.gradle Fri Jan 29 12:23:12 2016
@@ -0,0 +1,65 @@
+task(type: Jar, 'sourcesJar') {
+  description 'Jar the sources.'
+  group 'documentation'
+  dependsOn jar
+  enabled !bnd.project.isNoBundles()
+  if (enabled) {
+    inputs.file jar.archivePath
+    from zipTree(jar.archivePath).matching {
+      include 'OSGI-OPT/src/**'
+      include '*'
+    }
+    eachFile { FileCopyDetails fcp ->
+      fcp.path = fcp.path - 'OSGI-OPT/src/'
+    }
+    includeEmptyDirs = false
+    classifier = 'sources'
+  }
+}
+
+task('pom') {
+  description 'Generate the pom file.'
+  group 'documentation'
+  dependsOn jar
+  def bundleVersion = bnd('Bundle-Version')
+  def groupId = bnd('mavenGroupId')
+  println "${bundleVersion}  - ${groupId}"
+  println "${bundleVersion}  - ${groupId}"
+  println "${bundleVersion}  - ${groupId}"
+  println "${bundleVersion}  - ${groupId}"
+  def pomname = "${archivesBaseName}.pom"
+  ext.pomfile = new File(buildDir, pomname)
+  enabled !bnd.project.isNoBundles()
+  if (enabled) {
+    inputs.file jar.archivePath
+    outputs.file pomfile
+    doLast {
+      copy {
+        from zipTree(jar.archivePath).matching {
+          include "META-INF/maven/${groupId}/${archivesBaseName}/pom.xml"
+        }
+        eachFile { FileCopyDetails fcp ->
+          fcp.path = pomname
+        }
+        into buildDir
+        includeEmptyDirs = false
+      }
+    }
+  }
+}
+
+task(type: Jar, 'javadocJar') {
+  description 'Jar the javadoc.'
+  group 'documentation'
+  dependsOn javadoc
+  from javadoc.destinationDir
+  classifier 'javadoc'
+}
+
+artifacts {
+  archives sourcesJar
+  archives javadocJar
+  archives(pom.pomfile) {
+    builtBy pom
+  }
+}
\ No newline at end of file



Mime
View raw message