Skip to content

Commit 4227b04

Browse files
develardevelar
committed
up
2 parents 170f336 + 672e883 commit 4227b04

File tree

91 files changed

+1351
-510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1351
-510
lines changed

‎flexmojos-archetypes/flexmojos-archetypes-application/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.sonatype.flexmojos</groupId>
2222
<artifactId>flexmojos-archetypes</artifactId>
23-
<version>4.0-de7</version>
23+
<version>4.1-de0</version>
2424
</parent>
2525

2626
<artifactId>flexmojos-archetypes-application</artifactId>

‎flexmojos-archetypes/flexmojos-archetypes-library/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.sonatype.flexmojos</groupId>
2222
<artifactId>flexmojos-archetypes</artifactId>
23-
<version>4.0-de7</version>
23+
<version>4.1-de0</version>
2424
</parent>
2525

2626
<artifactId>flexmojos-archetypes-library</artifactId>

‎flexmojos-archetypes/flexmojos-archetypes-modular-webapp/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<artifactId>flexmojos-archetypes</artifactId>
2323
<groupId>org.sonatype.flexmojos</groupId>
24-
<version>4.0-de7</version>
24+
<version>4.1-de0</version>
2525
</parent>
2626

2727
<artifactId>flexmojos-archetypes-modular-webapp</artifactId>

‎flexmojos-archetypes/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.sonatype.flexmojos</groupId>
2222
<artifactId>flexmojos-parent</artifactId>
23-
<version>4.0-de7</version>
23+
<version>4.1-de0</version>
2424
</parent>
2525

2626
<artifactId>flexmojos-archetypes</artifactId>

‎flexmojos-generator/flexmojos-generator-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.sonatype.flexmojos</groupId>
1111
<artifactId>flexmojos-generator</artifactId>
12-
<version>4.0-de7</version>
12+
<version>4.1-de0</version>
1313
</parent>
1414

1515
<artifactId>flexmojos-generator-api</artifactId>

‎flexmojos-generator/flexmojos-generator-constraints/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.sonatype.flexmojos</groupId>
77
<artifactId>flexmojos-generator</artifactId>
8-
<version>4.0-de7</version>
8+
<version>4.1-de0</version>
99
</parent>
1010

1111
<artifactId>flexmojos-generator-constraints</artifactId>

‎flexmojos-generator/flexmojos-generator-graniteds-1.1.0/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.sonatype.flexmojos</groupId>
1111
<artifactId>flexmojos-generator</artifactId>
12-
<version>4.0-de7</version>
12+
<version>4.1-de0</version>
1313
</parent>
1414

1515
<artifactId>flexmojos-generator-graniteds-1.1.0</artifactId>

‎flexmojos-generator/flexmojos-generator-graniteds-2.0.0/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.sonatype.flexmojos</groupId>
1111
<artifactId>flexmojos-generator</artifactId>
12-
<version>4.0-de7</version>
12+
<version>4.1-de0</version>
1313
</parent>
1414

1515
<artifactId>flexmojos-generator-graniteds-2.0.0</artifactId>

‎flexmojos-generator/flexmojos-generator-graniteds-2.1.0/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.sonatype.flexmojos</groupId>
1111
<artifactId>flexmojos-generator</artifactId>
12-
<version>4.0-de7</version>
12+
<version>4.1-de0</version>
1313
</parent>
1414

1515
<artifactId>flexmojos-generator-graniteds-2.1.0</artifactId>

‎flexmojos-generator/flexmojos-generator-graniteds-2.2.0/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.sonatype.flexmojos</groupId>
1111
<artifactId>flexmojos-generator</artifactId>
12-
<version>4.0-de7</version>
12+
<version>4.1-de0</version>
1313
</parent>
1414

1515
<artifactId>flexmojos-generator-graniteds-2.2.0</artifactId>

‎flexmojos-generator/flexmojos-generator-graniteds-2.2.0/src/main/java/org/sonatype/flexmojos/generator/granitedsv2d2d0/GraniteDsGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private String getStringIndex1( String[] a )
204204
private String getStringByIndex( String[] a, int index )
205205
{
206206
String s = a == null ? null : ( a.length < index + 1 ? null : a[index] );
207-
return s == null ? null : new File( s ).toURI().toString();
207+
return s == null ? null : (s.startsWith(SHADED_PREFIX)) ? s : new File( s ).toURI().toString();
208208
}
209209

210210
private TemplateUri[] createTemplateUris( String baseUri, String uri )

‎flexmojos-generator/flexmojos-generator-internal-compiler-iface/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.sonatype.flexmojos</groupId>
77
<artifactId>flexmojos-generator</artifactId>
8-
<version>4.0-de7</version>
8+
<version>4.1-de0</version>
99
</parent>
1010

1111
<artifactId>flexmojos-generator-internal-compiler-iface</artifactId>

‎flexmojos-generator/flexmojos-generator-internal-flex2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.sonatype.flexmojos</groupId>
55
<artifactId>flexmojos-generator</artifactId>
6-
<version>4.0-de7</version>
6+
<version>4.1-de0</version>
77
</parent>
88

99
<artifactId>flexmojos-generator-internal-flex2</artifactId>

‎flexmojos-generator/flexmojos-generator-internal-threadlocal/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.sonatype.flexmojos</groupId>
77
<artifactId>flexmojos-generator</artifactId>
8-
<version>4.0-de7</version>
8+
<version>4.1-de0</version>
99
</parent>
1010

1111
<artifactId>flexmojos-generator-internal-threadlocal</artifactId>

‎flexmojos-generator/flexmojos-generator-mojo/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.sonatype.flexmojos</groupId>
55
<artifactId>flexmojos-generator</artifactId>
6-
<version>4.0-de7</version>
6+
<version>4.1-de0</version>
77
</parent>
88

99
<artifactId>flexmojos-generator-mojo</artifactId>

‎flexmojos-generator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<artifactId>flexmojos-parent</artifactId>
1313
<groupId>org.sonatype.flexmojos</groupId>
14-
<version>4.0-de7</version>
14+
<version>4.1-de0</version>
1515
</parent>
1616

1717
<artifactId>flexmojos-generator</artifactId>

‎flexmojos-maven-plugin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.sonatype.flexmojos</groupId>
1010
<artifactId>flexmojos-parent</artifactId>
11-
<version>4.0-de7</version>
11+
<version>4.1-de0</version>
1212
</parent>
1313

1414
<artifactId>flexmojos-maven-plugin</artifactId>

‎flexmojos-maven-plugin/src/main/java/org/sonatype/flexmojos/compatibilitykit/VersionUtils.java

+38-28
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,41 @@
1414
public class VersionUtils
1515
{
1616

17-
public static int[] splitVersion( String version, int size )
17+
public static boolean isMaxVersionOK( int[] fdkVersion, int[] maxVersion )
1818
{
19-
int[] versions = splitVersion( version );
19+
return isVersionOK( maxVersion, fdkVersion );
20+
}
2021

21-
if ( versions.length != size )
22+
public static boolean isMaxVersionOK( String fdkVersion, String maxVersion )
23+
{
24+
return isMaxVersionOK( splitVersion( fdkVersion ), splitVersion( maxVersion ) );
25+
}
26+
27+
public static boolean isMinVersionOK( int[] fdkVersion, int[] minVersion )
28+
{
29+
return isVersionOK( fdkVersion, minVersion );
30+
}
31+
32+
public static boolean isMinVersionOK( String fdkVersion, String minVersion )
33+
{
34+
return isVersionOK( splitVersion( fdkVersion ), splitVersion( minVersion ) );
35+
}
36+
37+
private static boolean isVersionOK( int[] fdkVersion, int[] minVersion )
38+
{
39+
int lenght = min( fdkVersion.length, minVersion.length );
40+
41+
int result = 0;
42+
for ( int i = 0; i < lenght; i++ )
2243
{
23-
int[] temp = new int[size];
24-
Arrays.fill( temp, 0 );
25-
System.arraycopy( versions, 0, temp, 0, Math.min( versions.length, size ) );
26-
versions = temp;
44+
result = fdkVersion[i] - minVersion[i];
45+
if ( result != 0 )
46+
{
47+
return result > -1;
48+
}
2749
}
2850

29-
return versions;
51+
return result > -1;
3052
}
3153

3254
public static int[] splitVersion( String version )
@@ -60,31 +82,19 @@ public static int[] splitVersion( String version )
6082
return versions;
6183
}
6284

63-
public static boolean isMinVersionOK( int[] fdkVersion, int[] minVersion )
64-
{
65-
return isVersionOK( fdkVersion, minVersion );
66-
}
67-
68-
public static boolean isMaxVersionOK( int[] fdkVersion, int[] maxVersion )
69-
{
70-
return isVersionOK( maxVersion, fdkVersion );
71-
}
72-
73-
private static boolean isVersionOK( int[] fdkVersion, int[] minVersion )
85+
public static int[] splitVersion( String version, int size )
7486
{
75-
int lenght = min( fdkVersion.length, minVersion.length );
87+
int[] versions = splitVersion( version );
7688

77-
int result = 0;
78-
for ( int i = 0; i < lenght; i++ )
89+
if ( versions.length != size )
7990
{
80-
result = fdkVersion[i] - minVersion[i];
81-
if ( result != 0 )
82-
{
83-
return result > -1;
84-
}
91+
int[] temp = new int[size];
92+
Arrays.fill( temp, 0 );
93+
System.arraycopy( versions, 0, temp, 0, Math.min( versions.length, size ) );
94+
versions = temp;
8595
}
8696

87-
return result > -1;
97+
return versions;
8898
}
8999

90100
}

0 commit comments

Comments
 (0)