Skip to content

Commit 359203d

Browse files
couradocourado
committed
Modified the pom.xml hierarchy
Also fixed some javadoc in ZenodoService
1 parent 2dc1784 commit 359203d

File tree

5 files changed

+190
-306
lines changed

5 files changed

+190
-306
lines changed

‎omtd-registry-api/pom.xml

+3-80
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>eu.openminted</groupId>
43
<artifactId>omtd-registry-api</artifactId>
5-
<version>2.1.1-SNAPSHOT</version>
64
<packaging>jar</packaging>
75

86
<parent>
97
<groupId>eu.openminted</groupId>
10-
<artifactId>registry-parent</artifactId>
11-
<version>1.0.1</version>
8+
<artifactId>omtd-registry</artifactId>
9+
<version>2.1.1-SNAPSHOT</version>
1210
</parent>
1311

1412
<licenses>
@@ -94,76 +92,15 @@
9492
</repository>
9593
</distributionManagement>
9694

97-
98-
<repositories>
99-
<repository>
100-
<id>omtd-snapshots</id>
101-
<layout>default</layout>
102-
<url>https://repo.openminted.eu/content/repositories/snapshots/</url>
103-
<releases><enabled>false</enabled></releases>
104-
<snapshots><enabled>true</enabled></snapshots>
105-
</repository>
106-
<repository>
107-
<id>omtd-releases</id>
108-
<layout>default</layout>
109-
<url>https://repo.openminted.eu/content/repositories/releases</url>
110-
<releases><enabled>true</enabled></releases>
111-
<snapshots><enabled>false</enabled></snapshots>
112-
</repository>
113-
</repositories>
114-
11595
<build>
116-
<!--<pluginManagement>-->
11796
<plugins>
118-
<plugin>
119-
<groupId>org.apache.maven.plugins</groupId>
120-
<artifactId>maven-surefire-plugin</artifactId>
121-
<version>2.19.1</version>
122-
<configuration>
123-
<argLine>-Dfile.encoding=UTF-8</argLine>
124-
</configuration>
125-
</plugin>
12697
<plugin>
12798
<groupId>org.apache.maven.plugins</groupId>
12899
<artifactId>maven-compiler-plugin</artifactId>
129-
<version>3.5.1</version>
130-
<configuration>
131-
<source>1.8</source>
132-
<target>1.8</target>
133-
</configuration>
134-
</plugin>
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-javadoc-plugin</artifactId>
138-
<version>2.8.1</version>
139-
<configuration>
140-
<encoding>UTF-8</encoding>
141-
<maxmemory>512m</maxmemory>
142-
<links>
143-
<link>http://docs.oracle.com/javase/7/docs/api/</link>
144-
</links>
145-
</configuration>
146-
<executions>
147-
<execution>
148-
<id>attach-javadocs</id>
149-
<phase>verify</phase>
150-
<goals>
151-
<goal>jar</goal>
152-
</goals>
153-
</execution>
154-
</executions>
155100
</plugin>
156101
<plugin>
157102
<groupId>org.apache.maven.plugins</groupId>
158103
<artifactId>maven-source-plugin</artifactId>
159-
<executions>
160-
<execution>
161-
<id>attach-sources</id>
162-
<goals>
163-
<goal>jar</goal>
164-
</goals>
165-
</execution>
166-
</executions>
167104
</plugin>
168105
<plugin>
169106
<groupId>org.jsonschema2pojo</groupId>
@@ -233,21 +170,7 @@
233170
</execution>
234171
</executions>
235172
</plugin>
236-
<plugin>
237-
<groupId>external.atlassian.jgitflow</groupId>
238-
<artifactId>jgitflow-maven-plugin</artifactId>
239-
<version>1.0-m5.1</version>
240-
<configuration>
241-
<flowInitContext>
242-
<developBranchName>develop</developBranchName>
243-
<versionTagPrefix>v</versionTagPrefix>
244-
</flowInitContext>
245-
<username>USERNAME_FOR_A_GIT_USER</username>
246-
<password>PASSWORD_FOR_A_GIT_USER</password>
247-
<noDeploy>true</noDeploy>
248-
<squash>true</squash>
249-
</configuration>
250-
</plugin>
251173
</plugins>
174+
<finalName>omtd-registry-api</finalName>
252175
</build>
253176
</project>

‎omtd-registry-api/src/main/java/eu/openminted/registry/service/ZenodoService.java

+10-13
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ public interface ZenodoService {
1414
/**
1515
* Create and publish a corpus deposition.
1616
* @param corpusId
17-
* @return Zenodo deposition DOI
17+
* @return String Zenodo deposition DOI
1818
*/
1919
String publishCorpus(String corpusId);
2020

2121
/**
2222
* List all depositions for the currently authenticated user.
23-
* @return
23+
* @return depositions
2424
*/
2525
JSONObject listDepositions();
2626

@@ -38,28 +38,27 @@ public interface ZenodoService {
3838

3939
/**
4040
* Retrieve a single deposition resource.
41-
* @return
41+
* @return deposition
4242
*/
4343
JSONObject retrieveDeposition(String zenodoId);
4444

4545
/**
4646
* Update an existing deposition resource.
47-
* @return
47+
* @return String
4848
*/
4949
String updateDeposition(String zenodoId, String metadata);
5050

5151
/**
5252
* Delete an existing deposition resource.
5353
* Note, only unpublished depositions may be deleted.
54-
* @return
5554
*/
5655
void deleteDeposition(String zenodoId);
5756

5857
/**
5958
* Upload a new file.
6059
* @param zenodoId
6160
* @param file
62-
* @return
61+
* @return the file uploaded
6362
*/
6463
String uploadFile(String zenodoId, File file);
6564

@@ -68,15 +67,15 @@ public interface ZenodoService {
6867
* By default, the first file is shown in the file preview.
6968
* @param zenodoId
7069
* @param ids
71-
* @return
70+
* @return String
7271
*/
7372
String sort(String zenodoId, JSONObject ids);
7473

7574
/**
7675
* Retrieve a single deposition file.
7776
* @param zenodoId
7877
* @param fileId
79-
* @return
78+
* @return String
8079
*/
8180
String retrieveFile(String zenodoId, String fileId);
8281

@@ -86,7 +85,7 @@ public interface ZenodoService {
8685
* @param zenodoId
8786
* @param fileId
8887
* @param newName
89-
* @return
88+
* @return String
9089
*/
9190
String updateFile(String zenodoId, String fileId, String newName);
9291

@@ -95,7 +94,6 @@ public interface ZenodoService {
9594
* Note, only deposition files for unpublished depositions may be deleted.
9695
* @param zenodoId
9796
* @param fileId
98-
* @return
9997
*/
10098
void deleteFile(String zenodoId, String fileId);
10199

@@ -110,21 +108,20 @@ public interface ZenodoService {
110108
/**
111109
* Unlock already submitted deposition for editing.
112110
* @param zenodoId
113-
* @return
111+
* @return String
114112
*/
115113
String edit(String zenodoId, String metadata);
116114

117115
/**
118116
* Discard changes in the current editing session.
119117
* @param zenodoId
120-
* @return
121118
*/
122119
void discard(String zenodoId);
123120

124121
/**
125122
* Clones a published deposition to a new unpublished version.
126123
* @param zenodoId
127-
* @return
124+
* @return String
128125
*/
129126
String newVersion(String zenodoId);
130127

‎omtd-registry-rest/pom.xml

+12-65
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>eu.openminted</groupId>
43
<artifactId>omtd-registry-rest</artifactId>
5-
<version>2.1.1-SNAPSHOT</version>
64
<packaging>jar</packaging>
75

86
<parent>
97
<groupId>eu.openminted</groupId>
10-
<artifactId>registry-parent</artifactId>
11-
<version>1.0.1</version>
8+
<artifactId>omtd-registry</artifactId>
9+
<version>2.1.1-SNAPSHOT</version>
1210
</parent>
1311

1412

@@ -46,21 +44,6 @@
4644
<artifactId>omtd-model</artifactId>
4745
<version>${omtd.model.version}</version>
4846
</dependency>
49-
<dependency>
50-
<groupId>org.springframework</groupId>
51-
<artifactId>spring-web</artifactId>
52-
<version>${spring.version}</version>
53-
</dependency>
54-
<dependency>
55-
<groupId>org.springframework</groupId>
56-
<artifactId>spring-webmvc</artifactId>
57-
<version>${spring.version}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.springframework</groupId>
61-
<artifactId>spring-beans</artifactId>
62-
<version>${spring.version}</version>
63-
</dependency>
6447
<dependency>
6548
<groupId>com.fasterxml.jackson.core</groupId>
6649
<artifactId>jackson-databind</artifactId>
@@ -143,53 +126,17 @@
143126
</repository>
144127
</distributionManagement>
145128

146-
147-
<repositories>
148-
<repository>
149-
<id>omtd-snapshots</id>
150-
<layout>default</layout>
151-
<url>https://repo.openminted.eu/content/repositories/snapshots/</url>
152-
<releases><enabled>false</enabled></releases>
153-
<snapshots><enabled>true</enabled></snapshots>
154-
</repository>
155-
<repository>
156-
<id>omtd-releases</id>
157-
<layout>default</layout>
158-
<url>https://repo.openminted.eu/content/repositories/releases</url>
159-
<releases><enabled>true</enabled></releases>
160-
<snapshots><enabled>false</enabled></snapshots>
161-
</repository>
162-
</repositories>
163-
164129
<build>
165-
<pluginManagement>
166-
<plugins>
167-
<plugin>
168-
<groupId>org.apache.maven.plugins</groupId>
169-
<artifactId>maven-compiler-plugin</artifactId>
170-
<version>3.5.1</version>
171-
<configuration>
172-
<source>1.8</source>
173-
<target>1.8</target>
174-
</configuration>
175-
</plugin>
176-
<plugin>
177-
<groupId>external.atlassian.jgitflow</groupId>
178-
<artifactId>jgitflow-maven-plugin</artifactId>
179-
<version>1.0-m5.1</version>
180-
<configuration>
181-
<flowInitContext>
182-
<developBranchName>develop</developBranchName>
183-
<versionTagPrefix>v</versionTagPrefix>
184-
</flowInitContext>
185-
<username>USERNAME_FOR_A_GIT_USER</username>
186-
<password>PASSWORD_FOR_A_GIT_USER</password>
187-
<noDeploy>true</noDeploy>
188-
<squash>true</squash>
189-
</configuration>
190-
</plugin>
191-
</plugins>
192-
</pluginManagement>
130+
<plugins>
131+
<plugin>
132+
<groupId>org.apache.maven.plugins</groupId>
133+
<artifactId>maven-compiler-plugin</artifactId>
134+
</plugin>
135+
<plugin>
136+
<groupId>org.apache.maven.plugins</groupId>
137+
<artifactId>maven-source-plugin</artifactId>
138+
</plugin>
139+
</plugins>
193140
<finalName>registry-core-rest</finalName>
194141
</build>
195142
</project>

0 commit comments

Comments
 (0)