Skip to content

Commit

Permalink
fix for Spring parent mess up
Browse files Browse the repository at this point in the history
  • Loading branch information
@arcuri82
arcuri82 committed Sep 14, 2022
1 parent 501a668 commit ac68e72
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 47 deletions.
31 changes: 26 additions & 5 deletions jdk_8_maven/cs/rest-gui/genome-nexus/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,29 @@
</pluginRepository>
</pluginRepositories>
<!-- inherit defaults from spring boot -->
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.1.RELEASE</version>
</parent>
<!-- <parent>-->
<!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
<!-- <version>2.2.1.RELEASE</version>-->
<!-- </parent>-->

<properties>
<java.version>1.8</java.version>
<log4j2.version>2.17.0</log4j2.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.1.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand All @@ -62,6 +74,15 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<!-- <plugin>-->
<!-- <groupId>com.github.cbioportal.maven-external-version</groupId>-->
<!-- <artifactId>maven-external-version-plugin</artifactId>-->
Expand Down
92 changes: 50 additions & 42 deletions jdk_8_maven/cs/rest-gui/genome-nexus/web/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,53 +86,61 @@
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.2.1.RELEASE</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
<configuration>
<finalName>genome-nexus</finalName>
<classifier>sut</classifier>
<mainClass>org.cbioportal.genome_nexus.GenomeNexusAnnotation</mainClass>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.3</version>
<executions>
<!-- unpack genome-nexus-frontend -->
<execution>
<id>unpack</id>
<!-- generate before copying over resources -->
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>com.github.genome-nexus</groupId>
<artifactId>genome-nexus-frontend</artifactId>
<version>744d3666a407c918673a7611157756404bfbd1a1</version>
<type>jar</type>
<outputDirectory>src/main/resources/static</outputDirectory>
<overWrite>true</overWrite>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-dependency-plugin</artifactId>-->
<!-- <version>2.3</version>-->
<!-- <executions>-->
<!-- &lt;!&ndash; unpack genome-nexus-frontend &ndash;&gt;-->
<!-- <execution>-->
<!-- <id>unpack</id>-->
<!-- &lt;!&ndash; generate before copying over resources &ndash;&gt;-->
<!-- <phase>generate-resources</phase>-->
<!-- <goals>-->
<!-- <goal>unpack</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <artifactItems>-->
<!-- <artifactItem>-->
<!-- <groupId>com.github.genome-nexus</groupId>-->
<!-- <artifactId>genome-nexus-frontend</artifactId>-->
<!-- <version>744d3666a407c918673a7611157756404bfbd1a1</version>-->
<!-- <type>jar</type>-->
<!-- <outputDirectory>src/main/resources/static</outputDirectory>-->
<!-- <overWrite>true</overWrite>-->
<!-- </artifactItem>-->
<!-- </artifactItems>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- required to build an executable jar -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.2.1.RELEASE</version>
<executions>
<execution>
<goals>
<goal>build-info</goal>
<goal>repackage</goal>
</goals>
<configuration>
<finalName>genome-nexus</finalName>
<classifier>sut</classifier>
<mainClass>org.cbioportal.genome_nexus.GenomeNexusAnnotation</mainClass>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
Expand Down

0 comments on commit ac68e72

Please sign in to comment.