Skip to content

Commit e2cae36

Browse files
committed
JNAerator: pom frenzy (dependencyManagement, pluginManagement, versions defined in
1 parent bd7485c commit e2cae36

File tree

17 files changed

+452
-495
lines changed

17 files changed

+452
-495
lines changed
Lines changed: 98 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,116 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
<groupId>com.nativelibs4java</groupId>
6-
<artifactId>anarres-jnaerator</artifactId>
7-
<name>Anarres JCPP (with JNAerator modifications)</name>
8-
<url>http://www.anarres.org/projects/jcpp/</url>
9-
<version>1.2.7-SNAPSHOT</version>
10-
<packaging>jar</packaging>
11-
<description>
12-
</description>
13-
14-
<parent>
15-
<groupId>com.nativelibs4java</groupId>
16-
<artifactId>jnaerator-parent</artifactId>
17-
<version>0.9.10-SNAPSHOT</version>
18-
<relativePath>../parent</relativePath>
19-
</parent>
20-
1+
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.nativelibs4java</groupId>
5+
<artifactId>anarres-jnaerator</artifactId>
6+
<name>Anarres JCPP (with JNAerator modifications)</name>
7+
<url>http://www.anarres.org/projects/jcpp/</url>
8+
<version>1.2.7-SNAPSHOT</version>
9+
<packaging>jar</packaging>
10+
<description></description>
11+
12+
<parent>
13+
<groupId>com.nativelibs4java</groupId>
14+
<artifactId>nativelibs4java-parent</artifactId>
15+
<version>1.7-SNAPSHOT</version>
16+
<relativePath>../../Parent</relativePath>
17+
</parent>
18+
2119
<developers>
2220
<developer>
2321
<id>anarres.author</id>
2422
<name>Anarres Author</name>
2523
<email>contact@anarres.org</email>
2624
</developer>
2725
</developers>
28-
29-
<licenses>
30-
<license>
31-
<name>Apache 2.0</name>
32-
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
33-
<distribution>repo</distribution>
34-
<comments>Anarres JCPP was patched with some modifications for use in JNAerator..
26+
27+
<licenses>
28+
<license>
29+
<name>Apache 2.0</name>
30+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
31+
<distribution>repo</distribution>
32+
<comments>Anarres JCPP was patched with some modifications for use in JNAerator..
3533
Diffs are trivial to make with Original Anarres SVN repository : https://svn.anarres.org/svn/repos/code/java/cpp/trunk/</comments>
36-
</license>
37-
</licenses>
38-
39-
<dependencies>
40-
34+
</license>
35+
</licenses>
36+
37+
<dependencies>
4138
<dependency>
4239
<groupId>junit</groupId>
4340
<artifactId>junit</artifactId>
4441
<version>4.10</version>
4542
<scope>test</scope>
4643
</dependency>
47-
<dependency>
48-
<groupId>gnu.getopt</groupId>
49-
<artifactId>java-getopt</artifactId>
50-
<version>1.0.13</version>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.apache.ant</groupId>
54-
<artifactId>ant</artifactId>
55-
<version>1.8.2</version>
56-
</dependency>
57-
<dependency>
58-
<groupId>commons-collections</groupId>
59-
<artifactId>commons-collections</artifactId>
60-
<version>3.2.1</version>
61-
</dependency>
62-
</dependencies>
63-
64-
<!--pluginRepositories>
65-
<pluginRepository>
66-
<id>nativelibs4java-plugins</id>
67-
<url>http://nativelibs4java.sourceforge.net/maven</url>
68-
</pluginRepository>
69-
</pluginRepositories-->
70-
<build>
71-
<plugins>
72-
73-
<plugin>
74-
<groupId>org.apache.maven.plugins</groupId>
75-
<artifactId>maven-jar-plugin</artifactId>
76-
<version>2.3.2</version>
77-
<configuration>
78-
<archive>
79-
<manifest>
80-
<mainClass>org.anarres.cpp.Main</mainClass>
81-
</manifest>
82-
</archive>
83-
</configuration>
84-
</plugin>
85-
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-surefire-plugin</artifactId>
89-
<version>2.11</version>
90-
<configuration>
91-
<redirectTestOutputToFile>true</redirectTestOutputToFile>
92-
</configuration>
93-
</plugin>
94-
44+
<dependency>
45+
<groupId>gnu.getopt</groupId>
46+
<artifactId>java-getopt</artifactId>
47+
<version>1.0.13</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.apache.ant</groupId>
51+
<artifactId>ant</artifactId>
52+
<version>1.8.2</version>
53+
</dependency>
54+
<dependency>
55+
<groupId>commons-collections</groupId>
56+
<artifactId>commons-collections</artifactId>
57+
<version>3.2.1</version>
58+
</dependency>
59+
</dependencies>
60+
61+
<build>
62+
<plugins>
63+
<plugin>
64+
<groupId>org.apache.maven.plugins</groupId>
65+
<artifactId>maven-jar-plugin</artifactId>
66+
<version>2.3.2</version>
67+
<configuration>
68+
<archive>
69+
<manifest>
70+
<mainClass>org.anarres.cpp.Main</mainClass>
71+
</manifest>
72+
</archive>
73+
</configuration>
74+
</plugin>
75+
76+
<plugin>
77+
<groupId>org.apache.maven.plugins</groupId>
78+
<artifactId>maven-surefire-plugin</artifactId>
79+
<version>2.11</version>
80+
<configuration>
81+
<redirectTestOutputToFile>true</redirectTestOutputToFile>
82+
</configuration>
83+
</plugin>
84+
85+
<plugin>
86+
<groupId>org.apache.maven.plugins</groupId>
87+
<artifactId>maven-compiler-plugin</artifactId>
88+
<version>2.3.2</version>
89+
<configuration>
90+
<source>1.5</source>
91+
<target>1.5</target>
92+
<encoding>UTF-8</encoding>
93+
</configuration>
94+
</plugin>
9595
<plugin>
96-
<groupId>org.apache.maven.plugins</groupId>
97-
<artifactId>maven-compiler-plugin</artifactId>
98-
<version>2.3.2</version>
99-
<configuration>
100-
<source>1.5</source>
101-
<target>1.5</target>
102-
<encoding>UTF-8</encoding>
103-
</configuration>
104-
</plugin>
105-
<plugin>
106-
<groupId>com.nativelibs4java</groupId>
107-
<artifactId>maven-velocity-plugin</artifactId>
108-
<version>${maven-velocity-plugin.version}</version>
109-
<executions>
110-
<execution>
111-
<goals>
112-
<goal>generate</goal>
113-
</goals>
114-
</execution>
115-
</executions>
116-
<configuration>
117-
<properties>
118-
<version>${version}</version>
119-
</properties>
120-
</configuration>
121-
</plugin>
122-
</plugins>
123-
</build>
96+
<groupId>com.nativelibs4java</groupId>
97+
<artifactId>maven-velocity-plugin</artifactId>
98+
<version>${maven-velocity-plugin.version}</version>
99+
<executions>
100+
<execution>
101+
<goals>
102+
<goal>generate</goal>
103+
</goals>
104+
</execution>
105+
</executions>
106+
<configuration>
107+
<properties>
108+
<version>${version}</version>
109+
</properties>
110+
</configuration>
111+
</plugin>
112+
</plugins>
113+
</build>
124114
</project>
125115

126116

libraries/jnaerator/ecj/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

libraries/jnaerator/ecj/deploy-ecj

Lines changed: 0 additions & 12 deletions
This file was deleted.

libraries/jnaerator/ecj/pom.xml

Lines changed: 0 additions & 41 deletions
This file was deleted.

libraries/jnaerator/jna-jnaerator/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,17 @@
66
<artifactId>jna-jnaerator</artifactId>
77
<name>JNAerator's Patched JNA Library</name>
88
<url>http://code.google.com/p/jnaerator/</url>
9-
<version>0.9.10-SNAPSHOT</version>
109
<packaging>jar</packaging>
1110

1211
<properties>
1312
<shadedArtifactAttached>false</shadedArtifactAttached>
1413
</properties>
1514

1615
<dependencies>
17-
1816
<dependency>
1917
<groupId>net.java.dev.jna</groupId>
2018
<artifactId>jna</artifactId>
21-
<version>3.4.0</version>
22-
<scope>compile</scope>
2319
</dependency>
24-
2520
</dependencies>
2621

2722
<parent>

libraries/jnaerator/jnaerator-parser/pom.xml

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,21 @@
66
<artifactId>jnaerator-parser</artifactId>
77
<name>JNAerator Parser</name>
88
<url>http://code.google.com/p/jnaerator/</url>
9-
<version>0.9.10-SNAPSHOT</version>
109
<packaging>jar</packaging>
1110

1211
<dependencies>
13-
1412
<dependency>
1513
<groupId>com.nativelibs4java</groupId>
1614
<artifactId>ochafik-util</artifactId>
17-
<version>${jnaerator.version}</version>
18-
<scope>compile</scope>
1915
</dependency>
20-
2116
<dependency>
2217
<groupId>org.antlr</groupId>
2318
<artifactId>antlr-runtime</artifactId>
24-
<version>3.4</version>
25-
<scope>compile</scope>
2619
</dependency>
27-
2820
<dependency>
2921
<groupId>com.nativelibs4java</groupId>
3022
<artifactId>anarres-jnaerator</artifactId>
31-
<version>1.2.7-SNAPSHOT</version>
32-
<scope>compile</scope>
3323
</dependency>
34-
3524
</dependencies>
3625

3726
<parent>
@@ -41,23 +30,12 @@
4130
<relativePath>../parent</relativePath>
4231
</parent>
4332

44-
4533
<build>
4634
<plugins>
47-
4835
<plugin>
4936
<groupId>org.antlr</groupId>
5037
<artifactId>antlr3-maven-plugin</artifactId>
51-
<version>3.4 </version>
52-
<executions>
53-
<execution>
54-
<goals>
55-
<goal>antlr</goal>
56-
</goals>
57-
</execution>
58-
</executions>
5938
</plugin>
60-
6139
</plugins>
6240
</build>
6341
</project>

libraries/jnaerator/jnaerator-rococoa-runtime/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,16 @@
66
<artifactId>jnaerator-rococoa-runtime</artifactId>
77
<name>JNAerator Rococoa Runtime</name>
88
<url>http://code.google.com/p/jnaerator/</url>
9-
<version>0.9.10-SNAPSHOT</version>
109
<packaging>jar</packaging>
1110

1211
<dependencies>
13-
1412
<dependency>
1513
<groupId>com.nativelibs4java</groupId>
1614
<artifactId>jnaerator-runtime</artifactId>
17-
<version>${jnaerator.version}</version>
18-
<type>jar</type>
19-
<scope>compile</scope>
20-
<optional>false</optional>
2115
</dependency>
22-
2316
<dependency>
2417
<groupId>org.rococoa</groupId>
2518
<artifactId>rococoa-core</artifactId>
26-
<!--<version>0.5.1-NL4J</version>-->
27-
<version>0.5</version>
28-
<type>jar</type>
29-
<scope>compile</scope>
30-
<optional>false</optional>
3119
</dependency>
3220
</dependencies>
3321

0 commit comments

Comments
 (0)