Skip to content

Commit dfe0e37

Browse files
oblodgettoblodgett
authored
Merge pull request #1250 from alliance-genome/fix_libraries
Updated pom to fix libraries
2 parents 9498687 + 8094a4f commit dfe0e37

File tree

11 files changed

+29
-51
lines changed

11 files changed

+29
-51
lines changed

‎agr_api/pom.xml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
@@ -28,6 +29,17 @@
2829
<version>0.9.4</version>
2930
</dependency>
3031

32+
<dependency>
33+
<groupId>org.apache.logging.log4j</groupId>
34+
<artifactId>log4j-core</artifactId>
35+
<version>2.20.0</version>
36+
</dependency>
37+
38+
<dependency>
39+
<groupId>org.apache.logging.log4j</groupId>
40+
<artifactId>log4j-api</artifactId>
41+
</dependency>
42+
3143
<dependency>
3244
<groupId>commons-io</groupId>
3345
<artifactId>commons-io</artifactId>
@@ -41,7 +53,6 @@
4153
<artifactId>commons-collections4</artifactId>
4254
<version>4.4</version>
4355
</dependency>
44-
4556
<!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
4657
<dependency>
4758
<groupId>commons-collections</groupId>
@@ -88,10 +99,11 @@
8899
</dependency>
89100

90101
<dependency>
91-
<groupId>org.alliancegenome</groupId>
102+
<groupId>${project.groupId}</groupId>
92103
<artifactId>agr_java_core</artifactId>
93-
<version>${revision}</version>
104+
<version>${project.version}</version>
94105
</dependency>
106+
95107
<dependency>
96108
<groupId>org.hamcrest</groupId>
97109
<artifactId>hamcrest-all</artifactId>
@@ -116,7 +128,6 @@
116128
<build>
117129
<finalName>${project.artifactId}</finalName>
118130
<plugins>
119-
120131
<plugin>
121132
<groupId>${quarkus.platform.group-id}</groupId>
122133
<artifactId>quarkus-maven-plugin</artifactId>

‎agr_api/src/main/resources/application.properties.defaults‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ quarkus.http.root-path=/
55
quarkus.http.non-application-root-path=/
66
quarkus.swagger-ui.always-include=true
77
quarkus.swagger-ui.doc-expansion=none
8-
quarkus.health.openapi.included=true
8+
#quarkus.health.openapi.included=true

‎agr_api_tester/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45

56
<parent>
@@ -18,10 +19,11 @@
1819

1920
<dependencies>
2021
<dependency>
21-
<groupId>org.alliancegenome</groupId>
22+
<groupId>${project.groupId}</groupId>
2223
<artifactId>agr_api</artifactId>
2324
<version>${project.version}</version>
2425
</dependency>
26+
2527
</dependencies>
2628

2729
<build>

‎agr_cacher/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</properties>
1818
<dependencies>
1919
<dependency>
20-
<groupId>org.alliancegenome</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>agr_java_core</artifactId>
2222
<version>${project.version}</version>
2323
</dependency>

‎agr_elasticsearch_util/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</properties>
1818
<dependencies>
1919
<dependency>
20-
<groupId>org.alliancegenome</groupId>
20+
<groupId>${project.groupId}</groupId>
2121
<artifactId>agr_java_core</artifactId>
2222
<version>${project.version}</version>
2323
</dependency>

‎agr_indexer/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ target
33
.classpath
44
.project
55
/bin/
6+
data

‎agr_indexer/pom.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</properties>
1616
<dependencies>
1717
<dependency>
18-
<groupId>org.alliancegenome</groupId>
18+
<groupId>${project.groupId}</groupId>
1919
<artifactId>agr_java_core</artifactId>
2020
<version>${project.version}</version>
2121
</dependency>
@@ -53,24 +53,6 @@
5353
</archive>
5454
</configuration>
5555
</plugin>
56-
<plugin>
57-
<groupId>org.apache.maven.plugins</groupId>
58-
<artifactId>maven-javadoc-plugin</artifactId>
59-
<version>3.0.1</version>
60-
<configuration>
61-
<doclint>all,-html,-syntax,-accessibility,-missing</doclint>
62-
<failOnError>false</failOnError>
63-
<quiet>true</quiet>
64-
</configuration>
65-
<executions>
66-
<execution>
67-
<id>attach-javadocs</id>
68-
<goals>
69-
<goal>jar</goal>
70-
</goals>
71-
</execution>
72-
</executions>
73-
</plugin>
7456
<plugin>
7557
<artifactId>maven-assembly-plugin</artifactId>
7658
<configuration>

‎agr_intermine_data_extractor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<dependencies>
2222
<dependency>
23-
<groupId>org.alliancegenome</groupId>
23+
<groupId>${project.groupId}</groupId>
2424
<artifactId>agr_java_core</artifactId>
2525
<version>${project.version}</version>
2626
</dependency>

‎agr_java_core/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -163,24 +163,6 @@
163163
</archive>
164164
</configuration>
165165
</plugin>
166-
<plugin>
167-
<groupId>org.apache.maven.plugins</groupId>
168-
<artifactId>maven-javadoc-plugin</artifactId>
169-
<version>3.0.1</version>
170-
<configuration>
171-
<doclint>all,-html,-syntax,-accessibility,-missing</doclint>
172-
<failOnError>false</failOnError>
173-
<quiet>true</quiet>
174-
</configuration>
175-
<executions>
176-
<execution>
177-
<id>attach-javadocs</id>
178-
<goals>
179-
<goal>jar</goal>
180-
</goals>
181-
</execution>
182-
</executions>
183-
</plugin>
184166
<plugin>
185167
<groupId>io.smallrye</groupId>
186168
<artifactId>jandex-maven-plugin</artifactId>

‎agr_variant_indexer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<artifactId>jackson-dataformat-yaml</artifactId>
3434
</dependency>
3535
<dependency>
36-
<groupId>org.alliancegenome</groupId>
36+
<groupId>${project.groupId}</groupId>
3737
<artifactId>agr_java_core</artifactId>
3838
<version>${project.version}</version>
3939
</dependency>

0 commit comments

Comments
 (0)