홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
58915da4 1 parent 985b12e0

Allow OAR file rule to use non-OSGI jars 

Change-Id: If2a82bdb5b217270ca02760f1c6cfc6f8f0dc7da
Inline Side-by-side
Showing 1 changed file with 4 additions and 1 deletions
...@@ -11,7 +11,10 @@ def generateOar(output, files=[]): ...@@ -11,7 +11,10 @@ def generateOar(output, files=[]):
11 if mvnCoords == 'NONE': 11 if mvnCoords == 'NONE':
12 dest = filename 12 dest = filename
13 else: 13 else:
14 - groupId, artifactId, version = mvnCoords.split(':') 14 + parts = mvnCoords.split(':')
15 + if len(parts) > 3:
16 + parts.insert(2, parts.pop()) # move version to the 3rd position
17 + groupId, artifactId, version = parts[0:3]
15 groupId = groupId.replace('.', '/') 18 groupId = groupId.replace('.', '/')
16 extension = filename.split('.')[-1] 19 extension = filename.split('.')[-1]
17 if extension == 'jar': 20 if extension == 'jar':
......