Skip to content

Commit

Permalink
Since 2.0 is Java 9-only, move all jdk9 supplement classes into their…
Browse files Browse the repository at this point in the history
… places, drop inclusion of that project, and drop __redirected
  • Loading branch information
dmlloyd committed Dec 6, 2016
1 parent 06c8300 commit 19fe543
Show file tree
Hide file tree
Showing 21 changed files with 154 additions and 3,734 deletions.
37 changes: 2 additions & 35 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<properties>
<skip.compile>false</skip.compile>
<version.org.wildfly.checkstyle-config>1.0.5.Final</version.org.wildfly.checkstyle-config>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>9</maven.compiler.source>
<maven.compiler.target>9</maven.compiler.target>
</properties>

<build>
Expand Down Expand Up @@ -129,27 +129,6 @@
</configuration>
</plugin>

<!-- Remote resources -->
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>add-java9-supplement</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeGroupIds>org.jboss.modules</includeGroupIds>
<includeArtifactIds>jboss-modules-jdk9-supplement</includeArtifactIds>
<excludeTransitive>true</excludeTransitive>
<includes>**/*.class</includes>
<outputDirectory>${project.build.directory}/generated-resources/META-INF/versions/9</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>

<!-- JAR -->
<plugin>
<artifactId>maven-jar-plugin</artifactId>
Expand Down Expand Up @@ -186,18 +165,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules-jdk9-supplement</artifactId>
<version>1.2.Final</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-impl-base</artifactId>
Expand Down
218 changes: 0 additions & 218 deletions src/main/java/__redirected/__DatatypeFactory.java

This file was deleted.

Loading

0 comments on commit 19fe543

Please sign in to comment.