Skip to content

Commit

Permalink
Add distribution management (#2)
Browse files Browse the repository at this point in the history
* Add distribution management

* add repositories to pom

* remove unused dependency

---------

Co-authored-by: Tobias Koch <[email protected]>
  • Loading branch information
KochTobi and KochTobi committed Feb 28, 2024
1 parent b3a330c commit 10c3a89
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 21 deletions.
2 changes: 1 addition & 1 deletion measurement-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>data-access-server</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<artifactId>measurement-provider</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions openbis-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>openbis-connector</artifactId>
<packaging>jar</packaging>
<version>0.1.0</version>

<parent>
<groupId>life.qbic</groupId>
<artifactId>data-access-server</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<properties>
Expand Down Expand Up @@ -69,7 +70,7 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>measurement-provider</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
29 changes: 22 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,23 @@

<groupId>life.qbic</groupId>
<artifactId>data-access-server</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
<packaging>pom</packaging>


<modules>
<module>zip</module>
<module>measurement-provider</module>
<module>openbis-connector</module>
<module>rest-api</module>
</modules>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<repositories>
<!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
<!-- Main Maven repository -->
Expand All @@ -38,6 +46,19 @@
</snapshots>
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-releases</url>
</repository>
<repository>
<id>nexus-snapshots</id>
<name>QBiC Snapshots</name>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<checksumPolicy>fail</checksumPolicy>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
<url>https://qbic-repo.qbic.uni-tuebingen.de/repository/maven-snapshots</url>
</repository>
</repositories>

<distributionManagement>
Expand All @@ -55,10 +76,4 @@
</snapshotRepository>
</distributionManagement>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

</project>
30 changes: 20 additions & 10 deletions rest-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,35 @@
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">
<modelVersion>4.0.0</modelVersion>
<groupId>life.qbic</groupId>
<artifactId>rest-api</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
<packaging>jar</packaging>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.2</version>
<relativePath/>
<groupId>life.qbic</groupId>
<artifactId>data-access-server</artifactId>
<version>0.1.0</version>
</parent>

<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>3.2.2</spring.boot.version>
<spring.boot.version>3.2.3</spring.boot.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -40,17 +50,17 @@
<dependency>
<groupId>life.qbic</groupId>
<artifactId>measurement-provider</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>openbis-connector</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</dependency>
<dependency>
<groupId>life.qbic</groupId>
<artifactId>zip</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion zip/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>life.qbic</groupId>
<artifactId>data-access-server</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.1.0</version>
</parent>

<groupId>life.qbic</groupId>
Expand Down

0 comments on commit 10c3a89

Please sign in to comment.