Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Liblinear official builds, distribution files #552

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Liblinear official builds, distribution files #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
194996b
Changed assembly file name and type, intermediate
homosepian Sep 24, 2017
87646d1
Use official liblinear and wrapper releases
homosepian Oct 4, 2017
83b3d12
Produce expected distribution files - source and jars
homosepian Oct 4, 2017
066e9c7
Exclude weka-dev, produce expected dist files
homosepian Oct 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed core/lib/liblinear-wrapper.jar
View file
Open in desktop
Binary file not shown.
Binary file removed core/lib/liblinear.jar
View file
Open in desktop
Binary file not shown.
20 changes: 11 additions & 9 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,18 +143,20 @@
<artifactId>opennlp-tools</artifactId>
</dependency>
<dependency>
<groupId>de.bwaldvogel</groupId>
<artifactId>liblinear</artifactId>
<version>1.96</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/liblinear.jar</systemPath>
<groupId>nz.ac.waikato.cms.weka</groupId>
<artifactId>LibLINEAR</artifactId>
<version>1.9.7</version>
<exclusions>
<exclusion>
<groupId>nz.ac.waikato.cms.weka</groupId>
<artifactId>weka-dev</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>nz.ac.waikato.cms.weka</groupId>
<groupId>de.bwaldvogel</groupId>
<artifactId>liblinear</artifactId>
<version>1.9.8-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/lib/liblinear-wrapper.jar</systemPath>
<version>2.11</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion distribution/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
</binaries>
</moduleSet>
</moduleSets>

</assembly>

24 changes: 24 additions & 0 deletions distribution/pack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>project</id>
<formats>
<format>tar.gz</format>
<format>zip</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>Excitement-Open-Platform-${artifact.version}</baseDirectory>
<fileSets>
<fileSet>
<directory>${project.basedir}/..</directory><!-- TODO: bad practice, should change the build -->
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<excludes>
<exclude>**/*.iml</exclude>
<exclude>**/.idea/**</exclude>
<exclude>**/${project.build.directory}/**</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

48 changes: 40 additions & 8 deletions distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>eu.excitementproject</groupId>
<artifactId>eop</artifactId>
<version>1.2.4-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>

<artifactId>Excitement-Open-Platform</artifactId>

<packaging>pom</packaging>

<name>EOP Distribution</name>
<!-- NOTE: These dependency declarations are only required to sort this project to the

<!-- NOTE: These dependency declarations are only required to sort this project to the
end of the line in the multimodule build (i.e to ensure this module builds last).
-->
<dependencies>
Expand Down Expand Up @@ -99,14 +99,46 @@
</goals>
<configuration>
<descriptors>
<descriptor>${project.basedir}/pack.xml</descriptor>
<descriptor>${project.basedir}/assembly.xml</descriptor>
</descriptors>
<!-- TODO: this is bad practice. Build script should look for dist file under distribution/target/ -->
<outputDirectory>${project.basedir}/../target</outputDirectory>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<plugin>
<groupId>com.coderplus.maven.plugins</groupId>
<artifactId>copy-rename-maven-plugin</artifactId>
<version>1.0.1</version>
<executions>
<execution>
<id>rename-dist-files</id>
<phase>package</phase>
<goals>
<goal>rename</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<sourceFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}-bin.zip</sourceFile>
<destinationFile>${project.basedir}/../target/eop-${eop-version}-bin.zip</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}-project.zip</sourceFile>
<destinationFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}.zip</destinationFile>
</fileSet>
<fileSet>
<sourceFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}-project.tar.gz</sourceFile>
<destinationFile>${project.basedir}/../target/Excitement-Open-Platform-${eop-version}.tar.gz</destinationFile>
</fileSet>
</fileSets>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
12 changes: 1 addition & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<module>lexicalinferenceminer</module>
<module>alignmentedas</module>
<module>adarte</module>
<module>distribution</module>
</modules>

<profiles>
Expand Down Expand Up @@ -558,17 +559,6 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<descriptors>
<descriptor>distribution/assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down