Skip to content
Snippets Groups Projects
Unverified Commit 83d702e1 authored by Sergio Zharinov's avatar Sergio Zharinov Committed by GitHub
Browse files

feat(maven): Allow for `SNAP` version qualifier (#6459)

parent e5e1a181
No related branches found
No related tags found
No related merge requests found
...@@ -185,7 +185,7 @@ export function qualifierType(token: Token): number { ...@@ -185,7 +185,7 @@ export function qualifierType(token: Token): number {
if (val === 'rc' || val === 'cr') { if (val === 'rc' || val === 'cr') {
return QualifierTypes.RC; return QualifierTypes.RC;
} }
if (val === 'snapshot') { if (val === 'snapshot' || val === 'snap') {
return QualifierTypes.Snapshot; return QualifierTypes.Snapshot;
} }
if ( if (
......
...@@ -39,6 +39,7 @@ describe('versioning/maven/compare', () => { ...@@ -39,6 +39,7 @@ describe('versioning/maven/compare', () => {
expect(compare('1.0GA', '1.0')).toEqual(0); expect(compare('1.0GA', '1.0')).toEqual(0);
expect(compare('1.0FINAL', '1.0')).toEqual(0); expect(compare('1.0FINAL', '1.0')).toEqual(0);
expect(compare('1.0-SNAPSHOT', '1-snapshot')).toEqual(0); expect(compare('1.0-SNAPSHOT', '1-snapshot')).toEqual(0);
expect(compare('1.0-SNAP', '1-snapshot')).toEqual(0);
expect(compare('1.0alpha1', '1.0-a1')).toEqual(0); expect(compare('1.0alpha1', '1.0-a1')).toEqual(0);
expect(compare('1.0alpha-1', '1.0-a1')).toEqual(0); expect(compare('1.0alpha-1', '1.0-a1')).toEqual(0);
expect(compare('1.0beta1', '1.0-b1')).toEqual(0); expect(compare('1.0beta1', '1.0-b1')).toEqual(0);
...@@ -65,6 +66,8 @@ describe('versioning/maven/compare', () => { ...@@ -65,6 +66,8 @@ describe('versioning/maven/compare', () => {
expect(compare('1', '1.1')).toEqual(-1); expect(compare('1', '1.1')).toEqual(-1);
expect(compare('1', '2')).toEqual(-1); expect(compare('1', '2')).toEqual(-1);
expect(compare('1-snapshot', '1')).toEqual(-1); expect(compare('1-snapshot', '1')).toEqual(-1);
expect(compare('1-snap', '1')).toEqual(-1);
expect(compare('1.2.3-snap1', '1.2.3-snap2')).toEqual(-1);
expect(compare('1', '1-sp')).toEqual(-1); expect(compare('1', '1-sp')).toEqual(-1);
expect(compare('1-foo2', '1-foo10')).toEqual(-1); expect(compare('1-foo2', '1-foo10')).toEqual(-1);
expect(compare('1-m1', '1-milestone-2')).toEqual(-1); expect(compare('1-m1', '1-milestone-2')).toEqual(-1);
...@@ -86,6 +89,8 @@ describe('versioning/maven/compare', () => { ...@@ -86,6 +89,8 @@ describe('versioning/maven/compare', () => {
expect(compare('1.1', '1')).toEqual(1); expect(compare('1.1', '1')).toEqual(1);
expect(compare('2', '1')).toEqual(1); expect(compare('2', '1')).toEqual(1);
expect(compare('1', '1-snapshot')).toEqual(1); expect(compare('1', '1-snapshot')).toEqual(1);
expect(compare('1', '1-snap')).toEqual(1);
expect(compare('1.2.3-snap2', '1.2.3-snap1')).toEqual(1);
expect(compare('1-sp', '1')).toEqual(1); expect(compare('1-sp', '1')).toEqual(1);
expect(compare('1-foo10', '1-foo2')).toEqual(1); expect(compare('1-foo10', '1-foo2')).toEqual(1);
expect(compare('1-milestone-2', '1-m1')).toEqual(1); expect(compare('1-milestone-2', '1-m1')).toEqual(1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment