Skip to content

Commit

Permalink
global: moving towards jdk8 support
Browse files Browse the repository at this point in the history
Signed-off-by: Ketoth Xupack <ketoth.xupack@gmail.com>
  • Loading branch information
KetothXupack committed Jun 26, 2014
1 parent c755adf commit c1a162b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ language: java
jdk:
- openjdk7
- oraclejdk7
- oraclejdk8

branches:
only:
Expand Down
4 changes: 2 additions & 2 deletions parent/java-toolkit-ci/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<maven.failsafe-plugin.version>2.16</maven.failsafe-plugin.version>
<maven.findbugs-plugin.version>2.3.2</maven.findbugs-plugin.version>
<maven.jacoco-aggregator-plugin.version>0.0.1-SNAPSHOT</maven.jacoco-aggregator-plugin.version>
<maven.jacoco-plugin.version>0.6.5.201403032054</maven.jacoco-plugin.version>
<maven.jacoco-plugin.version>0.7.1.201405082137</maven.jacoco-plugin.version>
<maven.javadoc-plugin.version>2.9.1</maven.javadoc-plugin.version>
<maven.jdepend-plugin.version>2.0-beta-2</maven.jdepend-plugin.version>
<maven.pmd-plugin.version>2.5</maven.pmd-plugin.version>
Expand Down Expand Up @@ -158,7 +158,7 @@
<id>jacoco-prepare-it</id>
<phase>pre-integration-test</phase>
<goals>
<goal>prepare-agent</goal>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<propertyName>jacoco.argline.it</propertyName>
Expand Down
2 changes: 1 addition & 1 deletion parent/java-toolkit-env/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<maven.site-plugin.version>3.3</maven.site-plugin.version>

<!-- libs -->
<aspectjrt.version>1.7.4</aspectjrt.version>
<aspectjrt.version>1.8.1</aspectjrt.version>
<findbugs-annotations.version>2.0.3</findbugs-annotations.version>
<jcip-annotations.version>1.0</jcip-annotations.version>
<jsr305.version>2.0.3</jsr305.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ public abstract class Jaxb2PluginTestSupport implements TestLifecycleListener {
private static final String TEST_RESOURCES_PATH = "src/test/resources/";


//static {
// System.setProperty("javax.xml.accessExternalStylesheet", "all");
// System.setProperty("javax.xml.accessExternalSchema", "all");
// System.setProperty("javax.xml.accessExternalDTD", "all");
//}
static {
System.setProperty("javax.xml.accessExternalStylesheet", "all");
System.setProperty("javax.xml.accessExternalSchema", "all");
System.setProperty("javax.xml.accessExternalDTD", "all");
}

private final String[] args;
private final String resources;
Expand Down
4 changes: 2 additions & 2 deletions projects/jaxws-json/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<groupId>org.jvnet.jax-ws-commons</groupId>
<artifactId>jaxws-maven-plugin</artifactId>
<version>${jaxws-maven-plugin.version}</version>
<version>2.3</version>
<executions>
<execution>
<goals>
Expand Down

0 comments on commit c1a162b

Please sign in to comment.