Skip to content

Commit e1e3bcf

Browse files
eichmanneichmann
committed
Updating to log4j 2.16.0
1 parent 4c3e722 commit e1e3bcf

27 files changed

Lines changed: 453 additions & 415 deletions

‎.classpath‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
<attributes>
1616
<attribute name="optional" value="true"/>
1717
<attribute name="maven.pomderived" value="true"/>
18+
<attribute name="test" value="true"/>
1819
</attributes>
1920
</classpathentry>
2021
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
2122
<attributes>
2223
<attribute name="maven.pomderived" value="true"/>
24+
<attribute name="test" value="true"/>
2325
</attributes>
2426
</classpathentry>
2527
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
@@ -38,7 +40,7 @@
3840
<attribute name="owner.project.facets" value="jst.utility"/>
3941
</attributes>
4042
</classpathentry>
41-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
43+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
4244
<attributes>
4345
<attribute name="maven.pomderived" value="true"/>
4446
</attributes>

‎.project‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
3737
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
3838
<nature>org.eclipse.jdt.core.javanature</nature>
39-
<nature>org.maven.ide.eclipse.maven2Nature</nature>
4039
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
4140
</natures>
4241
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
66
org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
77
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
88
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
9-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
10-
org.eclipse.jdt.core.compiler.compliance=1.6
9+
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
10+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
11+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
12+
org.eclipse.jdt.core.compiler.compliance=1.8
13+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
14+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
15+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1116
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
1217
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
1318
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
@@ -18,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
1823
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
1924
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
2025
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
26+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
2127
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
2228
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
2329
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
@@ -61,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno
6167
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
6268
org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
6369
org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
70+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
6471
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
6572
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
6673
org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
@@ -92,4 +99,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
9299
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
93100
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
94101
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
95-
org.eclipse.jdt.core.compiler.source=1.6
102+
org.eclipse.jdt.core.compiler.release=disabled
103+
org.eclipse.jdt.core.compiler.source=1.8

‎.settings/org.eclipse.wst.common.project.facet.core.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<faceted-project>
33
<runtime name="Apache Tomcat v9.0"/>
4-
<installed facet="java" version="1.6"/>
54
<installed facet="jst.utility" version="1.0"/>
5+
<installed facet="java" version="1.8"/>
66
</faceted-project>

‎pom.xml‎

Lines changed: 121 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,127 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>GraphTagLib</groupId>
5-
<artifactId>GraphTagLib</artifactId>
6-
<version>0.0.1-SNAPSHOT</version>
7-
<name>GraphTagLib</name>
8-
9-
<url>http://www.icts.uiowa.edu/confluence/display/apps/GraphTagLib</url>
10-
<scm>
11-
<connection>scm:svn:https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib/trunk/</connection>
12-
<developerConnection>scm:svn:https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib/trunk/</developerConnection>
13-
<url>https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib</url>
14-
</scm>
15-
<distributionManagement>
16-
<repository>
17-
<id>www-test.icts.uiowa.edu</id>
18-
<name>www-test.icts.uiowa.edu-releases</name>
19-
<url>https://www-test.icts.uiowa.edu/artifactory/libs-release-local</url>
20-
</repository>
21-
</distributionManagement>
22-
23-
<dependencies>
24-
<dependency>
25-
<groupId>javax.servlet</groupId>
26-
<artifactId>jsp-api</artifactId>
27-
<version>2.0</version>
28-
<scope>provided</scope>
29-
</dependency>
30-
<dependency>
31-
<groupId>org.apache.logging.log4j</groupId>
32-
<artifactId>log4j-api</artifactId>
33-
<version>2.5</version>
34-
</dependency>
35-
<dependency>
36-
<groupId>commons-logging</groupId>
37-
<artifactId>commons-logging</artifactId>
38-
<version>1.1.1</version>
39-
</dependency>
40-
<dependency>
41-
<groupId>edu.uiowa.icts.plugin</groupId>
42-
<artifactId>protogen-plugin</artifactId>
43-
<version>0.0.5</version>
44-
<type>jar</type>
45-
<scope>compile</scope>
46-
</dependency>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>GraphTagLib</groupId>
7+
<artifactId>GraphTagLib</artifactId>
8+
<version>0.0.1-SNAPSHOT</version>
9+
<name>GraphTagLib</name>
10+
11+
<url>http://www.icts.uiowa.edu/confluence/display/apps/GraphTagLib</url>
12+
<scm>
13+
<connection>scm:svn:https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib/trunk/</connection>
14+
<developerConnection>scm:svn:https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib/trunk/</developerConnection>
15+
<url>https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib</url>
16+
</scm>
17+
<distributionManagement>
18+
<repository>
19+
<id>www-test.icts.uiowa.edu</id>
20+
<name>www-test.icts.uiowa.edu-releases</name>
21+
<url>https://www-test.icts.uiowa.edu/artifactory/libs-release-local</url>
22+
</repository>
23+
</distributionManagement>
24+
25+
<dependencies>
26+
<dependency>
27+
<groupId>javax.servlet</groupId>
28+
<artifactId>jsp-api</artifactId>
29+
<version>2.0</version>
30+
<scope>provided</scope>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.apache.logging.log4j</groupId>
34+
<artifactId>log4j-core</artifactId>
35+
<version>2.16.0</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>commons-logging</groupId>
39+
<artifactId>commons-logging</artifactId>
40+
<version>1.1.1</version>
41+
</dependency>
4742
</dependencies>
4843
<build>
49-
<plugins>
50-
<plugin>
51-
<groupId>edu.uiowa.icts.plugin</groupId>
52-
<artifactId>protogen-plugin</artifactId>
53-
<version>0.0.5</version>
54-
<configuration>
55-
<props>
56-
<property><name>project.name</name><value>${project.artifactId}</value> </property>
57-
<property><name>package.name</name><value>edu.uiowa.slis.graphtaglib</value></property>
58-
59-
<property><name>generate.jsps</name><value>false</value> </property>
60-
<property><name>generate.tld</name><value>false</value> </property>
61-
<property><name>generate.tags</name><value>false</value> </property>
62-
63-
<property> <name>mode</name> <value>tags</value> </property>
64-
<property><name>clay.file</name><value>src/non-packaged-resources/Model.clay</value></property>
65-
<property><name>prefix.path</name><value>${basedir}</value></property>
66-
<property><name>tag.file.location</name><value>${basedir}/src/main/java</value></property>
67-
<property><name>tld.file.location</name>
68-
<value>${basedir}/src/main/resources/META-INF/taglib.tld</value></property>
69-
<property><name>jsp.file.location</name><value>${basedir}/src/main/webapp/</value></property>
70-
</props>
71-
</configuration>
72-
<executions>
73-
<execution>
74-
<goals>
75-
<!-- <goal>WebApp</goal> -->
76-
</goals>
44+
<plugins>
45+
<plugin>
46+
<groupId>edu.uiowa.icts.plugin</groupId>
47+
<artifactId>protogen-plugin</artifactId>
48+
<version>0.0.5</version>
49+
<configuration>
50+
<props>
51+
<property>
52+
<name>project.name</name>
53+
<value>${project.artifactId}</value>
54+
</property>
55+
<property>
56+
<name>package.name</name>
57+
<value>edu.uiowa.slis.graphtaglib</value>
58+
</property>
59+
60+
<property>
61+
<name>generate.jsps</name>
62+
<value>false</value>
63+
</property>
64+
<property>
65+
<name>generate.tld</name>
66+
<value>false</value>
67+
</property>
68+
<property>
69+
<name>generate.tags</name>
70+
<value>false</value>
71+
</property>
72+
73+
<property>
74+
<name>mode</name>
75+
<value>tags</value>
76+
</property>
77+
<property>
78+
<name>clay.file</name>
79+
<value>src/non-packaged-resources/Model.clay</value>
80+
</property>
81+
<property>
82+
<name>prefix.path</name>
83+
<value>${basedir}</value>
84+
</property>
85+
<property>
86+
<name>tag.file.location</name>
87+
<value>${basedir}/src/main/java</value>
88+
</property>
89+
<property>
90+
<name>tld.file.location</name>
91+
<value>${basedir}/src/main/resources/META-INF/taglib.tld</value>
92+
</property>
93+
<property>
94+
<name>jsp.file.location</name>
95+
<value>${basedir}/src/main/webapp/</value>
96+
</property>
97+
</props>
98+
</configuration>
99+
<executions>
100+
<execution>
101+
<goals>
102+
<!-- <goal>WebApp</goal> -->
103+
</goals>
77104

78-
</execution>
79-
</executions>
80-
</plugin>
81-
<plugin>
82-
<groupId>org.apache.maven.plugins</groupId>
83-
<artifactId>maven-release-plugin</artifactId>
84-
<version>2.1</version>
85-
<configuration>
86-
<tagBase>https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib/tags</tagBase>
87-
</configuration>
88-
</plugin>
89-
<plugin>
90-
<groupId>org.apache.maven.plugins</groupId>
91-
<artifactId>maven-compiler-plugin</artifactId>
92-
<version>2.0.2</version>
93-
<configuration>
94-
<source>1.6</source>
95-
<target>1.6</target>
96-
</configuration>
97-
</plugin>
98-
</plugins>
105+
</execution>
106+
</executions>
107+
</plugin>
108+
<plugin>
109+
<groupId>org.apache.maven.plugins</groupId>
110+
<artifactId>maven-release-plugin</artifactId>
111+
<version>2.1</version>
112+
<configuration>
113+
<tagBase>https://srcvault.icts.uiowa.edu/repos/TagLibs/GraphTagLib/tags</tagBase>
114+
</configuration>
115+
</plugin>
116+
<plugin>
117+
<groupId>org.apache.maven.plugins</groupId>
118+
<artifactId>maven-compiler-plugin</artifactId>
119+
<version>2.0.2</version>
120+
<configuration>
121+
<source>1.8</source>
122+
<target>1.8</target>
123+
</configuration>
124+
</plugin>
125+
</plugins>
99126
</build>
100127
</project>

‎src/main/java/edu/uiowa/slis/graphtaglib/CommunityDetection/Detector.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import java.io.IOException;
44
import java.util.Random;
55

6-
import org.apache.log4j.Logger;
7-
import org.apache.log4j.PropertyConfigurator;
6+
import org.apache.logging.log4j.Logger;
7+
import org.apache.logging.log4j.LogManager;
88

99
public abstract class Detector {
10-
static Logger logger = Logger.getLogger(Detector.class);
10+
static Logger logger = LogManager.getLogger(Detector.class);
1111

1212
enum ModularityType {
1313
standard, alternative
@@ -29,7 +29,6 @@ enum ModularityType {
2929
Network maxNetwork;
3030

3131
public static void main(String args[]) throws IOException {
32-
PropertyConfigurator.configure(args[0]);
3332
// Detector theDetector = new LouvainDetector();
3433
// Detector theDetector = new LouvainMultilevelRefinementDetector();
3534
Detector theDetector = new SmartLocalMovingDetector();

0 commit comments

Comments
 (0)