projects
/
yaz4j-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Same version in win32/pom.xml and pom.xml
[yaz4j-moved-to-github.git]
/
win32
/
pom.xml
diff --git
a/win32/pom.xml
b/win32/pom.xml
index
829d645
..
06360c0
100644
(file)
--- a/
win32/pom.xml
+++ b/
win32/pom.xml
@@
-3,7
+3,7
@@
<parent>
<groupId>org.yaz4j</groupId>
<artifactId>yaz4j-lib</artifactId>
<parent>
<groupId>org.yaz4j</groupId>
<artifactId>yaz4j-lib</artifactId>
- <version>1.3</version>
+ <version>1.6-SNAPSHOT</version>
</parent>
<groupId>org.yaz4j</groupId>
<artifactId>yaz4j</artifactId>
</parent>
<groupId>org.yaz4j</groupId>
<artifactId>yaz4j</artifactId>
@@
-16,7
+16,8
@@
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>native-maven-plugin</artifactId>
+ <artifactId>native-maven-plugin</artifactId>
+ <version>1.0-alpha-8</version>
<extensions>true</extensions>
<configuration>
<javahOS>win32</javahOS>
<extensions>true</extensions>
<configuration>
<javahOS>win32</javahOS>
@@
-55,11
+56,12
@@
because they need to load so/dll -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
because they need to load so/dll -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<encoding>UTF-8</encoding>
<configuration>
<encoding>UTF-8</encoding>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@
-68,7
+70,8
@@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <executions>
+ <version>1.9.1</version>
+ <executions>
<execution>
<id>include-generated-test-sources</id>
<phase>generate-test-sources</phase>
<execution>
<id>include-generated-test-sources</id>
<phase>generate-test-sources</phase>
@@
-85,11
+88,12
@@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
+ <version>2.18.1</version>
+ <configuration>
<forkMode>once</forkMode>
<workingDirectory>target</workingDirectory>
<environmentVariables>
<forkMode>once</forkMode>
<workingDirectory>target</workingDirectory>
<environmentVariables>
- <PATH>${yaz.path}\bin</PATH>
+ <PATH>${project.build.directory};${yaz.path}\bin</PATH>
</environmentVariables>
</configuration>
</plugin>
</environmentVariables>
</configuration>
</plugin>