Skip to content

Commit a8a815e

Browse files
author
koenhindriks
committed
Merge with develop branch for release v1.1.0
2 parents 5122f37 + 393fc34 commit a8a815e

2 files changed

Lines changed: 137 additions & 69 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
/target/
2+
/.project
3+
/.settings/
4+
/.classpath

‎pom.xml‎

Lines changed: 134 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,140 +2,205 @@
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44

5+
6+
<properties>
7+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8+
<environmentname>HelloWorldEnvironment</environmentname>
9+
<mainclass>nl.tudelft.goal.helloworld.HelloWorldEnvironment</mainclass>
10+
</properties>
11+
12+
513
<groupId>eishub</groupId>
6-
<artifactId>HelloWorldEnvironment</artifactId>
7-
<version>1.1.0-SNAPSHOT</version>
8-
<name>HelloWorldEnvironment</name>
9-
<description>HelloWorld Environment</description>
10-
<url>http://www.github.com/eishub/HelloWorldEnvironment</url>
14+
<artifactId>${environmentname}</artifactId>
15+
<version>1.1.0</version>
16+
<name>${environmentname}</name>
17+
<description>A window where agents can write text messages.</description>
18+
<url>http://www.github.com/eishub/${environmentname}</url>
1119

20+
21+
1222
<licenses>
1323
<license>
14-
<name>GNU General Public License</name>
15-
<url>http://www.gnu.org/licenses/gpl.html</url>
24+
<name>The GNU General Public License, Version 3.0</name>
25+
<url>http://www.gnu.org/licenses/gpl-3.0.txt</url>
1626
</license>
1727
</licenses>
1828

29+
<developers>
30+
<developer>
31+
<name>Koen Hindriks</name>
32+
<email>[email protected]</email>
33+
<organization>eishub</organization>
34+
<organizationUrl>https://github.com/koenhindriks</organizationUrl>
35+
</developer>
36+
</developers>
37+
1938
<organization>
2039
<name>eishub</name>
21-
<url>http://www.github.com/eishub</url>
40+
<url>https://github.com/eishub</url>
2241
</organization>
2342

24-
<properties>
25-
<version>0.1.0</version>
26-
<main.class>HelloWorldEnvironment</main.class>
27-
<main.class.package>nl.tudelft.goal.helloworld</main.class.package>
28-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
29-
<github.global.server>github</github.global.server>
30-
</properties>
43+
<issueManagement>
44+
<url>https://github.com/eishub/${environmentname}/issues</url>
45+
<system>Github ${environmentname} Issues</system>
46+
</issueManagement>
47+
48+
<scm>
49+
<connection>scm:git:[email protected]:eishub/${environmentname}.git</connection>
50+
<developerConnection>scm:git:[email protected]:eishub/${environmentname}.git</developerConnection>
51+
<url>https://github.com:eishub/${environmentname}</url>
52+
</scm>
53+
54+
3155

3256
<repositories>
3357
<repository>
34-
<id>eishub</id>
35-
<url>http://raw.github.com/eishub/mvn-repo/master</url>
36-
<snapshots>
37-
<enabled>true</enabled>
38-
<updatePolicy>always</updatePolicy>
39-
</snapshots>
58+
<id>eishub-mvn-repo</id>
59+
<url>https://raw.github.com/eishub/mvn-repo/master</url>
4060
</repository>
4161
</repositories>
4262

4363
<dependencies>
4464
<dependency>
4565
<groupId>eishub</groupId>
4666
<artifactId>eis</artifactId>
47-
<version>0.4</version>
67+
<version>0.5.0</version>
4868
</dependency>
4969
</dependencies>
5070

51-
<scm>
52-
<connection>scm:git:http://github.com/eishub/HelloWorldEnvironment.git</connection>
53-
</scm>
54-
5571
<build>
56-
<finalName>${project.artifactId}-${project.version}-r${buildNumber}</finalName>
5772
<plugins>
5873
<plugin>
5974
<groupId>org.apache.maven.plugins</groupId>
60-
<artifactId>maven-compiler-plugin</artifactId>
61-
<version>2.3.2</version>
62-
<configuration>
63-
<compilerVersion>1.6</compilerVersion>
64-
<source>1.6</source>
65-
<target>1.6</target>
66-
<showDeprecation>true</showDeprecation>
67-
<showWarnings>true</showWarnings>
68-
<fork>true</fork>
69-
</configuration>
70-
</plugin>
71-
72-
<plugin>
73-
<groupId>org.codehaus.mojo</groupId>
74-
<artifactId>buildnumber-maven-plugin</artifactId>
75-
<version>1.3</version>
75+
<artifactId>maven-dependency-plugin</artifactId>
76+
<version>2.9</version>
7677
<executions>
7778
<execution>
79+
<id>analyze</id>
80+
<phase>verify</phase>
7881
<goals>
79-
<goal>create</goal>
82+
<goal>analyze-only</goal>
8083
</goals>
84+
<configuration>
85+
<failOnWarning>true</failOnWarning>
86+
<ignoreNonCompile>true</ignoreNonCompile>
87+
</configuration>
8188
</execution>
8289
</executions>
83-
<configuration>
84-
<doCheck>true</doCheck>
85-
<doUpdate>true</doUpdate>
86-
<format>{0,date,yyyy-MM-dd}</format>
87-
<items>
88-
<item>timestamp</item>
89-
</items>
90-
</configuration>
9190
</plugin>
9291

9392
<plugin>
9493
<groupId>org.apache.maven.plugins</groupId>
9594
<artifactId>maven-jar-plugin</artifactId>
96-
<version>2.5</version>
95+
<version>2.4</version>
9796
<configuration>
9897
<archive>
9998
<manifest>
100-
<addClasspath>true</addClasspath>
101-
<mainClass>${main.class.package}.${main.class}</mainClass>
99+
<mainClass>${mainclass}</mainClass>
102100
</manifest>
103101
</archive>
104102
</configuration>
103+
</plugin>
104+
105+
<plugin>
106+
<groupId>org.apache.maven.plugins</groupId>
107+
<artifactId>maven-compiler-plugin</artifactId>
108+
<version>3.2</version>
109+
<configuration>
110+
<source>1.7</source>
111+
<target>1.7</target>
112+
</configuration>
113+
</plugin>
105114

115+
<plugin>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-javadoc-plugin</artifactId>
118+
<version>2.10.1</version>
106119
<executions>
107120
<execution>
108-
<id>ElevatorSim</id>
121+
<id>attach-javadocs</id>
109122
<goals>
110123
<goal>jar</goal>
111124
</goals>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-source-plugin</artifactId>
132+
<version>2.4</version>
133+
<executions>
134+
<execution>
135+
<id>attach-sources</id>
136+
<phase>verify</phase>
137+
<goals>
138+
<goal>jar-no-fork</goal>
139+
</goals>
140+
</execution>
141+
</executions>
142+
</plugin>
143+
144+
<plugin>
145+
<artifactId>maven-assembly-plugin</artifactId>
146+
<version>2.5.2</version>
147+
<configuration>
148+
<descriptorRefs>
149+
<descriptorRef>jar-with-dependencies</descriptorRef>
150+
</descriptorRefs>
151+
</configuration>
152+
<executions>
153+
<execution>
154+
<id>make-assembly</id>
112155
<phase>package</phase>
113-
<configuration>
114-
<archive>
115-
<manifest>
116-
<addClasspath>true</addClasspath>
117-
<mainClass>${main.class.package}.${main.class}</mainClass>
118-
</manifest>
119-
</archive>
120-
<classifier>ElevatorSim</classifier>
121-
</configuration>
156+
<goals>
157+
<goal>attached</goal>
158+
</goals>
122159
</execution>
123160
</executions>
124161
</plugin>
125162

126163
<plugin>
127164
<groupId>org.apache.maven.plugins</groupId>
128-
<artifactId>maven-javadoc-plugin</artifactId>
129-
<version>2.5</version>
165+
<artifactId>maven-deploy-plugin</artifactId>
166+
<version>2.8.2</version>
167+
<configuration>
168+
<altDeploymentRepository>internal.repo::default::file://${project.build.directory}/mvn-repo</altDeploymentRepository>
169+
</configuration>
170+
</plugin>
171+
172+
<plugin>
173+
<groupId>com.github.github</groupId>
174+
<artifactId>site-maven-plugin</artifactId>
175+
<version>0.10</version>
176+
<configuration>
177+
<server>github</server>
178+
<!-- git commit message -->
179+
<message>Maven artifacts for ${project.name} version ${project.version}</message>
180+
<!-- matches distribution management repository url above -->
181+
<outputDirectory>${project.build.directory}/mvn-repo</outputDirectory>
182+
<!-- remote branch name -->
183+
<branch>refs/heads/master</branch>
184+
<merge>true</merge>
185+
<includes>
186+
<include>**/*</include>
187+
</includes>
188+
<!-- github repo name -->
189+
<repositoryName>mvn-repo</repositoryName>
190+
<!-- github organization -->
191+
<repositoryOwner>eishub</repositoryOwner>
192+
</configuration>
130193
<executions>
194+
<!-- run site-maven-plugin as part of the build's 'deploy' phase -->
131195
<execution>
132-
<id>attach-javadocs</id>
133196
<goals>
134-
<goal>jar</goal>
197+
<goal>site</goal>
135198
</goals>
199+
<phase>deploy</phase>
136200
</execution>
137201
</executions>
138202
</plugin>
139203
</plugins>
140204
</build>
205+
141206
</project>

0 commit comments

Comments
 (0)