Skip to content

Commit 76aea7c

Browse files
[marytts] Upgrade to 5.2.1 (#20717)
* Upgrade marytts packages from 5.2 to 5.2.1. 5.2.1 is the first version published on Maven Central. * Introduce handling for internal repository in parent pom. * Exclude transitive dependency to log4j. Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 73cf48d commit 76aea7c

1 file changed

Lines changed: 50 additions & 6 deletions

File tree

  • bundles/org.openhab.voice.marytts

bundles/org.openhab.voice.marytts/pom.xml

Lines changed: 50 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@
4848
<artifactId>jtok-core</artifactId>
4949
<version>1.9.3</version>
5050
<scope>compile</scope>
51+
<exclusions>
52+
<exclusion>
53+
<groupId>log4j</groupId>
54+
<artifactId>log4j</artifactId>
55+
</exclusion>
56+
<exclusion>
57+
<groupId>org.slf4j</groupId>
58+
<artifactId>slf4j-log4j12</artifactId>
59+
</exclusion>
60+
</exclusions>
5161
</dependency>
5262
<dependency>
5363
<groupId>de.dfki.mary</groupId>
@@ -58,49 +68,61 @@
5868
<dependency>
5969
<groupId>de.dfki.mary</groupId>
6070
<artifactId>marytts-common</artifactId>
61-
<version>5.2</version>
71+
<version>5.2.1</version>
6272
<scope>compile</scope>
73+
<exclusions>
74+
<exclusion>
75+
<groupId>org.apache.logging.log4j</groupId>
76+
<artifactId>log4j-core</artifactId>
77+
</exclusion>
78+
<exclusion>
79+
<groupId>org.apache.logging.log4j</groupId>
80+
<artifactId>log4j-1.2-api</artifactId>
81+
</exclusion>
82+
</exclusions>
6383
</dependency>
6484
<dependency>
6585
<groupId>de.dfki.mary</groupId>
6686
<artifactId>marytts-lang-de</artifactId>
67-
<version>5.2</version>
87+
<version>5.2.1</version>
6888
<scope>compile</scope>
6989
</dependency>
7090
<dependency>
7191
<groupId>de.dfki.mary</groupId>
7292
<artifactId>marytts-lang-en</artifactId>
73-
<version>5.2</version>
93+
<version>5.2.1</version>
7494
<scope>compile</scope>
7595
</dependency>
7696
<dependency>
7797
<groupId>de.dfki.mary</groupId>
7898
<artifactId>marytts-runtime</artifactId>
79-
<version>5.2</version>
99+
<version>5.2.1</version>
80100
<scope>compile</scope>
81101
</dependency>
82102
<dependency>
83103
<groupId>de.dfki.mary</groupId>
84104
<artifactId>marytts-signalproc</artifactId>
85-
<version>5.2</version>
105+
<version>5.2.1</version>
86106
<scope>compile</scope>
87107
</dependency>
88108
<dependency>
89109
<groupId>de.dfki.mary</groupId>
90110
<artifactId>voice-bits1-hsmm</artifactId>
111+
<!-- not uploaded to central, take from our jfrog repo -->
91112
<version>5.2</version>
92113
<scope>compile</scope>
93114
</dependency>
94115
<dependency>
95116
<groupId>de.dfki.mary</groupId>
96117
<artifactId>voice-bits3-hsmm</artifactId>
118+
<!-- not uploaded to central, take from our jfrog repo -->
97119
<version>5.2</version>
98120
<scope>compile</scope>
99121
</dependency>
100122
<dependency>
101123
<groupId>de.dfki.mary</groupId>
102124
<artifactId>voice-cmu-slt-hsmm</artifactId>
103-
<version>5.2</version>
125+
<version>5.2.1</version>
104126
<scope>compile</scope>
105127
</dependency>
106128
<dependency>
@@ -121,8 +143,30 @@
121143
<version>1.5.3</version>
122144
<scope>compile</scope>
123145
</dependency>
146+
<dependency>
147+
<groupId>org.slf4j</groupId>
148+
<artifactId>slf4j-api</artifactId>
149+
<version>${slf4j.version}</version>
150+
<scope>provided</scope>
151+
</dependency>
124152
</dependencies>
125153

154+
<repositories>
155+
<repository>
156+
<releases>
157+
<enabled>false</enabled>
158+
</releases>
159+
<snapshots>
160+
<enabled>false</enabled>
161+
</snapshots>
162+
<id>marytts-dependencies</id>
163+
<!-- Overrides upstream marytts POM which declares a broken
164+
file://${project.basedir}/../lib/repo URL that fails
165+
multi-module dependency resolution. Repo is empty; safe to block. -->
166+
<url>https://repo.maven.apache.org/maven2</url>
167+
</repository>
168+
</repositories>
169+
126170
<build>
127171
<pluginManagement>
128172
<plugins>

0 commit comments

Comments
 (0)