diff options
| author | Christian Melchior <christian@ilios.dk> | 2017-11-12 15:37:15 +0100 |
|---|---|---|
| committer | Christian Melchior <christian@ilios.dk> | 2017-11-12 15:37:15 +0100 |
| commit | 215a61f3a0a1d2794df51611218068ab09a90d56 (patch) | |
| tree | 7309f91e448e346a26d7f339fbd84464402d9406 /pom.xml | |
| parent | f4769c7ad702fa529a790106ea5c318a7af5c7b7 (diff) | |
| parent | e1f0bba5de4dc03a9debfab333683f07cfbcb594 (diff) | |
| download | javassist-215a61f3a0a1d2794df51611218068ab09a90d56.tar.gz javassist-215a61f3a0a1d2794df51611218068ab09a90d56.zip | |
Merge branch 'master' into cm/bug/classpath-close
# Conflicts:
# pom.xml
# src/main/javassist/ByteArrayClassPath.java
# src/main/javassist/ClassClassPath.java
# src/main/javassist/ClassPoolTail.java
# src/main/javassist/LoaderClassPath.java
# src/main/javassist/URLClassPath.java
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 20 |
1 files changed, 15 insertions, 5 deletions
@@ -11,6 +11,9 @@ <name>Javassist</name> <url>http://www.javassist.org/</url> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> <organization> <name>Shigeru Chiba, www.javassist.org</name> </organization> @@ -167,7 +170,7 @@ <additionalClasspathElement>resources</additionalClasspathElement> </additionalClasspathElements> <forkMode>once</forkMode> - <workingDirectory>runtest</workingDirectory> + <workingDirectory>${project.build.directory}/runtest</workingDirectory> </configuration> </plugin> <plugin> @@ -207,6 +210,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> + <version>3.3.0</version> <executions> <execution> <id>bundle-manifest</id> @@ -308,10 +312,16 @@ </profiles> <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.hamcrest</groupId> + <artifactId>hamcrest-all</artifactId> + <version>1.3</version> + <scope>test</scope> </dependency> </dependencies> </project> |