Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit c78c471

Browse files
IngvordIngvord
committed
Progress: #45 
1 parent 463ca4d commit c78c471

File tree

4 files changed

+173
-91
lines changed

4 files changed

+173
-91
lines changed

‎pom.xml‎

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.tango-controls</groupId>
5+
<artifactId>rest-api-bom</artifactId>
6+
<version>1.0-SNAPSHOT</version>
7+
<packaging>pom</packaging>
8+
9+
<modules>
10+
<module>rc4</module>
11+
<module>rc5</module>
12+
<module>rc6</module>
13+
</modules>
14+
15+
<scm>
16+
<connection>scm:git:git@github.com:tango-controls/rest-api.git</connection>
17+
<developerConnection>scm:git:git@github.com:tango-controls/rest-api.git</developerConnection>
18+
<url>https://github.com/tango-controls/rest-api</url>
19+
<tag>HEAD</tag>
20+
</scm>
21+
22+
<distributionManagement>
23+
<repository>
24+
<id>bintray-tango-controls</id>
25+
<url>https://api.bintray.com/maven/tango-controls/rest/rest-api-bom/;publish=1</url>
26+
</repository>
27+
</distributionManagement>
28+
29+
<developers>
30+
<developer>
31+
<id>ingvord</id>
32+
<name>Igor Khokhriakov</name>
33+
<email>mail@ingvord.ru</email>
34+
<roles>
35+
<role>Maintainer</role>
36+
</roles>
37+
</developer>
38+
</developers>
39+
40+
<properties>
41+
<java.version>1.8</java.version>
42+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
43+
<guava.version>22.0</guava.version>
44+
<resteasy.version>3.6.2.Final</resteasy.version>
45+
<slf4j.version>1.7.6</slf4j.version>
46+
<logback.version>1.2.3</logback.version>
47+
</properties>
48+
49+
<dependencyManagement>
50+
<dependencies>
51+
<dependency>
52+
<groupId>junit</groupId>
53+
<artifactId>junit</artifactId>
54+
<version>4.12</version>
55+
</dependency>
56+
<dependency>
57+
<groupId>ch.qos.logback</groupId>
58+
<artifactId>logback-core</artifactId>
59+
<version>${logback.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>ch.qos.logback</groupId>
63+
<artifactId>logback-classic</artifactId>
64+
<version>${logback.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>com.google.guava</groupId>
68+
<artifactId>guava</artifactId>
69+
<version>${guava.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.jboss.resteasy</groupId>
73+
<artifactId>resteasy-client</artifactId>
74+
<version>${resteasy.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.jboss.resteasy</groupId>
78+
<artifactId>resteasy-jackson-provider</artifactId>
79+
<version>${resteasy.version}</version>
80+
</dependency>
81+
<dependency>
82+
<groupId>org.slf4j</groupId>
83+
<artifactId>slf4j-api</artifactId>
84+
<version>${slf4j.version}</version>
85+
</dependency>
86+
</dependencies>
87+
</dependencyManagement>
88+
89+
<build>
90+
<plugins>
91+
<plugin>
92+
<groupId>org.apache.maven.plugins</groupId>
93+
<artifactId>maven-compiler-plugin</artifactId>
94+
<configuration>
95+
<source>${java.version}</source>
96+
<target>${java.version}</target>
97+
<encoding>${project.build.sourceEncoding}</encoding>
98+
</configuration>
99+
</plugin>
100+
<plugin>
101+
<artifactId>maven-source-plugin</artifactId>
102+
<executions>
103+
<execution>
104+
<id>attach-sources</id>
105+
<goals>
106+
<goal>jar</goal>
107+
</goals>
108+
</execution>
109+
</executions>
110+
</plugin>
111+
<plugin>
112+
<artifactId>maven-javadoc-plugin</artifactId>
113+
<configuration>
114+
<skip>true</skip>
115+
</configuration>
116+
</plugin>
117+
<plugin>
118+
<artifactId>maven-release-plugin</artifactId>
119+
</plugin>
120+
<plugin>
121+
<artifactId>maven-surefire-plugin</artifactId>
122+
<configuration>
123+
<skip>true</skip>
124+
</configuration>
125+
</plugin>
126+
</plugins>
127+
</build>
128+
129+
<profiles>
130+
<profile>
131+
<id>test-suite</id>
132+
<build>
133+
<plugins>
134+
<plugin>
135+
<artifactId>maven-surefire-plugin</artifactId>
136+
<configuration>
137+
<skip>false</skip>
138+
</configuration>
139+
</plugin>
140+
</plugins>
141+
</build>
142+
</profile>
143+
</profiles>
144+
145+
<!-- temporary resolve ezTangORB -->
146+
<repositories>
147+
<repository>
148+
<snapshots>
149+
<enabled>false</enabled>
150+
</snapshots>
151+
<id>bintray-release</id>
152+
<name>bintray</name>
153+
<url>http://dl.bintray.com/hzgde/hzg-wpn-projects</url>
154+
</repository>
155+
</repositories>
156+
</project>

‎rc4/rest-api-rc4.iml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
</content>
1010
<orderEntry type="inheritedJdk" />
1111
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Maven: org.jboss.resteasy:resteasy-client:3.6.2.Final" level="project" />
13+
<orderEntry type="library" name="Maven: org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:1.0.2.Final" level="project" />
14+
<orderEntry type="library" name="Maven: org.jboss.resteasy:resteasy-jaxrs:3.6.2.Final" level="project" />
15+
<orderEntry type="library" name="Maven: org.jboss.resteasy:resteasy-jackson-provider:3.6.2.Final" level="project" />
1216
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
1317
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
1418
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />

‎rc5/rest-api-rc5.iml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
</content>
1010
<orderEntry type="inheritedJdk" />
1111
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Maven: org.jboss.resteasy:resteasy-client:3.6.2.Final" level="project" />
13+
<orderEntry type="library" name="Maven: org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:1.0.2.Final" level="project" />
14+
<orderEntry type="library" name="Maven: org.jboss.resteasy:resteasy-jaxrs:3.6.2.Final" level="project" />
15+
<orderEntry type="library" name="Maven: org.jboss.resteasy:resteasy-jackson-provider:3.6.2.Final" level="project" />
1216
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
1317
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
1418
<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />

‎rc6/pom.xml‎

Lines changed: 9 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,23 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<groupId>org.tango-controls</groupId>
6-
<artifactId>rest-api-rc4</artifactId>
7-
<version>0.7-SNAPSHOT</version>
8-
<description>Tango REST API Java reference implementation</description>
5+
<parent>
6+
<groupId>org.tango-controls</groupId>
7+
<artifactId>rest-api-bom</artifactId>
8+
<version>1.0-SNAPSHOT</version>
9+
</parent>
10+
11+
<artifactId>rest-api-rc6</artifactId>
12+
<description>Tango REST API RC6 Java reference implementation</description>
913

1014
<properties>
11-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1215
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
13-
<resteasy.version>3.6.1.Final</resteasy.version>
14-
<slf4j.version>1.7.5</slf4j.version>
15-
<logback.version>1.2.3</logback.version>
1616
</properties>
1717

18-
<scm>
19-
<connection>scm:git:git@github.com:tango-controls/rest-api.git</connection>
20-
<developerConnection>scm:git:git@github.com:tango-controls/rest-api.git</developerConnection>
21-
<url>https://github.com/tango-controls/rest-api</url>
22-
<tag>HEAD</tag>
23-
</scm>
24-
2518
<distributionManagement>
2619
<repository>
2720
<id>bintray-tango-controls</id>
28-
<url>https://api.bintray.com/maven/tango-controls/maven/RestApi/;publish=1</url>
21+
<url>https://api.bintray.com/maven/tango-controls/rest/rest-api-rc6/;publish=1</url>
2922
</repository>
3023
</distributionManagement>
3124

@@ -44,108 +37,33 @@
4437
<dependency>
4538
<groupId>junit</groupId>
4639
<artifactId>junit</artifactId>
47-
<version>4.12</version>
4840
<scope>test</scope>
4941
</dependency>
5042
<dependency>
5143
<groupId>ch.qos.logback</groupId>
5244
<artifactId>logback-core</artifactId>
53-
<version>${logback.version}</version>
5445
<scope>test</scope>
5546
</dependency>
5647
<dependency>
5748
<groupId>ch.qos.logback</groupId>
5849
<artifactId>logback-classic</artifactId>
59-
<version>${logback.version}</version>
6050
<scope>test</scope>
6151
</dependency>
6252
<dependency>
6353
<groupId>com.google.guava</groupId>
6454
<artifactId>guava</artifactId>
65-
<version>11.0.2</version>
6655
</dependency>
6756
<dependency>
6857
<groupId>org.jboss.resteasy</groupId>
6958
<artifactId>resteasy-client</artifactId>
70-
<version>${resteasy.version}</version>
7159
</dependency>
7260
<dependency>
7361
<groupId>org.jboss.resteasy</groupId>
7462
<artifactId>resteasy-jackson-provider</artifactId>
75-
<version>${resteasy.version}</version>
7663
</dependency>
7764
<dependency>
7865
<groupId>org.slf4j</groupId>
7966
<artifactId>slf4j-api</artifactId>
80-
<version>${slf4j.version}</version>
8167
</dependency>
8268
</dependencies>
83-
84-
<build>
85-
<plugins>
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-compiler-plugin</artifactId>
89-
<configuration>
90-
<source>1.7</source>
91-
<target>1.7</target>
92-
<encoding>${project.build.sourceEncoding}</encoding>
93-
</configuration>
94-
</plugin>
95-
<plugin>
96-
<artifactId>maven-source-plugin</artifactId>
97-
<executions>
98-
<execution>
99-
<id>attach-sources</id>
100-
<goals>
101-
<goal>jar</goal>
102-
</goals>
103-
</execution>
104-
</executions>
105-
</plugin>
106-
<plugin>
107-
<artifactId>maven-javadoc-plugin</artifactId>
108-
<configuration>
109-
<skip>true</skip>
110-
</configuration>
111-
</plugin>
112-
<plugin>
113-
<artifactId>maven-release-plugin</artifactId>
114-
</plugin>
115-
<plugin>
116-
<artifactId>maven-surefire-plugin</artifactId>
117-
<configuration>
118-
<skip>true</skip>
119-
</configuration>
120-
</plugin>
121-
</plugins>
122-
</build>
123-
124-
<profiles>
125-
<profile>
126-
<id>test-suite</id>
127-
<build>
128-
<plugins>
129-
<plugin>
130-
<artifactId>maven-surefire-plugin</artifactId>
131-
<configuration>
132-
<skip>false</skip>
133-
</configuration>
134-
</plugin>
135-
</plugins>
136-
</build>
137-
</profile>
138-
</profiles>
139-
140-
<!-- temporary resolve ezTangORB -->
141-
<repositories>
142-
<repository>
143-
<snapshots>
144-
<enabled>false</enabled>
145-
</snapshots>
146-
<id>bintray-release</id>
147-
<name>bintray</name>
148-
<url>http://dl.bintray.com/hzgde/hzg-wpn-projects</url>
149-
</repository>
150-
</repositories>
15169
</project>

0 commit comments

Comments
 (0)