Skip to content

Commit 5950afd

Browse files
IcetyIcety
committed
Deliverable
1 parent 1242e72 commit 5950afd

File tree

8 files changed

+125
-67
lines changed

8 files changed

+125
-67
lines changed

‎backEnd/src/main/java/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Manifest-Version: 1.0
2+
Main-Class: com.pl.tagc.tagcwebapp.Main
3+

‎deliverables/deliverables.rar‎

54.5 MB
Binary file not shown.

‎deliverables/executable.zip‎

-12.1 MB
Binary file not shown.

‎deliverables/run.exe‎

-9.21 MB
Binary file not shown.

‎depmerge.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<!--
2+
see http://maven.apache.org/guides/mini/guide-assemblies.html
3+
see http://maven.apache.org/plugins/maven-assembly-plugin/descriptor-refs.html
4+
-->
5+
<assembly
6+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
7+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
9+
<!-- TODO: a jarjar format would be better -->
10+
<id>jar-with-dependencies-and-services</id>
11+
<formats>
12+
<format>jar</format>
13+
</formats>
14+
<includeBaseDirectory>false</includeBaseDirectory>
15+
<dependencySets>
16+
<dependencySet>
17+
<outputDirectory>/</outputDirectory>
18+
<useProjectArtifact>true</useProjectArtifact>
19+
<unpack>true</unpack>
20+
<scope>runtime</scope>
21+
</dependencySet>
22+
</dependencySets>
23+
<!--
24+
http://stackoverflow.com/questions/1607220/how-can-i-merge-resource-files-in-a-maven-assembly
25+
-->
26+
<containerDescriptorHandlers>
27+
<containerDescriptorHandler>
28+
<handlerName>metaInf-services</handlerName>
29+
</containerDescriptorHandler>
30+
</containerDescriptorHandlers>
31+
</assembly>

‎out/artifacts/Context_jar/Context.jar‎

49.8 MB
Binary file not shown.

‎pom.xml‎

Lines changed: 79 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,72 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>com.pl.tagc</groupId>
5-
<artifactId>PL5-2016</artifactId>
6-
<packaging>pom</packaging>
7-
<version>0.0.1-SNAPSHOT</version>
8-
<modules>
9-
<module>backEnd</module>
10-
<module>tagcwebapp</module>
11-
</modules>
12-
<name>PL5-2016</name>
13-
<dependencies>
14-
<dependency>
15-
<groupId>junit</groupId>
16-
<artifactId>junit</artifactId>
17-
<version>4.8.2</version>
18-
<scope>test</scope>
19-
</dependency>
20-
<dependency>
21-
<groupId>com.sun.jersey</groupId>
22-
<artifactId>jersey-client</artifactId>
23-
<version>${jersey-version}</version>
24-
<scope>test</scope>
25-
</dependency>
26-
</dependencies>
27-
<build>
28-
<plugins>
29-
<plugin>
30-
<groupId>org.apache.maven.plugins</groupId>
31-
<artifactId>maven-compiler-plugin</artifactId>
32-
<inherited>true</inherited>
33-
<configuration>
34-
<source>1.8</source>
35-
<target>1.8</target>
36-
</configuration>
37-
</plugin>
38-
<plugin>
39-
<groupId>org.codehaus.mojo</groupId>
40-
<artifactId>exec-maven-plugin</artifactId>
41-
<version>1.1</version>
42-
<executions>
43-
<execution>
44-
<goals>
45-
<goal>java</goal>
46-
</goals>
47-
</execution>
48-
</executions>
49-
</plugin>
50-
</plugins>
51-
</build>
52-
<properties>
53-
<jersey-version>1.19.1</jersey-version>
54-
</properties>
55-
<reporting>
56-
<plugins>
57-
<plugin>
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>com.pl.tagc</groupId>
5+
<artifactId>PL5-2016</artifactId>
6+
<packaging>pom</packaging>
7+
<version>0.0.1-SNAPSHOT</version>
8+
<modules>
9+
<module>backEnd</module>
10+
<module>tagcwebapp</module>
11+
</modules>
12+
<name>PL5-2016</name>
13+
<dependencies>
14+
<dependency>
15+
<groupId>junit</groupId>
16+
<artifactId>junit</artifactId>
17+
<version>4.8.2</version>
18+
<scope>test</scope>
19+
</dependency>
20+
<dependency>
21+
<groupId>com.sun.jersey</groupId>
22+
<artifactId>jersey-client</artifactId>
23+
<version>${jersey-version}</version>
24+
<scope>test</scope>
25+
</dependency>
26+
</dependencies>
27+
<build>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-compiler-plugin</artifactId>
32+
<inherited>true</inherited>
33+
<configuration>
34+
<source>1.8</source>
35+
<target>1.8</target>
36+
</configuration>
37+
</plugin>
38+
<plugin>
39+
<artifactId>maven-assembly-plugin</artifactId>
40+
<version>2.5.3</version>
41+
<configuration>
42+
<archive>
43+
<manifest>
44+
<mainClass>com.pl.tagc.tagcwebap.Main</mainClass>
45+
</manifest>
46+
</archive>
47+
<descriptor>depmerge.xml</descriptor>
48+
</configuration>
49+
</plugin>
50+
<plugin>
51+
<groupId>org.codehaus.mojo</groupId>
52+
<artifactId>exec-maven-plugin</artifactId>
53+
<version>1.1</version>
54+
<executions>
55+
<execution>
56+
<goals>
57+
<goal>java</goal>
58+
</goals>
59+
</execution>
60+
</executions>
61+
</plugin>
62+
</plugins>
63+
</build>
64+
<properties>
65+
<jersey-version>1.19.1</jersey-version>
66+
</properties>
67+
<reporting>
68+
<plugins>
69+
<plugin>
5870
<groupId>org.apache.maven.plugins</groupId>
5971
<artifactId>maven-javadoc-plugin</artifactId>
6072
<version>2.10.1</version>
@@ -70,7 +82,7 @@
7082
</reportSet>
7183
</reportSets>
7284
</plugin>
73-
<plugin>
85+
<plugin>
7486
<groupId>org.apache.maven.plugins</groupId>
7587
<artifactId>maven-checkstyle-plugin</artifactId>
7688
<configuration>
@@ -86,19 +98,19 @@
8698
<includeTests>true</includeTests>
8799
</configuration>
88100
</plugin>
89-
<plugin>
90-
<groupId>org.codehaus.mojo</groupId>
91-
<artifactId>cobertura-maven-plugin</artifactId>
92-
<version>2.7</version>
93-
</plugin>
94-
<plugin>
101+
<plugin>
102+
<groupId>org.codehaus.mojo</groupId>
103+
<artifactId>cobertura-maven-plugin</artifactId>
104+
<version>2.7</version>
105+
</plugin>
106+
<plugin>
95107
<groupId>org.codehaus.mojo</groupId>
96108
<artifactId>findbugs-maven-plugin</artifactId>
97109
<configuration>
98-
<xmlOutput>true</xmlOutput>
110+
<xmlOutput>true</xmlOutput>
99111
<includeTests>true</includeTests>
100-
</configuration>
112+
</configuration>
101113
</plugin>
102-
</plugins>
103-
</reporting>
114+
</plugins>
115+
</reporting>
104116
</project>

‎tagcwebapp/pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,18 @@
4242
<scope>test</scope>
4343
<version>2.22.2</version>
4444
</dependency>
45+
<dependency>
46+
<groupId>com.wordnik</groupId>
47+
<artifactId>swagger-core_2.10</artifactId>
48+
<version>1.3.11</version>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>javax.ws.rs</groupId>
52+
<artifactId>jsr311-api</artifactId>
53+
</exclusion>
54+
</exclusions>
55+
</dependency>
56+
4557
<!-- uncomment this to get Fastinfoset support: <dependency> <groupId>com.sun.jersey</groupId>
4658
<artifactId>jersey-fastinfoset</artifactId> <version>${jersey-version}</version>
4759
</dependency> -->

0 commit comments

Comments
 (0)