Skip to content

Commit

Permalink
fat jar and Docker packaging
Browse files Browse the repository at this point in the history
  • Loading branch information
kristianhelgesen committed Sep 3, 2015
1 parent 453ffbd commit e781d82
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
target
bin
*.DS_Store
dependency-reduced-pom.xml
10 changes: 10 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM ardoq/java:3.2-8u51
MAINTAINER Kristian Helgesen "<[email protected]>"

ADD target/ardoq-maven-addon.jar ardoq-maven-addon.jar
ADD server.yml server.yml

ENV ARDOQ_HOST api
ENV ARDOQ_HOST_PROTOCOL http

CMD ["java","-Djava.net.preferIPv4Stack=true","-jar","ardoq-maven-addon.jar","server","server.yml"]
40 changes: 39 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,22 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.4</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Dropwizard -->
Expand All @@ -44,6 +54,12 @@
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-core</artifactId>
<version>${dropwizard.version}</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -56,6 +72,16 @@
<groupId>io.dropwizard</groupId>
<artifactId>dropwizard-client</artifactId>
<version>${dropwizard.version}</version>
<exclusions>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>aopalliance-repackaged</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.hk2.external</groupId>
<artifactId>javax.inject</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.dropwizard</groupId>
Expand Down Expand Up @@ -118,11 +144,23 @@
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<configuration>
<finalName>ardoq-maven-addon</finalName>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>com.ardoq.addon.maven.Main</mainClass>
</transformer>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
<executions>
<execution>
Expand All @@ -137,7 +175,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<source>1.5</source>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/ardoq/addon/maven/MavenAddonAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,8 @@ public Response tags(@QueryParam("artifactId") String artifactId,
System.out.println("token "+token);
System.out.println("organization "+organization);

// org=piedpiper&token=2854b08d642b43ffb4281b68188bb6fb
StreamingOutput stream = new StreamingOutput() {

@Override
public void write(OutputStream os) throws IOException, WebApplicationException {
System.out.println("starting");
int i=500;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/ardoq/addon/maven/MavenImportTask.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ public MavenImportTask(ArdoqConfig config, ImportDefinition imp, Map<String, Mav
}


@Override
public String call() throws Exception {
String key = getKey();
mode = Mode.RUNNING;
Expand All @@ -69,6 +68,8 @@ public String call() throws Exception {
workspaceInstance.setDescription("Maven POM import "+new SimpleDateFormat("yyyy.MM.dd HH:mm").format(new Date()));

projectSync.syncProject(imp.getArtifact());
projectSync.addExclusions(mavenUtil);

ardoqSync.updateWorkspaceIfDifferent(workspaceInstance);
ardoqSync.deleteNotSyncedItems();

Expand Down

0 comments on commit e781d82

Please sign in to comment.