Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<configuration>
<source>1.7</source>
<target>1.7</target>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -90,7 +91,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.35</version>
<version>5.1.40</version>
</dependency>
</dependencies>

Expand Down Expand Up @@ -224,15 +225,16 @@
</dependency>

<!-- Dependencies for logging -->
<!-- sl4fj is a facade for various logging frameworks -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.6</version>
<version>1.7.21</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.6</version>
<version>1.7.21</version>
</dependency>
<!-- END Logging Dependencies -->

Expand Down Expand Up @@ -457,7 +459,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.6</version>
<version>5.1.40</version>
</dependency>

<dependency>
Expand All @@ -472,8 +474,6 @@
<version>1.8.3</version>
</dependency>



<!-- Clients for other Parallax servers -->
<dependency>
<groupId>com.parallax.client</groupId>
Expand All @@ -487,7 +487,6 @@
<version>1.0-SNAPSHOT</version>
</dependency>


</dependencies>

</project>
13 changes: 8 additions & 5 deletions src/main/config/default/log4j.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,12 @@
<param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
</layout>
</appender>
<root>
<priority value="info"></priority>
<appender-ref ref="stdout"/>
</root>
<Logger name="log4j.category.com.parallax.server" level="DEBUG"/>
<loggers>
<Logger name="com.parallax.server.blocklyprop.monitoring" level="trace" additivity="false">
<AppenderRef ref="stdout"/>
</Logger>
<root level="info">
<appender-ref ref="stdout"/>
</root>
</loggers>
</log4j:configuration>