Skip to content

Commit 1206ace

Browse files
committed
Merge branch 'bugfixes-4.2'
2 parents fed00d0 + 62926e6 commit 1206ace

File tree

19 files changed

+1792
-1094
lines changed

19 files changed

+1792
-1094
lines changed

biojava-alignment/pom.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626

2727
<!-- Excluding demo package is required for avoiding namespace clashes
2828
(demo package is in all modules) for signing the jar. See issue #387 -->
29-
<plugin>
30-
<groupId>org.apache.maven.plugins</groupId>
31-
<artifactId>maven-jar-plugin</artifactId>
32-
<configuration>
33-
<excludes>
34-
<exclude>demo/**</exclude>
35-
</excludes>
36-
</configuration>
37-
</plugin>
38-
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-jar-plugin</artifactId>
32+
<configuration>
33+
<excludes>
34+
<exclude>demo/**</exclude>
35+
</excludes>
36+
</configuration>
37+
</plugin>
38+
3939
</plugins>
4040
</build>
4141
<dependencies>
@@ -57,26 +57,26 @@
5757
<!-- logging dependencies (managed by parent pom, don't set versions or
5858
scopes here) -->
5959
<dependency>
60-
<groupId>org.slf4j</groupId>
61-
<artifactId>slf4j-api</artifactId>
62-
</dependency>
63-
<!-- binding for log4j2, scope=runTime set in parent pom -->
64-
<dependency>
65-
<groupId>org.apache.logging.log4j</groupId>
66-
<artifactId>log4j-slf4j-impl</artifactId>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.apache.logging.log4j</groupId>
70-
<artifactId>log4j-api</artifactId>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.apache.logging.log4j</groupId>
74-
<artifactId>log4j-core</artifactId>
75-
</dependency>
76-
<dependency>
77-
<groupId>org.biojava</groupId>
78-
<artifactId>biojava-phylo</artifactId>
60+
<groupId>org.slf4j</groupId>
61+
<artifactId>slf4j-api</artifactId>
62+
</dependency>
63+
<!-- binding for log4j2, scope=runTime set in parent pom -->
64+
<dependency>
65+
<groupId>org.apache.logging.log4j</groupId>
66+
<artifactId>log4j-slf4j-impl</artifactId>
67+
</dependency>
68+
<dependency>
69+
<groupId>org.apache.logging.log4j</groupId>
70+
<artifactId>log4j-api</artifactId>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.apache.logging.log4j</groupId>
74+
<artifactId>log4j-core</artifactId>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.biojava</groupId>
78+
<artifactId>biojava-phylo</artifactId>
7979
<version>5.0.0-SNAPSHOT</version>
80-
</dependency>
80+
</dependency>
8181
</dependencies>
8282
</project>

0 commit comments

Comments
 (0)