Merge pull request #26 from egonw/update/pom

[WIP] Upgrade to Maven

README.md

@@ -12,18 +12,26 @@ Compile the code and run the tests with:
 
 ```
 cd org.wikipathways.client
-ant test
+mvn clean install
 ```
 
 If you want to use a different web service, use (for example):
 
 ```
 cd org.wikipathways.client
-ant -Dwp.webserver=http://otherservice.wikipathways.org test
+mvn -Dwp.webserver=http://otherservice.wikipathways.org clean test
 ```
 
-### TODO
+## OSGi bundle
+
+Create the OSGi bundle with:
+
+```
+cd org.wikipathways.client
+mvn bundle:bundle
+```
+
+## TODO
 - [x] set up automated testing framework on Jenkins (https://jenkins.bigcat.unimaas.nl/view/WikiPathways/job/WikiPathways%20REST%20Java%20library/)
 - [ ] detailed documentation (JavaDoc!)
 
-### Known bugs

org.wikipathways.client/.gitignore

@@ -1 +1,2 @@
 /bin/
+target/

org.wikipathways.client/pom.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         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>
+    <groupId>org.wikipathways</groupId>
+    <artifactId>webservice.api.lib</artifactId>
+    <version>3.3.0-GPMLRDF-1</version>
+
+    <name>Java library for WikiPathways webservice</name>
+    <packaging>bundle</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.4.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.4.0</version>
+            <scope>test</scope>
+        </dependency>
+	    <dependency> 
+            <groupId>org.bridgedb</groupId> 
+            <artifactId>org.bridgedb.bio</artifactId> 
+           <version>3.0.2</version> 
+        </dependency>
+        <dependency>
+            <groupId>org.jdom</groupId>
+            <artifactId>jdom-legacy</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.5</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <!-- You also need PathVisio Core which is not yet available as Maven package, but can be install like this:
+
+                git clone https://github.com/egonw/pathvisio-1.git
+                cd pathvisio
+                git checkout -b bridgedb/version3 bridgedb/version3
+                ant clean core.jar
+                mvn install:install-file -Dfile=modules/org.pathvisio.core.jar -DgroupId=org.pathvisio \
+                    -DartifactId=pathvisio-core -Dversion=3.4.0-bridgedb-3.0.1 -Dpackaging=jar
+            -->
+            <groupId>org.pathvisio</groupId>
+            <artifactId>pathvisio-core</artifactId>
+            <version>3.4.0-bridgedb-3.0.1-1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.13</version>
+        </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>10.5.3.0_1</version>
+        </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derbyclient</artifactId>
+        <version>10.5.3.0_1</version>
+      </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src/</sourceDirectory>
+        <testSourceDirectory>test/</testSourceDirectory>
+        <resources>
+            <resource>
+                <directory>resources/</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <!-- Generates the OSGi metadata based on the osgi.bnd file. -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>4.2.1</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>org.wikipathways.webservice.api</Bundle-Name>
+                        <Bundle-SymbolicName>org.wikipathways.webservice.api</Bundle-SymbolicName>
+                        <Bundle-Version>3.3.0</Bundle-Version>
+                        <Export-Package>org.pathvisio.wikipathways.webservice,org.wikipathways.client, org.wikipathways.client.utils}</Export-Package>
+                        <Require-Bundle>org.pathvisio.core,org.bridgedb,org.bridgedb.bio,com.springsource.org.jdom,org.apache.commons.codec,org.apache.commons.io,org.apache.commons.logging</Require-Bundle>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M5</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>3.0.0-M5</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>