Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(pacmak): support adding a suffix to Java package version #552

Merged
merged 2 commits into from
Jun 25, 2019
Merged

feat(pacmak): support adding a suffix to Java package version #552

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c80138
feat(pacmak): support adding a suffix to Java package version
RomainMuller Jun 25, 2019
a60f55e
Merge remote-tracking branch 'origin/master' into rmuller/version-lab…
RomainMuller Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/jsii-calc-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"package": "software.amazon.jsii.tests.calculator.lib",
"maven": {
"groupId": "software.amazon.jsii.tests",
"artifactId": "calculator-lib"
"artifactId": "calculator-lib",
"versionSuffix": "devpreview"
}
},
"dotnet": {
Expand Down Expand Up @@ -53,4 +54,4 @@
"type": "git",
"url": "https://github.com/awslabs/jsii.git"
}
}
}
26 changes: 22 additions & 4 deletions packages/jsii-pacmak/lib/targets/java.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,9 @@ class JavaGenerator extends Generator {
url: assm.repository.url
},

...assm.targets.java.maven,
'version': assm.version,
'groupId': assm.targets.java.maven.groupId,
'artifactId': assm.targets.java.maven.artifactId,
'version': makeVersion(assm.version, assm.targets.java.maven.versionSuffix),
'packaging': 'jar',

'properties': { 'project.build.sourceEncoding': 'UTF-8' },
Expand Down Expand Up @@ -492,6 +493,22 @@ class JavaGenerator extends Generator {
);
this.code.closeFile('pom.xml');

/**
* Combines a version number with an optional suffix. If the suffix starts with '-' or '.', it will be
* concatenated as-is to the semantic version number. Otherwise, it'll be appended to the version number with an
* intercalar '-'.
*
* @param version the semantic version number
* @param suffix the suffix, if any.
*/
function makeVersion(version: string, suffix?: string): string {
if (!suffix) { return version; }
RomainMuller marked this conversation as resolved.
Show resolved Hide resolved
if (!suffix.startsWith('-') && !suffix.startsWith('.')) {
return `${version}-${suffix}`;
}
return `${version}${suffix}`;
}

function mavenDependencies() {
const dependencies = new Array<MavenDependency>();
const allDeps = { ...(assm.dependencies || {}), ...self.referencedModules };
Expand All @@ -501,8 +518,9 @@ class JavaGenerator extends Generator {
throw new Error(`Assembly ${assm.name} depends on ${depName}, which does not declare a java target`);
}
dependencies.push({
...dep.targets.java.maven,
version: dep.version
groupId: dep.targets.java.maven.groupId,
artifactId: dep.targets.java.maven.artifactId,
version: makeVersion(dep.version, dep.targets.java.maven.versionSuffix),
});
}
// The JSII java runtime base classes
Expand Down
4 changes: 2 additions & 2 deletions packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
<connection>scm:git:https://github.com/awslabs/jsii.git</connection>
<url>https://github.com/awslabs/jsii.git</url>
</scm>
<artifactId>calculator-base</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator-base</artifactId>
<version>0.12.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<artifactId>calculator-base-of-base</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator-base-of-base</artifactId>
<version>0.12.0</version>
</dependency>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions ...st/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
"java": {
"maven": {
"artifactId": "calculator-lib",
"groupId": "software.amazon.jsii.tests"
"groupId": "software.amazon.jsii.tests",
"versionSuffix": "devpreview"
},
"package": "software.amazon.jsii.tests.calculator.lib"
},
Expand Down Expand Up @@ -540,5 +541,5 @@
}
},
"version": "0.12.0",
"fingerprint": "OXfz8QTGxBclm7yhCx56BuA0xu+78H6iPv9VNwKkJrc="
"fingerprint": "fBMD7/R6LEDfsTbhecMkc6ShEvAmBkWcKd9WO0Sl8hY="
}
6 changes: 3 additions & 3 deletions packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
<connection>scm:git:https://github.com/awslabs/jsii.git</connection>
<url>https://github.com/awslabs/jsii.git</url>
</scm>
<artifactId>calculator-lib</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<version>0.12.0</version>
<artifactId>calculator-lib</artifactId>
<version>0.12.0-devpreview</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<artifactId>calculator-base</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator-base</artifactId>
<version>0.12.0</version>
</dependency>
<dependency>
Expand Down
8 changes: 5 additions & 3 deletions ...es/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
"java": {
"maven": {
"artifactId": "calculator-lib",
"groupId": "software.amazon.jsii.tests"
"groupId": "software.amazon.jsii.tests",
"versionSuffix": "devpreview"
},
"package": "software.amazon.jsii.tests.calculator.lib"
},
Expand Down Expand Up @@ -165,7 +166,8 @@
"java": {
"maven": {
"artifactId": "calculator-lib",
"groupId": "software.amazon.jsii.tests"
"groupId": "software.amazon.jsii.tests",
"versionSuffix": "devpreview"
},
"package": "software.amazon.jsii.tests.calculator.lib"
},
Expand Down Expand Up @@ -8774,5 +8776,5 @@
}
},
"version": "0.12.0",
"fingerprint": "8nFIj9vNDHToLkleGPDYw7ATP0n//yO9jHcp0ZhibQg="
"fingerprint": "rrV8G53P/puLL1SWzH2HGgoG3/ucjuRmY4EgIFjUz4c="
}
10 changes: 5 additions & 5 deletions packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,28 +46,28 @@
<connection>scm:git:https://github.com/awslabs/jsii.git</connection>
<url>https://github.com/awslabs/jsii.git</url>
</scm>
<artifactId>calculator</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator</artifactId>
<version>0.12.0</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<artifactId>calculator-base</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator-base</artifactId>
<version>0.12.0</version>
</dependency>
<dependency>
<artifactId>calculator-base-of-base</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<artifactId>calculator-base-of-base</artifactId>
<version>0.12.0</version>
</dependency>
<dependency>
<artifactId>calculator-lib</artifactId>
<groupId>software.amazon.jsii.tests</groupId>
<version>0.12.0</version>
<artifactId>calculator-lib</artifactId>
<version>0.12.0-devpreview</version>
</dependency>
<dependency>
<groupId>software.amazon.jsii</groupId>
Expand Down