Skip to content

I
imagej-elphel
Commit 643febaa authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Merge branch 'lwir16' of git@git.elphel.com:Elphel/imagej-elphel.git into lwir16

parents 155415d8 51dc6228
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 40 deletions
pom.xml
View file @ 643febaa
...@@ -139,7 +139,20 @@ ...@@ -139,7 +139,20 @@
<artifactId>commons-math3</artifactId> <artifactId>commons-math3</artifactId>
<version>3.6.1</version> <version>3.6.1</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.apache.ant/ant -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.10.10</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.ant/ant-launcher -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId>
<version>1.10.10</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -173,45 +186,12 @@ ...@@ -173,45 +186,12 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>1.0.0</version> <version>3.8.1</version>
<configuration> <configuration>
<lifecycleMappingMetadata> <source>1.8</source>
<pluginExecutions> <target>1.8</target>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>aspectj-maven-plugin</artifactId>
<versionRange>[1.0,)</versionRange>
<goals>
<goal>test-compile</goal>
<goal>compile</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-plugin-plugin
</artifactId>
<versionRange>[3.3,)</versionRange>
<goals>
<goal>descriptor</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration> </configuration>
</plugin> </plugin>
...@@ -298,7 +278,6 @@ ...@@ -298,7 +278,6 @@
<url>https://git.elphel.com/Elphel/imagej-elphel</url> <url>https://git.elphel.com/Elphel/imagej-elphel</url>
</scm> </scm>
<packaging>maven-plugin</packaging>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment