Skip to content

Commit 8192609

Browse files
cboehmecboehme
committed
Merge branch 'master' of
https://github.com/culturegraph/metafacture-core.git Conflicts: src/main/java/org/culturegraph/mf/test/TestCaseLoader.java src/test/java/org/culturegraph/mf/stream/pipe/ObjectExceptionCatcherTest.java
2 parents c7a7e23 + d3fe9e0 commit 8192609

21 files changed

+798
-720
lines changed

‎.project

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,47 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>metafacture.core</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>org.eclipse.dltk.core.scriptbuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>org.eclipse.jdt.core.javabuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
23-
<buildCommand>
24-
<name>org.eclipse.m2e.core.maven2Builder</name>
25-
<arguments>
26-
</arguments>
27-
</buildCommand>
28-
<buildCommand>
29-
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
30-
<arguments>
31-
</arguments>
32-
</buildCommand>
33-
</buildSpec>
34-
<natures>
35-
<nature>org.eclipse.jdt.core.javanature</nature>
36-
<nature>org.eclipse.m2e.core.maven2Nature</nature>
37-
<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
38-
<nature>org.deved.antlride.core.nature</nature>
39-
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
40-
</natures>
41-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>metafacture.core</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.dltk.core.scriptbuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.jdt.core.javabuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.m2e.core.maven2Builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
<buildCommand>
29+
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
30+
<arguments>
31+
</arguments>
32+
</buildCommand>
33+
<buildCommand>
34+
<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
35+
<arguments>
36+
</arguments>
37+
</buildCommand>
38+
</buildSpec>
39+
<natures>
40+
<nature>org.eclipse.jdt.core.javanature</nature>
41+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
42+
<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
43+
<nature>org.deved.antlride.core.nature</nature>
44+
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
45+
<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
46+
</natures>
47+
</projectDescription>

‎release.properties

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

‎src/main/assembly/assembly.xml

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,64 @@
1-
<assembly>
2-
<id>bin</id>
3-
<formats>
4-
<format>zip</format>
5-
</formats>
6-
7-
<!-- Adds dependencies to zip package under lib directory -->
8-
<dependencySets>
9-
<dependencySet>
10-
<useProjectArtifact>false</useProjectArtifact>
11-
<outputDirectory>lib</outputDirectory>
12-
<unpack>false</unpack>
13-
</dependencySet>
14-
</dependencySets>
15-
16-
<fileSets>
17-
<fileSet>
18-
<directory>${project.build.scriptSourceDirectory}</directory>
19-
<outputDirectory></outputDirectory>
20-
<includes>
21-
<include>*.bat</include>
22-
<include>*.sh</include>
23-
</includes>
24-
<filtered>true</filtered>
25-
</fileSet>
26-
<!-- adds jar package to the root directory of zip package -->
27-
<fileSet>
28-
<directory>${project.build.directory}</directory>
29-
<outputDirectory></outputDirectory>
30-
<includes>
31-
<include>*.jar</include>
32-
</includes>
33-
</fileSet>
34-
35-
<fileSet>
36-
<directory>examples/</directory>
37-
<outputDirectory>examples/</outputDirectory>
38-
<includes>
39-
<include>*/*</include>
40-
</includes>
41-
</fileSet>
42-
<fileSet>
43-
<directory>modules/</directory>
44-
<outputDirectory>modules/</outputDirectory>
45-
</fileSet>
46-
</fileSets>
1+
<assembly>
2+
<id>bin</id>
3+
<formats>
4+
<format>zip</format>
5+
</formats>
6+
7+
<!-- Adds dependencies to zip package under lib directory -->
8+
<dependencySets>
9+
<dependencySet>
10+
<useProjectArtifact>false</useProjectArtifact>
11+
<outputDirectory>lib</outputDirectory>
12+
<unpack>false</unpack>
13+
</dependencySet>
14+
</dependencySets>
15+
16+
<fileSets>
17+
<fileSet>
18+
<directory>${project.build.scriptSourceDirectory}</directory>
19+
<outputDirectory></outputDirectory>
20+
<includes>
21+
<include>*.bat</include>
22+
<include>*.sh</include>
23+
</includes>
24+
<filtered>true</filtered>
25+
</fileSet>
26+
<!-- adds jar package to the root directory of zip package -->
27+
<fileSet>
28+
<directory>${project.build.directory}</directory>
29+
<outputDirectory></outputDirectory>
30+
<includes>
31+
<include>*.jar</include>
32+
</includes>
33+
</fileSet>
34+
35+
<fileSet>
36+
<directory>examples/</directory>
37+
<outputDirectory>examples/</outputDirectory>
38+
<includes>
39+
<include>*/*/*/*</include>
40+
<include>*/*/*</include>
41+
<include>*/*</include>
42+
</includes>
43+
</fileSet>
44+
<fileSet>
45+
<directory>${project.basedir}/src/main/resources/schemata/
46+
</directory>
47+
<outputDirectory>schemata/</outputDirectory>
48+
<includes>
49+
<include>*.xsd</include>
50+
</includes>
51+
</fileSet>
52+
<fileSet>
53+
<directory>modules/</directory>
54+
<outputDirectory>modules/</outputDirectory>
55+
</fileSet>
56+
<fileSet>
57+
<directory></directory>
58+
<outputDirectory></outputDirectory>
59+
<includes>
60+
<include>*.md</include>
61+
</includes>
62+
</fileSet>
63+
</fileSets>
4764
</assembly>

0 commit comments

Comments
 (0)