Skip to content

Commit

Permalink
Moved resources and added the Oracle repository.
Browse files Browse the repository at this point in the history
Moved all non-java files out of src/main/java and into src/main/resources, and added Oracle's repository since the artifact: com.sleepycat:je:6.4.9 isn't available in Maven Central.

Also set the syslog4j version to 0.9.48, since it most closely resembles what is used currently in PWM (0.9.46).
  • Loading branch information
jalbr74 committed Nov 3, 2015
1 parent 8539901 commit cdf4657
Show file tree
Hide file tree
Showing 95 changed files with 9 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
/src/main/webapp/WEB-INF/PwmConfiguration.xml
/src/main/webapp/WEB-INF/backup
/src/main/webapp/WEB-INF/LocalDB
/bin/
17 changes: 8 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@
</properties>

<build>
<resources>
<resource>
<!-- Grab all non-java files under src/main/java. We need to do this until they are all moved underneath src/main/resources -->
<directory>src/main/java</directory>
<excludes><exclude>**/*.java</exclude></excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -141,7 +134,7 @@
<dependency>
<groupId>org.graylog2</groupId>
<artifactId>syslog4j</artifactId>
<version>0.9.53</version>
<version>0.9.48</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand All @@ -156,7 +149,7 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>5.0.73</version>
<version>6.4.9</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
Expand Down Expand Up @@ -202,5 +195,11 @@
<name>project</name>
<url>file:///${project.basedir}/local-maven-repo</url>
</repository>
<repository>
<id>oracleReleases</id>
<name>Oracle Released Java Packages</name>
<url>http://download.oracle.com/maven</url>
<layout>default</layout>
</repository>
</repositories>
</project>
File renamed without changes.

0 comments on commit cdf4657

Please sign in to comment.