Skip to content

Commit a4742cf

Browse files
ochafikochafik
committed
parent pom cleanup
1 parent 99f9854 commit a4742cf

File tree

1 file changed

+14
-190
lines changed

1 file changed

+14
-190
lines changed

‎libraries/pom.xml‎

Lines changed: 14 additions & 190 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.nativelibs4java</groupId>
55
<artifactId>nativelibs4java-parent</artifactId>
6-
<version>1.9</version>
6+
<version>1.10-SNAPSHOT</version>
77
<packaging>pom</packaging>
88
<inceptionYear>2009</inceptionYear>
99
<name>NativeLibs4Java Common Configuration</name>
@@ -14,62 +14,34 @@
1414
<version>7</version>
1515
</parent>
1616

17+
<prerequisites>
18+
<maven>2.2.1</maven>
19+
</prerequisites>
20+
1721
<repositories>
1822
<repository>
1923
<id>sonatype</id>
2024
<name>Sonatype OSS Snapshots Repository</name>
2125
<url>http://oss.sonatype.org/content/groups/public</url>
2226
</repository>
23-
<!--repository>
24-
<id>typesafe</id>
25-
<name>typesafe-releases</name>
26-
<url>http://repo.typesafe.com/typesafe/maven-releases</url>
27-
</repository>
28-
<repository>
29-
<id>typesafe2</id>
30-
<name>Typesafe Repository</name>
31-
<url>http://repo.typesafe.com/typesafe/releases/</url>
32-
</repository-->
33-
<!--repository>
34-
<id>nativelibs4java</id>
35-
<name>nativelibs4java Maven2 Repository</name>
36-
<url>http://nativelibs4java.sourceforge.net/maven</url>
37-
</repository-->
3827
</repositories>
28+
3929
<pluginRepositories>
4030
<pluginRepository>
4131
<id>sonatype</id>
4232
<name>Sonatype OSS Snapshots Repository</name>
4333
<url>http://oss.sonatype.org/content/groups/public</url>
4434
</pluginRepository>
45-
<pluginRepository>
46-
<id>typesafe</id>
47-
<name>typesafe-releases</name>
48-
<url>http://repo.typesafe.com/typesafe/maven-releases</url>
49-
</pluginRepository>
50-
<pluginRepository>
51-
<id>typesafe2</id>
52-
<name>Typesafe Repository</name>
53-
<url>http://repo.typesafe.com/typesafe/releases/</url>
54-
</pluginRepository>
55-
<!--pluginRepository>
56-
<id>nativelibs4java</id>
57-
<name>nativelibs4java Maven2 Repository</name>
58-
<url>http://nativelibs4java.sourceforge.net/maven</url>
59-
</pluginRepository-->
6035
</pluginRepositories>
6136

6237
<properties>
6338
<mainClass></mainClass>
6439
<!-- <maven.javadoc.failOnError>false</maven.javadoc.failOnError> -->
6540
<versionSpecificSubPackage></versionSpecificSubPackage>
66-
<bridj.version>0.7.0</bridj.version>
67-
<maven-velocity-plugin.version>0.9</maven-velocity-plugin.version>
68-
<jnaerator.version>0.12</jnaerator.version>
41+
<bridj.version>0.7.1-SNAPSHOT</bridj.version>
42+
<maven-velocity-plugin.version>0.10-SNAPSHOT</maven-velocity-plugin.version>
43+
<jnaerator.version>0.13-SNAPSHOT</jnaerator.version>
6944

70-
<jna.version></jna.version>
71-
<rococoa.version></rococoa.version>
72-
<scala.version>2.10.4</scala.version>
7345

7446
<shadedArtifactAttached>true</shadedArtifactAttached>
7547
<shadedClassifierName>shaded</shadedClassifierName>
@@ -111,34 +83,6 @@ Most of these wrappers are created automatically by JNAerator.
11183
<url>git@github.com:ochafik/nativelibs4java.git</url>
11284
</scm>
11385

114-
<dependencies>
115-
<dependency>
116-
<groupId>junit</groupId>
117-
<artifactId>junit</artifactId>
118-
<version>4.10</version>
119-
<scope>test</scope>
120-
</dependency>
121-
</dependencies>
122-
123-
<dependencyManagement>
124-
<dependencies>
125-
<dependency>
126-
<groupId>org.scala-lang</groupId>
127-
<artifactId>scala-library</artifactId>
128-
<version>${scala.version}</version>
129-
</dependency>
130-
<dependency>
131-
<groupId>org.scala-lang</groupId>
132-
<artifactId>scala-reflect</artifactId>
133-
<version>${scala.version}</version>
134-
</dependency>
135-
<dependency>
136-
<groupId>org.scala-lang</groupId>
137-
<artifactId>scala-compiler</artifactId>
138-
<version>${scala.version}</version>
139-
</dependency>
140-
</dependencies>
141-
</dependencyManagement>
14286
<build>
14387
<pluginManagement>
14488
<plugins>
@@ -185,29 +129,6 @@ Most of these wrappers are created automatically by JNAerator.
185129
</configuration>
186130
</plugin>
187131
-->
188-
<plugin>
189-
<groupId>net.alchim31.maven</groupId>
190-
<artifactId>scala-maven-plugin</artifactId>
191-
<version>3.1.0</version>
192-
<executions>
193-
<execution>
194-
<goals>
195-
<goal>compile</goal>
196-
<goal>testCompile</goal>
197-
<goal>doc-jar</goal>
198-
</goals>
199-
</execution>
200-
</executions>
201-
<configuration>
202-
<args>
203-
<arg>-optimise</arg>
204-
</args>
205-
<jvmArgs>
206-
<jvmArg>-Xms64m</jvmArg>
207-
<jvmArg>-Xmx1024m</jvmArg>
208-
</jvmArgs>
209-
</configuration>
210-
</plugin>
211132
<plugin>
212133
<groupId>com.nativelibs4java</groupId>
213134
<artifactId>maven-velocity-plugin</artifactId>
@@ -393,7 +314,7 @@ Most of these wrappers are created automatically by JNAerator.
393314
<plugin>
394315
<groupId>org.apache.maven.plugins</groupId>
395316
<artifactId>maven-compiler-plugin</artifactId>
396-
<version>2.3.2</version>
317+
<version>3.2</version>
397318
<configuration>
398319
<source>1.5</source>
399320
<target>1.5</target>
@@ -404,7 +325,7 @@ Most of these wrappers are created automatically by JNAerator.
404325
<plugin>
405326
<groupId>org.apache.maven.plugins</groupId>
406327
<artifactId>maven-surefire-plugin</artifactId>
407-
<version>2.14</version>
328+
<version>2.18.1</version>
408329
<configuration>
409330
<!--<argLine>-d32</argLine>-->
410331
</configuration>
@@ -426,71 +347,6 @@ Most of these wrappers are created automatically by JNAerator.
426347
</distributionManagement-->
427348

428349
<profiles>
429-
<profile>
430-
<id>devel</id>
431-
<activation>
432-
<activeByDefault>true</activeByDefault>
433-
</activation>
434-
<properties>
435-
<maven.compiler.debug>true</maven.compiler.debug>
436-
</properties>
437-
<modules>
438-
<module>InteropIntegration</module>
439-
<module>Velocity</module>
440-
<module>BridJ</module>
441-
<module>jnaerator</module>
442-
<module>OpenCL</module>
443-
<!-- <module>OpenCL-JNA</module> -->
444-
<module>Utils</module>
445-
<module>IdleTime</module>
446-
<module>JarShrinker</module>
447-
</modules>
448-
</profile>
449-
<profile>
450-
<id>coordinated-release</id>
451-
<activation>
452-
<activeByDefault>true</activeByDefault>
453-
</activation>
454-
<modules>
455-
<module>Velocity</module>
456-
<module>BridJ</module>
457-
<module>jnaerator</module>
458-
<module>OpenCL</module>
459-
<!-- <module>OpenCL-JNA</module> -->
460-
<module>Utils</module>
461-
</modules>
462-
</profile>
463-
<profile>
464-
<id>bridj-jnaerator-release</id>
465-
<activation>
466-
<activeByDefault>false</activeByDefault>
467-
</activation>
468-
<modules>
469-
<module>Velocity</module>
470-
<module>BridJ</module>
471-
<module>jnaerator</module>
472-
</modules>
473-
</profile>
474-
<profile>
475-
<id>javacl-release</id>
476-
<activation>
477-
<activeByDefault>false</activeByDefault>
478-
</activation>
479-
<modules>
480-
<module>OpenCL</module>
481-
<module>Utils</module>
482-
</modules>
483-
</profile>
484-
<profile>
485-
<id>scalacl-release</id>
486-
<activation>
487-
<activeByDefault>false</activeByDefault>
488-
</activation>
489-
<modules>
490-
<module>Scalaxy</module>
491-
<module>ScalaCL</module>
492-
</modules>
493-
</profile>
494350
<profile>
495351
<id>gpg</id>
496352
<activation>
@@ -515,12 +371,12 @@ Most of these wrappers are created automatically by JNAerator.
515371
</plugins>
516372
</build>
517373
</profile>
518-
<profile>
519-
<id>regenerate</id>
374+
<profile>
375+
<id>regenerate</id>
520376
<activation>
521377
<activeByDefault>false</activeByDefault>
522378
</activation>
523-
</profile>
379+
</profile>
524380
<profile>
525381
<id>webstart</id>
526382
<activation>
@@ -532,38 +388,6 @@ Most of these wrappers are created automatically by JNAerator.
532388
</properties>
533389
<build>
534390
<plugins>
535-
<!--plugin>
536-
<artifactId>maven-antrun-plugin</artifactId>
537-
<version>1.7</version>
538-
<executions>
539-
<execution>
540-
<phase>install</phase>
541-
<configuration>
542-
<target>
543-
<scp todir="${nativelibs4java.sourceforge.user}:${nativelibs4java.sourceforge.password}@web.sourceforge.net:/home/groups/n/na/nativelibs4java/htdocs/webstart/jnaerator" trust="true" failonerror="true">
544-
<fileset file="${project.build.directory}/${project.name}-${project.version}-shaded.jar" />
545-
</scp>
546-
</target>
547-
</configuration>
548-
<goals>
549-
<goal>run</goal>
550-
</goals>
551-
</execution>
552-
</executions>
553-
554-
<dependencies>
555-
<dependency>
556-
<groupId>ant</groupId>
557-
<artifactId>ant-jsch</artifactId>
558-
<version>1.6.5</version>
559-
</dependency>
560-
<dependency>
561-
<groupId>com.jcraft</groupId>
562-
<artifactId>jsch</artifactId>
563-
<version>0.1.42</version>
564-
</dependency>
565-
</dependencies>
566-
</plugin-->
567391
<plugin>
568392
<groupId>org.apache.maven.plugins</groupId>
569393
<artifactId>maven-jarsigner-plugin</artifactId>

0 commit comments

Comments
 (0)