Skip to content

Commit 2f33bba

Browse files
juanfeSanahujajuanfeSanahuja
committed
Merge branch 'TASK-7362' of github.com:opencb/cellbase into TASK-7362
2 parents 815b18b + 2c24611 commit 2f33bba

File tree

1 file changed

+58
-59
lines changed

1 file changed

+58
-59
lines changed

Diff for: ‎cellbase-server/pom.xml

+58-59
Original file line numberDiff line numberDiff line change
@@ -133,67 +133,66 @@
133133
<build>
134134
<sourceDirectory>src/main/java</sourceDirectory>
135135
<plugins>
136-
<plugin>
137-
<groupId>org.apache.maven.plugins</groupId>
138-
<artifactId>maven-war-plugin</artifactId>
139-
<version>3.2.3</version>
140-
<configuration>
141-
<warName>cellbase</warName>
142-
<webResources>
143-
<resource>
144-
<directory>src/main/webapp/WEB-INF/</directory>
145-
<targetPath>WEB-INF</targetPath>
146-
<filtering>true</filtering>
147-
</resource>
148-
</webResources>
149-
</configuration>
150-
</plugin>
136+
<plugin>
137+
<groupId>org.apache.maven.plugins</groupId>
138+
<artifactId>maven-war-plugin</artifactId>
139+
<version>3.2.3</version>
140+
<configuration>
141+
<warName>cellbase</warName>
142+
<webResources>
143+
<resource>
144+
<directory>src/main/webapp/WEB-INF/</directory>
145+
<targetPath>WEB-INF</targetPath>
146+
<filtering>true</filtering>
147+
</resource>
148+
</webResources>
149+
</configuration>
150+
</plugin>
151151

152-
<!-- Plugin para generar el JAR -->
153-
<plugin>
154-
<groupId>org.apache.maven.plugins</groupId>
155-
<artifactId>maven-jar-plugin</artifactId>
156-
<version>3.2.0</version>
157-
<executions>
158-
<execution>
159-
<id>make-a-jar</id>
160-
<phase>package</phase>
161-
<goals>
162-
<goal>jar</goal>
163-
</goals>
164-
<configuration>
165-
<classifier>${project.version}</classifier>
166-
<finalName>${project.artifactId}</finalName>
167-
</configuration>
168-
</execution>
169-
</executions>
170-
</plugin>
152+
<!-- Plugin to generate the JAR -->
153+
<plugin>
154+
<groupId>org.apache.maven.plugins</groupId>
155+
<artifactId>maven-jar-plugin</artifactId>
156+
<version>3.2.0</version>
157+
<executions>
158+
<execution>
159+
<id>make-a-jar</id>
160+
<phase>package</phase>
161+
<goals>
162+
<goal>jar</goal>
163+
</goals>
164+
<configuration>
165+
<classifier>${project.version}</classifier>
166+
<finalName>${project.artifactId}</finalName>
167+
</configuration>
168+
</execution>
169+
</executions>
170+
</plugin>
171171

172-
<!-- Plugin para instalar el JAR -->
173-
<plugin>
174-
<groupId>org.apache.maven.plugins</groupId>
175-
<artifactId>maven-install-plugin</artifactId>
176-
<version>3.1.1</version>
177-
<executions>
178-
<execution>
179-
<id>install-jar</id>
180-
<phase>install</phase>
181-
<goals>
182-
<goal>install-file</goal>
183-
</goals>
184-
<configuration>
185-
<packaging>jar</packaging>
186-
<groupId>${project.groupId}</groupId>
187-
<artifactId>${project.artifactId}</artifactId>
188-
<version>${project.version}</version>
189-
<file>
190-
${project.build.directory}/${project.artifactId}-${project.version}.jar
191-
</file>
192-
</configuration>
193-
</execution>
194-
</executions>
195-
</plugin>
172+
<!-- Plugin to install the JAR -->
173+
<plugin>
174+
<groupId>org.apache.maven.plugins</groupId>
175+
<artifactId>maven-install-plugin</artifactId>
176+
<version>3.1.1</version>
177+
<executions>
178+
<execution>
179+
<id>install-jar</id>
180+
<phase>install</phase>
181+
<goals>
182+
<goal>install-file</goal>
183+
</goals>
184+
<configuration>
185+
<packaging>jar</packaging>
186+
<groupId>${project.groupId}</groupId>
187+
<artifactId>${project.artifactId}</artifactId>
188+
<version>${project.version}</version>
189+
<file>
190+
${project.build.directory}/${project.artifactId}-${project.version}.jar
191+
</file>
192+
</configuration>
193+
</execution>
194+
</executions>
195+
</plugin>
196196
</plugins>
197197
</build>
198-
199198
</project>

0 commit comments

Comments
 (0)