Skip to content

Commit e4d4ddd

Browse files
mseatonmseaton
committed
REPORT-913: Follow-up fix to exclude previous dependencies
1 parent 48d1946 commit e4d4ddd

File tree

6 files changed

+23
-133
lines changed

6 files changed

+23
-133
lines changed

‎.gitignore‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,13 @@ api/.classpath
1414
api/.project
1515
api/.settings/*
1616
api/target/*
17-
api-1.9/.classpath
18-
api-1.9/.project
19-
api-1.9/.settings/*
20-
api-2.0/.classpath
21-
api-2.0/.project
22-
api-2.0/.settings/*
2317
api-tests/.classpath
2418
api-tests/.project
2519
api-tests/.settings/*
2620
omod/.classpath
2721
omod/.project
2822
omod/.settings/*
2923
omod/target/*
30-
test-1.9/target/*
3124
/.settings
3225

3326
.DS_Store

‎api-tests/src/test/resources/log4j.xml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎api-tests/src/test/resources/log4j2.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Configuration xmlns="http://logging.apache.org/log4j/2.0/config">
3+
<Properties>
4+
<!-- The default pattern is stored as a property so that it's only defined once.
5+
It's also quite challenging to escape using Log4j2's variable substitution. -->
6+
<Property name="defaultPattern">%p - %C{1}.%M(%L) |%d{ISO8601}| %m%n</Property>
7+
</Properties>
8+
<Appenders>
9+
<!-- the console appender is not required but usually a good idea -->
10+
<Console name="CONSOLE" target="SYSTEM_OUT">
11+
<PatternLayout pattern="${openmrs:logLayout:-${defaultPattern}}" />
12+
</Console>
13+
</Appenders>
14+
<Loggers>
15+
<Logger name="org.springframework" additivity="false" level="WARN" />
16+
<Logger name="org.hibernate" additivity="false" level="ERROR" />
17+
<Logger name="org.openmrs.module.reporting" level="INFO"/>
18+
<Root level="WARN">
19+
<AppenderRef ref="CONSOLE" />
20+
</Root>
21+
</Loggers>
22+
</Configuration>

‎omod/pom.xml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,6 @@
1616
<artifactId>${project.parent.artifactId}-api</artifactId>
1717
<version>${project.parent.version}</version>
1818
</dependency>
19-
<dependency>
20-
<groupId>${project.parent.groupId}</groupId>
21-
<artifactId>${project.parent.artifactId}-api-1.10</artifactId>
22-
<version>${project.parent.version}</version>
23-
</dependency>
24-
<dependency>
25-
<groupId>${project.parent.groupId}</groupId>
26-
<artifactId>${project.parent.artifactId}-api-1.9</artifactId>
27-
<version>${project.parent.version}</version>
28-
</dependency>
29-
<dependency>
30-
<groupId>${project.parent.groupId}</groupId>
31-
<artifactId>${project.parent.artifactId}-api-2.0</artifactId>
32-
<version>${project.parent.version}</version>
33-
</dependency>
34-
<dependency>
35-
<groupId>${project.parent.groupId}</groupId>
36-
<artifactId>${project.parent.artifactId}-api-2.2</artifactId>
37-
<version>${project.parent.version}</version>
38-
</dependency>
39-
<dependency>
40-
<groupId>${project.parent.groupId}</groupId>
41-
<artifactId>${project.parent.artifactId}-api-2.4</artifactId>
42-
<version>${project.parent.version}</version>
43-
</dependency>
4419
<dependency>
4520
<groupId>org.openmrs.module</groupId>
4621
<artifactId>legacyui-omod</artifactId>

‎omod/src/main/resources/config.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</description>
1616
<activator>@[email protected]</activator>
1717
<updateURL>https://dev.openmrs.org/modules/download/@MODULE_ID@/update.rdf</updateURL>
18-
<require_version>1.11.3 - 1.11.*, 1.10.2 - 1.10.*, 1.9.9 - 1.9.*, 1.12</require_version>
18+
<require_version>${openMRSVersion}</require_version>
1919

2020
<require_modules>
2121
<require_module version="${serializationVersion}">org.openmrs.module.serialization.xstream</require_module>

‎pom.xml‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -302,82 +302,6 @@
302302
</dependency>
303303
</dependencies>
304304

305-
<profiles>
306-
<profile>
307-
<id>1.10</id>
308-
<properties>
309-
<openMRSVersion>1.10.2</openMRSVersion>
310-
<openMRSMinorVersion>1.10</openMRSMinorVersion>
311-
</properties>
312-
</profile>
313-
<profile>
314-
<id>1.11</id>
315-
<properties>
316-
<openMRSVersion>1.11.3</openMRSVersion>
317-
<openMRSMinorVersion>1.11</openMRSMinorVersion>
318-
</properties>
319-
</profile>
320-
<profile>
321-
<id>1.12</id>
322-
<properties>
323-
<openMRSVersion>1.12.0</openMRSVersion>
324-
<openMRSMinorVersion>1.12</openMRSMinorVersion>
325-
<jacksonVersion>1.9.13</jacksonVersion>
326-
</properties>
327-
</profile>
328-
<profile>
329-
<id>2.0</id>
330-
<properties>
331-
<openMRSVersion>2.0.0</openMRSVersion>
332-
<openMRSMinorVersion>2.0</openMRSMinorVersion>
333-
<jacksonVersion>1.9.13</jacksonVersion>
334-
<reportingApiConditionalArtifactId>reporting-api-2.0</reportingApiConditionalArtifactId>
335-
</properties>
336-
</profile>
337-
<profile>
338-
<id>2.1</id>
339-
<properties>
340-
<openMRSVersion>2.1.1</openMRSVersion>
341-
<openMRSMinorVersion>2.1</openMRSMinorVersion>
342-
<jacksonVersion>1.9.13</jacksonVersion>
343-
<reportingApiConditionalArtifactId>reporting-api-2.0</reportingApiConditionalArtifactId>
344-
</properties>
345-
</profile>
346-
<profile>
347-
<id>2.2</id>
348-
<properties>
349-
<openMRSVersion>2.2.0</openMRSVersion>
350-
<openMRSMinorVersion>2.2</openMRSMinorVersion>
351-
<jacksonVersion>1.9.13</jacksonVersion>
352-
<reportingApiConditionalArtifactId>reporting-api-2.0</reportingApiConditionalArtifactId>
353-
</properties>
354-
</profile>
355-
<profile>
356-
<id>2.3</id>
357-
<properties>
358-
<openMRSVersion>2.3.0</openMRSVersion>
359-
<openMRSMinorVersion>2.3</openMRSMinorVersion>
360-
<jacksonVersion>1.9.13</jacksonVersion>
361-
<reportingApiConditionalArtifactId>reporting-api-2.0</reportingApiConditionalArtifactId>
362-
</properties>
363-
</profile>
364-
<profile>
365-
<id>2.4</id>
366-
<modules>
367-
<module>api</module>
368-
<module>api-tests</module>
369-
<module>omod</module>
370-
</modules>
371-
<properties>
372-
<!-- 2.4.1 has a bugfix necessary for the tests to pass -->
373-
<openMRSVersion>2.4.1</openMRSVersion>
374-
<openMRSMinorVersion>2.4</openMRSMinorVersion>
375-
<jacksonVersion>1.9.13</jacksonVersion>
376-
<reportingApiConditionalArtifactId>reporting-api-2.4</reportingApiConditionalArtifactId>
377-
</properties>
378-
</profile>
379-
</profiles>
380-
381305
<build>
382306
<resources>
383307
<resource>

0 commit comments

Comments
 (0)