Skip to content

Commit

Permalink
git subrepo pull modules
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "modules"
  merged:   "580a2ac936"
upstream:
  origin:   "[email protected]:daisy/pipeline-modules.git"
  branch:   "master"
  commit:   "aec26b7fbc"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
  • Loading branch information
bertfrees committed Oct 12, 2022
1 parent 9e87eff commit bb1c256
Show file tree
Hide file tree
Showing 85 changed files with 204 additions and 216 deletions.
2 changes: 1 addition & 1 deletion modules/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
remote = [email protected]:daisy/pipeline-modules.git
branch = master
commit = aec26b7fbcf3f72681e85e4807b98112c59cb505
parent = f3f49b911f2a6f56e5cde517cb197a6c95619bf5
parent = 9e87effcadf433dcb6cea872a81ec69c82fb853a
cmdver = 0.3.1
4 changes: 2 additions & 2 deletions modules/audio/audio-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

<version>5.0.0</version>
<version>5.0.1-SNAPSHOT</version>
<artifactId>audio-common</artifactId>
<packaging>bundle</packaging>

Expand Down
4 changes: 2 additions & 2 deletions modules/audio/audio-encoder-lame/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

<version>3.0.7</version>
<version>3.0.8-SNAPSHOT</version>
<artifactId>audio-encoder-lame</artifactId>
<packaging>bundle</packaging>

Expand Down
6 changes: 1 addition & 5 deletions modules/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-bom</artifactId>
<version>1.14.9</version>
<version>1.14.10-SNAPSHOT</version>
<packaging>pom</packaging>

<name>DAISY Pipeline 2 :: Modules BoM</name>
Expand Down Expand Up @@ -635,8 +635,4 @@
</dependency>
</dependencies>
</dependencyManagement>

<scm>
<tag>v1.14.9</tag>
</scm>
</project>
2 changes: 1 addition & 1 deletion modules/braille/braille-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/braille/braille-css-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/braille/dotify-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
24 changes: 12 additions & 12 deletions modules/braille/libhyphen-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down Expand Up @@ -270,7 +270,7 @@
<instructions>
<_dsannotations>org.daisy.pipeline.braille.libhyphen.impl.linux.LibhyphenNativePathForLinux</_dsannotations>
<Bundle-SymbolicName>org.daisy.pipeline.modules.braille.libhyphen-utils-linux</Bundle-SymbolicName>
<Export-Package />
<Export-Package/>
<Private-Package>
org.daisy.pipeline.braille.libhyphen.impl.linux
</Private-Package>
Expand All @@ -294,7 +294,7 @@
<instructions>
<_dsannotations>org.daisy.pipeline.braille.libhyphen.impl.mac.LibhyphenNativePathForMacOS</_dsannotations>
<Bundle-SymbolicName>org.daisy.pipeline.modules.braille.libhyphen-utils-mac</Bundle-SymbolicName>
<Export-Package />
<Export-Package/>
<Private-Package>
org.daisy.pipeline.braille.libhyphen.impl.mac
</Private-Package>
Expand All @@ -318,7 +318,7 @@
<instructions>
<_dsannotations>org.daisy.pipeline.braille.libhyphen.impl.windows.LibhyphenNativePathForWindows</_dsannotations>
<Bundle-SymbolicName>org.daisy.pipeline.modules.braille.libhyphen-utils-windows</Bundle-SymbolicName>
<Export-Package />
<Export-Package/>
<Private-Package>
org.daisy.pipeline.braille.libhyphen.impl.windows
</Private-Package>
Expand Down Expand Up @@ -502,16 +502,16 @@
</goals>
<configuration>
<tasks>
<mkdir dir="target/checkout" />
<get dest="target/checkout/dictionaries.zip" src="http://cgit.freedesktop.org/libreoffice/dictionaries/snapshot/libreoffice-4.0.0.1.zip" usetimestamp="true" skipexisting="true" />
<mkdir dir="target/checkout"/>
<get dest="target/checkout/dictionaries.zip" src="http://cgit.freedesktop.org/libreoffice/dictionaries/snapshot/libreoffice-4.0.0.1.zip" usetimestamp="true" skipexisting="true"/>
<unzip dest="target/generated-resources/tables" src="target/checkout/dictionaries.zip">
<patternset>
<include name="**/hyph_*.dic" />
<exclude name="**/hyph_de.dic" />
<exclude name="**/hyph_nb_NO.dic" />
<exclude name="**/hyph_nn_NO.dic" />
<include name="**/hyph_*.dic"/>
<exclude name="**/hyph_de.dic"/>
<exclude name="**/hyph_nb_NO.dic"/>
<exclude name="**/hyph_nn_NO.dic"/>
</patternset>
<mapper type="flatten" />
<mapper type="flatten"/>
</unzip>
</tasks>
</configuration>
Expand All @@ -537,4 +537,4 @@
</repository>
</repositories>

</project>
</project>
32 changes: 16 additions & 16 deletions modules/braille/liblouis-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down Expand Up @@ -384,26 +384,26 @@
<tasks>
<copy todir="target/generated-resources/native/liblouis">
<fileset dir="target/dependency/liblouis">
<include name="**/*.so" />
<include name="**/*.dylib" />
<include name="**/*.dll" />
<include name="**/*.so"/>
<include name="**/*.dylib"/>
<include name="**/*.dll"/>
</fileset>
<mapper>
<globmapper handledirsep="yes" from="bin/*" to="*" />
<regexpmapper handledirsep="yes" from="lib/(.*)/shared/(.*)$" to="\1/\2" />
<globmapper handledirsep="yes" from="bin/*" to="*"/>
<regexpmapper handledirsep="yes" from="lib/(.*)/shared/(.*)$" to="\1/\2"/>
</mapper>
</copy>
<copy todir="target/generated-resources/native/liblouisutdml">
<fileset dir="target/dependency/liblouisutdml">
<include name="**/*.so" />
<include name="**/*.dylib" />
<include name="**/*.dll" />
<include name="**/file2brl" />
<include name="**/file2brl.exe" />
<include name="**/*.so"/>
<include name="**/*.dylib"/>
<include name="**/*.dll"/>
<include name="**/file2brl"/>
<include name="**/file2brl.exe"/>
</fileset>
<mapper>
<globmapper handledirsep="yes" from="bin/*" to="*" />
<regexpmapper handledirsep="yes" from="lib/(.*)/shared/(.*)$" to="\1/\2" />
<globmapper handledirsep="yes" from="bin/*" to="*"/>
<regexpmapper handledirsep="yes" from="lib/(.*)/shared/(.*)$" to="\1/\2"/>
</mapper>
</copy>
</tasks>
Expand Down Expand Up @@ -505,7 +505,7 @@
<instructions combine.self="replace">
<_dsannotations>org.daisy.pipeline.braille.liblouis.impl.linux.LiblouisNativePathForLinux</_dsannotations>
<Bundle-SymbolicName>org.daisy.pipeline.modules.braille.liblouis-utils-linux</Bundle-SymbolicName>
<Export-Package />
<Export-Package/>
<Import-Package>!org.daisy.common.spi,*</Import-Package>
<Private-Package>
org.daisy.pipeline.braille.liblouis.impl.linux
Expand All @@ -532,7 +532,7 @@
<instructions>
<_dsannotations>org.daisy.pipeline.braille.liblouis.impl.mac.LiblouisNativePathForMacOS</_dsannotations>
<Bundle-SymbolicName>org.daisy.pipeline.modules.braille.liblouis-utils-mac</Bundle-SymbolicName>
<Export-Package />
<Export-Package/>
<Import-Package>!org.daisy.common.spi,*</Import-Package>
<Private-Package>
org.daisy.pipeline.braille.liblouis.impl.mac
Expand All @@ -558,7 +558,7 @@
<instructions>
<_dsannotations>org.daisy.pipeline.braille.liblouis.impl.windows.LiblouisNativePathForWindows</_dsannotations>
<Bundle-SymbolicName>org.daisy.pipeline.modules.braille.liblouis-utils-windows</Bundle-SymbolicName>
<Export-Package />
<Export-Package/>
<Import-Package>!org.daisy.common.spi,*</Import-Package>
<Private-Package>
org.daisy.pipeline.braille.liblouis.impl.windows
Expand Down
2 changes: 1 addition & 1 deletion modules/braille/obfl-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/braille/pef-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/braille/texhyph-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions modules/common/common-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<artifactId>common-utils</artifactId>
<version>2.0.1</version>
<version>2.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>DAISY Pipeline 2 module :: Common Utilities</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/common/file-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<artifactId>file-utils</artifactId>
<version>4.1.0</version>
<version>4.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>DAISY Pipeline 2 module :: File Utilities</name>
Expand Down
4 changes: 2 additions & 2 deletions modules/common/fileset-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

<artifactId>fileset-utils</artifactId>
<version>5.1.0</version>
<version>5.1.1-SNAPSHOT</version>
<packaging>bundle</packaging>

<name>DAISY Pipeline 2 module :: File Set Utilities</name>
Expand Down
2 changes: 1 addition & 1 deletion modules/common/image-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/common/mediatype-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/common/validation-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/common/zip-utils/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/dtbook-break-detection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/html-break-detection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/lexers/light-lexer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/lexers/omnilang-lexer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/lexers/ruled-lexer/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/nlp-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/nlp/zedai-break-detection/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.daisy.pipeline.modules</groupId>
<artifactId>modules-parent</artifactId>
<version>1.14.9-SNAPSHOT</version>
<version>1.14.10-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>

Expand Down
Loading

0 comments on commit bb1c256

Please sign in to comment.