Skip to content

Commit

Permalink
Merge pull request #4 from ehrbase/feature/CDR-280_use_bom
Browse files Browse the repository at this point in the history 
use bom
  • Loading branch information
@stefanspiska
stefanspiska authored Apr 25, 2022
2 parents 213edca + 097cd1a commit cfeabc3
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 66 deletions.
64 changes: 0 additions & 64 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,72 +17,8 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>


</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.5.9</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>5.3.15</version>
</dependency>
<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>plugin</artifactId>
<version>0.20.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.pf4j</groupId>
<artifactId>pf4j-spring</artifactId>
<version>0.7.0</version>
<exclusions>
<exclusion> <!-- declare the exclusion here -->
<groupId>slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.nedap.healthcare.archie</groupId>
<artifactId>openehr-rm</artifactId>
<version>1.0.4</version>
</dependency>
<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>service</artifactId>
<version>0.19.0-SNAPSHOT</version>
</dependency>
</dependencies>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifestEntries>
<Plugin-Id>${plugin.id}</Plugin-Id>
<Plugin-Class>${plugin.class}</Plugin-Class>
<Plugin-Version>${plugin.version}</Plugin-Version>
<Plugin-Provider>${plugin.provider}</Plugin-Provider>
<Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
</project>
78 changes: 77 additions & 1 deletion simple-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,84 @@
<plugin.class>org.ehrbase.example_plugin.ExamplePlugin</plugin.class>
<plugin.version>0.0.1</plugin.version>
<plugin.provider>pr</plugin.provider>
<plugin.dependencies />
<plugin.dependencies/>
</properties>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>bom</artifactId>
<version>0.21.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>


<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>plugin</artifactId>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>service</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifestEntries>
<Plugin-Id>${plugin.id}</Plugin-Id>
<Plugin-Class>${plugin.class}</Plugin-Class>
<Plugin-Version>${plugin.version}</Plugin-Version>
<Plugin-Provider>${plugin.provider}</Plugin-Provider>
<Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<artifactSet>
// explicitly include all dependencies not in ehrbase in the jar.
<includes>
<include>dummy</include>
</includes>
</artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
76 changes: 75 additions & 1 deletion web-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,84 @@
<plugin.class>org.ehrbase.example_web_plugin.ExampleWebPlugin</plugin.class>
<plugin.version>0.0.1</plugin.version>
<plugin.provider>pr</plugin.provider>
<plugin.dependencies />
<plugin.dependencies/>
</properties>


<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>bom</artifactId>
<version>0.21.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>


<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>plugin</artifactId>
<scope>provided</scope>
</dependency>


<dependency>
<groupId>org.ehrbase.openehr</groupId>
<artifactId>service</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifestEntries>
<Plugin-Id>${plugin.id}</Plugin-Id>
<Plugin-Class>${plugin.class}</Plugin-Class>
<Plugin-Version>${plugin.version}</Plugin-Version>
<Plugin-Provider>${plugin.provider}</Plugin-Provider>
<Plugin-Dependencies>${plugin.dependencies}</Plugin-Dependencies>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<artifactSet>
// explicitly include all dependencies not in ehrbase in the jar.
<includes>
<include>dummy</include>
</includes>
</artifactSet>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>

0 comments on commit cfeabc3

Please sign in to comment.