Skip to content

Commit 48ac3c8

Browse files
arteymixarteymix
committed
Merge branch 'hotfix-1.1.10'
2 parents 7c445cb + e3618ea commit 48ac3c8

File tree

1 file changed

+83
-54
lines changed

1 file changed

+83
-54
lines changed

‎pom.xml‎

Lines changed: 83 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<name>baseCode</name>
66
<groupId>baseCode</groupId>
77
<artifactId>baseCode</artifactId>
8-
<version>1.1.9</version>
8+
<version>1.1.10</version>
99
<inceptionYear>2003</inceptionYear>
1010
<description>
1111
<![CDATA[Data structures, math and statistics tools, and utilities that are often needed across projects.]]>
@@ -290,6 +290,13 @@
290290
<filtering>false</filtering>
291291
</testResource>
292292
</testResources>
293+
<extensions>
294+
<extension>
295+
<groupId>org.apache.maven.wagon</groupId>
296+
<artifactId>wagon-ssh-external</artifactId>
297+
<version>3.5.2</version>
298+
</extension>
299+
</extensions>
293300
<plugins>
294301
<plugin>
295302
<groupId>org.apache.maven.plugins</groupId>
@@ -342,6 +349,31 @@
342349
<target>1.8</target>
343350
</configuration>
344351
</plugin>
352+
<plugin>
353+
<groupId>org.apache.maven.plugins</groupId>
354+
<artifactId>maven-clean-plugin</artifactId>
355+
<version>3.1.0</version>
356+
</plugin>
357+
<plugin>
358+
<groupId>org.apache.maven.plugins</groupId>
359+
<artifactId>maven-deploy-plugin</artifactId>
360+
<version>2.8.2</version>
361+
</plugin>
362+
<plugin>
363+
<groupId>org.apache.maven.plugins</groupId>
364+
<artifactId>maven-install-plugin</artifactId>
365+
<version>2.5.2</version>
366+
</plugin>
367+
<plugin>
368+
<groupId>org.apache.maven.plugins</groupId>
369+
<artifactId>maven-jar-plugin</artifactId>
370+
<version>3.2.0</version>
371+
</plugin>
372+
<plugin>
373+
<groupId>org.apache.maven.plugins</groupId>
374+
<artifactId>maven-resources-plugin</artifactId>
375+
<version>3.1.0</version>
376+
</plugin>
345377
<plugin>
346378
<artifactId>maven-surefire-plugin</artifactId>
347379
<version>2.22.2</version>
@@ -381,6 +413,16 @@
381413
<check/>
382414
</configuration>
383415
</plugin>
416+
<plugin>
417+
<groupId>org.apache.maven.plugins</groupId>
418+
<artifactId>maven-javadoc-plugin</artifactId>
419+
<version>3.3.2</version>
420+
<configuration>
421+
<quiet>true</quiet>
422+
<source>8</source>
423+
<doclint>none</doclint>
424+
</configuration>
425+
</plugin>
384426
</plugins>
385427
</build>
386428
<reporting>
@@ -407,7 +449,7 @@
407449
<plugin>
408450
<groupId>org.apache.maven.plugins</groupId>
409451
<artifactId>maven-javadoc-plugin</artifactId>
410-
<version>3.3.1</version>
452+
<version>3.3.2</version>
411453
<configuration>
412454
<quiet>true</quiet>
413455
<source>8</source>
@@ -429,7 +471,7 @@
429471
<plugin>
430472
<groupId>org.apache.maven.plugins</groupId>
431473
<artifactId>maven-jxr-plugin</artifactId>
432-
<version>3.1.1</version>
474+
<version>3.0.0</version>
433475
</plugin>
434476
<plugin>
435477
<groupId>org.codehaus.mojo</groupId>
@@ -472,17 +514,20 @@
472514
<id>pavlab</id>
473515
<name>PavLab</name>
474516
<url>https://maven2.pavlab.msl.ubc.ca/</url>
475-
<layout>default</layout>
476-
<snapshots>
477-
<enabled>true</enabled>
478-
<updatePolicy>daily</updatePolicy>
479-
</snapshots>
480-
<releases>
481-
<enabled>true</enabled>
482-
<updatePolicy>never</updatePolicy>
483-
</releases>
484517
</repository>
485518
</repositories>
519+
<distributionManagement>
520+
<repository>
521+
<id>pavlab</id>
522+
<name>PavLab</name>
523+
<url>scpexe://frink.msl.ubc.ca/space/maven2</url>
524+
</repository>
525+
<site>
526+
<id>pavlab</id>
527+
<name>PavLab</name>
528+
<url>scpexe://frink.msl.ubc.ca/space/web/maven-sites/${project.groupId}/${project.artifactId}-${project.version}</url>
529+
</site>
530+
</distributionManagement>
486531
<pluginRepositories>
487532
<pluginRepository>
488533
<id>pavlab</id>
@@ -501,59 +546,43 @@
501546
</pluginRepositories>
502547
<profiles>
503548
<profile>
504-
<id>assemble-src</id>
505-
<activation>
506-
<activeByDefault>false</activeByDefault>
507-
<property>
508-
<name>assemble-src</name>
509-
</property>
510-
</activation>
549+
<id>release</id>
511550
<build>
512551
<plugins>
513552
<plugin>
514553
<groupId>org.apache.maven.plugins</groupId>
515-
<artifactId>maven-assembly-plugin</artifactId>
516-
<configuration>
517-
<descriptors>
518-
<descriptor>
519-
src/assembly/src-assembly.xml
520-
</descriptor>
521-
</descriptors>
522-
</configuration>
554+
<artifactId>maven-source-plugin</artifactId>
555+
<version>3.2.1</version>
556+
<executions>
557+
<execution>
558+
<id>attach-sources</id>
559+
<goals>
560+
<goal>jar-no-fork</goal>
561+
</goals>
562+
</execution>
563+
</executions>
564+
</plugin>
565+
<plugin>
566+
<groupId>org.apache.maven.plugins</groupId>
567+
<artifactId>maven-javadoc-plugin</artifactId>
568+
<version>3.3.2</version>
569+
<executions>
570+
<execution>
571+
<id>attach-javadocs</id>
572+
<goals>
573+
<goal>jar</goal>
574+
</goals>
575+
</execution>
576+
</executions>
523577
</plugin>
524578
</plugins>
525579
</build>
526580
</profile>
527-
<profile>
528-
<!-- For deployment where host is local (and ssh isn't available for builder, e.g. CI) -->
529-
<id>local-deploy</id>
530-
<activation>
531-
<activeByDefault>false</activeByDefault>
532-
<property>
533-
<name>deploy.local</name>
534-
</property>
535-
</activation>
536-
<distributionManagement>
537-
<site>
538-
<id>localDeploy</id>
539-
<name>localDeploy</name>
540-
<url>file:///space/gemmaData/baseCode-site</url>
541-
</site>
542-
<repository>
543-
<id>repo</id>
544-
<name>Pavlab</name>
545-
<url>file:///space/maven2</url>
546-
</repository>
547-
<snapshotRepository>
548-
<id>repo</id>
549-
<name>Pavlab</name>
550-
<url>file:///space/maven2</url>
551-
</snapshotRepository>
552-
</distributionManagement>
553-
</profile>
554581
</profiles>
555582
<properties>
556583
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
584+
<maven.compiler.source>8</maven.compiler.source>
585+
<maven.compiler.target>8</maven.compiler.target>
557586
<lucene.version>3.6.2</lucene.version>
558587
</properties>
559588
</project>

0 commit comments

Comments
 (0)