Skip to content
This repository was archived by the owner on Dec 10, 2022. It is now read-only.

Commit 0db7798

Browse files
soywizsoywiz
committed
#31 Fix maven pom.xml version crazyness
Added update_version.sh script to easily update jtransc version Simplified pom.xml versions Updated to 0.2.1
1 parent 8f11f9d commit 0db7798

File tree

18 files changed

+480
-92
lines changed

18 files changed

+480
-92
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
*.ipr
33
*.iml
44
*.jar
5+
*.versionsBackup
6+
*.java-e
57
/.idea/
68
/libs/
79
/out/

‎inception/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0">
22
<modelVersion>4.0.0</modelVersion>
33

4-
<properties>
5-
<jtransc.version>0.2.0</jtransc.version>
6-
<kotlin.version>1.0.1-2</kotlin.version>
7-
</properties>
4+
<parent>
5+
<groupId>com.jtransc</groupId>
6+
<artifactId>jtransc</artifactId>
7+
<version>0.2.0</version>
8+
<relativePath>../pom.xml</relativePath>
9+
</parent>
810

9-
<groupId>com.jtransc</groupId>
1011
<artifactId>jtransc-main-inception</artifactId>
11-
<version>0.2.0</version>
1212
<packaging>jar</packaging>
1313

1414
<dependencies>

‎jtransc-buildjar-maven-plugin/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
<project>
1818
<modelVersion>4.0.0</modelVersion>
1919

20-
<groupId>com.jtransc</groupId>
20+
<parent>
21+
<groupId>com.jtransc</groupId>
22+
<artifactId>jtransc</artifactId>
23+
<version>0.2.1</version>
24+
<relativePath>../pom.xml</relativePath>
25+
</parent>
26+
2127
<artifactId>jtransc-buildjar-maven-plugin</artifactId>
22-
<version>0.2.0</version>
2328
<packaging>maven-plugin</packaging>
2429

25-
<properties>
26-
<kotlin.version>1.0.1-2</kotlin.version>
27-
<jtransc.version>0.2.0</jtransc.version>
28-
</properties>
29-
3030
<!--
3131
<name>Sample Parameter-less Maven Plugin</name>
3232
-->

‎jtransc-core/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<parent>
2525
<groupId>com.jtransc</groupId>
2626
<artifactId>jtransc</artifactId>
27-
<relativePath>..</relativePath>
28-
<version>0.2.0</version>
27+
<version>0.2.1</version>
28+
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

3131
<artifactId>jtransc-core</artifactId>
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>com.jtransc</groupId>
7575
<artifactId>jtransc-rt-core</artifactId>
76-
<version>0.2.0</version>
76+
<version>${jtransc.version}</version>
7777
</dependency>
7878
</dependencies>
7979

‎jtransc-core/pom.xml.versionsBackup

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2016 Carlos Ballesteros Velasco
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<project
19+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
20+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
21+
22+
<modelVersion>4.0.0</modelVersion>
23+
24+
<parent>
25+
<groupId>com.jtransc</groupId>
26+
<artifactId>jtransc</artifactId>
27+
<version>0.2.0</version>
28+
<relativePath>../pom.xml</relativePath>
29+
</parent>
30+
31+
<artifactId>jtransc-core</artifactId>
32+
<name>jtransc core</name>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>org.jetbrains.kotlin</groupId>
37+
<artifactId>kotlin-stdlib</artifactId>
38+
<version>${kotlin.version}</version>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>org.jetbrains.kotlin</groupId>
43+
<artifactId>kotlin-runtime</artifactId>
44+
<version>${kotlin.version}</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>org.jetbrains.kotlin</groupId>
49+
<artifactId>kotlin-reflect</artifactId>
50+
<version>${kotlin.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>com.jtransc</groupId>
54+
<artifactId>jtransc-utils</artifactId>
55+
<version>${jtransc.version}</version>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.ow2.asm</groupId>
59+
<artifactId>asm-all</artifactId>
60+
<version>5.0.4</version>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.jtransc</groupId>
64+
<artifactId>jtransc-rt-core</artifactId>
65+
<version>${jtransc.version}</version>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.jtransc</groupId>
69+
<artifactId>jtransc-rt</artifactId>
70+
<version>${jtransc.version}</version>
71+
<scope>provided</scope>
72+
</dependency>
73+
<dependency>
74+
<groupId>com.jtransc</groupId>
75+
<artifactId>jtransc-rt-core</artifactId>
76+
<version>${jtransc.version}</version>
77+
</dependency>
78+
</dependencies>
79+
80+
<build>
81+
<sourceDirectory>src</sourceDirectory>
82+
<testSourceDirectory>test</testSourceDirectory>
83+
<resources>
84+
<resource>
85+
<directory>resources</directory>
86+
</resource>
87+
</resources>
88+
<testResources>
89+
<testResource>
90+
<directory>testresources</directory>
91+
</testResource>
92+
</testResources>
93+
<plugins>
94+
<plugin>
95+
<artifactId>maven-assembly-plugin</artifactId>
96+
<configuration>
97+
<archive>
98+
<manifest>
99+
<mainClass>jtransc.MainKt</mainClass>
100+
</manifest>
101+
</archive>
102+
<descriptorRefs>
103+
<descriptorRef>jar-with-dependencies</descriptorRef>
104+
</descriptorRefs>
105+
</configuration>
106+
</plugin>
107+
</plugins>
108+
</build>
109+
110+
</project>

‎jtransc-debugger/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<parent>
2525
<groupId>com.jtransc</groupId>
2626
<artifactId>jtransc</artifactId>
27-
<relativePath>..</relativePath>
28-
<version>0.2.0</version>
27+
<version>0.2.1</version>
28+
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

3131
<artifactId>jtransc-debugger</artifactId>

‎jtransc-gen-haxe/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
<parent>
2525
<groupId>com.jtransc</groupId>
2626
<artifactId>jtransc</artifactId>
27-
<relativePath>..</relativePath>
28-
<version>0.2.0</version>
27+
<version>0.2.1</version>
28+
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

3131
<artifactId>jtransc-gen-haxe</artifactId>

‎jtransc-main-run/pom.xml

+8-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,20 @@
2121

2222
<modelVersion>4.0.0</modelVersion>
2323

24-
<groupId>com.jtransc</groupId>
24+
<parent>
25+
<groupId>com.jtransc</groupId>
26+
<artifactId>jtransc</artifactId>
27+
<version>0.2.0</version>
28+
<relativePath>../pom.xml</relativePath>
29+
</parent>
30+
2531
<artifactId>jtransc-main-run</artifactId>
26-
<version>0.2.0</version>
2732

2833
<dependencies>
2934
<dependency>
3035
<groupId>com.jtransc</groupId>
3136
<artifactId>jtransc-main</artifactId>
32-
<version>0.2.0</version>
37+
<version>${jtransc.version}</version>
3338
</dependency>
3439
</dependencies>
3540

‎jtransc-main/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>com.jtransc</groupId>
2626
<artifactId>jtransc</artifactId>
2727
<relativePath>..</relativePath>
28-
<version>0.2.0</version>
28+
<version>0.2.1</version>
2929
</parent>
3030

3131
<artifactId>jtransc-main</artifactId>

‎jtransc-maven-plugin/example/pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
<project>
1818
<modelVersion>4.0.0</modelVersion>
1919

20-
<groupId>com.jtransc</groupId>
21-
<artifactId>jtransc-maven-plugin-example</artifactId>
22-
<version>0.2.0</version>
20+
<parent>
21+
<groupId>com.jtransc</groupId>
22+
<artifactId>jtransc</artifactId>
23+
<version>0.2.0</version>
24+
<relativePath>../../pom.xml</relativePath>
25+
</parent>
26+
27+
<artifactId>jtransc-maven-plugin-example</artifactId>
2328
<!--
2429
<packaging>maven-plugin</packaging>
2530
<name>Sample Parameter-less Maven Plugin</name>
2631
-->
2732

28-
<properties>
29-
<kotlin.version>1.0.1-2</kotlin.version>
30-
<jtransc.version>0.2.0</jtransc.version>
31-
</properties>
32-
3333
<dependencies>
3434
<dependency>
3535
<groupId>org.jetbrains.kotlin</groupId>

‎jtransc-maven-plugin/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
<project>
1818
<modelVersion>4.0.0</modelVersion>
1919

20-
<groupId>com.jtransc</groupId>
20+
<parent>
21+
<groupId>com.jtransc</groupId>
22+
<artifactId>jtransc</artifactId>
23+
<version>0.2.1</version>
24+
<relativePath>../pom.xml</relativePath>
25+
</parent>
26+
2127
<artifactId>jtransc-maven-plugin</artifactId>
22-
<version>0.2.0</version>
2328
<packaging>maven-plugin</packaging>
2429

25-
<properties>
26-
<kotlin.version>1.0.1-2</kotlin.version>
27-
<jtransc.version>0.2.0</jtransc.version>
28-
</properties>
29-
3030
<!--
3131
<name>Sample Parameter-less Maven Plugin</name>
3232
-->

‎jtransc-rt-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<groupId>com.jtransc</groupId>
2626
<artifactId>jtransc</artifactId>
2727
<relativePath>..</relativePath>
28-
<version>0.2.0</version>
28+
<version>0.2.1</version>
2929
</parent>
3030

3131
<artifactId>jtransc-rt-core</artifactId>

‎jtransc-rt-core/src/com/jtransc/JTranscVersion.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
import com.jtransc.annotation.haxe.HaxeMethodBody;
44

55
public class JTranscVersion {
6+
static private final String version = "0.2.1";
7+
68
static public String getVersion() {
7-
return "0.2.0";
9+
return version;
810
}
911

1012
@HaxeMethodBody("return HaxeNatives.str('haxe');")

‎jtransc-rt/pom.xml

+17-16
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,12 @@
2020
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
2121

2222
<modelVersion>4.0.0</modelVersion>
23-
<build>
24-
<sourceDirectory>src</sourceDirectory>
25-
<resources><resource><directory>resources</directory></resource></resources>
26-
<plugins>
27-
<plugin>
28-
<groupId>org.apache.maven.plugins</groupId>
29-
<artifactId>maven-compiler-plugin</artifactId>
30-
<configuration>
31-
<source>1.8</source>
32-
<target>1.8</target>
33-
</configuration>
34-
</plugin>
35-
</plugins>
36-
</build>
3723

3824
<parent>
3925
<groupId>com.jtransc</groupId>
4026
<artifactId>jtransc</artifactId>
4127
<relativePath>..</relativePath>
42-
<version>0.2.0</version>
28+
<version>0.2.1</version>
4329
</parent>
4430

4531
<artifactId>jtransc-rt</artifactId>
@@ -48,7 +34,22 @@
4834
<dependency>
4935
<groupId>com.jtransc</groupId>
5036
<artifactId>jtransc-rt-core</artifactId>
51-
<version>${jtransc.version}</version>
37+
<version>${project.version}</version>
5238
</dependency>
5339
</dependencies>
40+
41+
<build>
42+
<sourceDirectory>src</sourceDirectory>
43+
<resources><resource><directory>resources</directory></resource></resources>
44+
<plugins>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-compiler-plugin</artifactId>
48+
<configuration>
49+
<source>1.8</source>
50+
<target>1.8</target>
51+
</configuration>
52+
</plugin>
53+
</plugins>
54+
</build>
5455
</project>

0 commit comments

Comments
 (0)