<modelVersion>4.0.0</modelVersion>
<groupId>org.argeo.commons</groupId>
<artifactId>argeo-commons</artifactId>
- <version>2.1.82-SNAPSHOT</version>
+ <version>2.1.86-SNAPSHOT</version>
<name>Argeo Commons</name>
<packaging>pom</packaging>
<!-- <url>http://repo.argeo.org/data/docs/argeo-2.1/site/argeo-commons/</url> -->
<properties>
- <version.argeo-commons>2.1.82-SNAPSHOT</version.argeo-commons>
- <version.argeo-tp>2.1.25</version.argeo-tp>
+ <version.argeo-commons>2.1.86-SNAPSHOT</version.argeo-commons>
+ <version.argeo-tp>2.1.27</version.argeo-tp>
<!-- RPM -->
<argeo.rpm.release>7</argeo.rpm.release>
<argeo.rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2/el7</argeo.rpm.stagingRepository>
<!-- Encoding, see http://is.gd/mvn_source_encoding -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- Timestamp -->
+ <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
<project.scm.id>code.argeo.org</project.scm.id>
</properties>
<modules>
<!-- Third Parties Extensions -->
<module>org.argeo.ext.jackrabbit</module>
<module>org.argeo.ext.equinox.jetty</module>
- <!-- Legacy -->
- <module>legacy</module>
<!-- Distribution -->
<module>maven</module>
<module>dep</module>
<module>demo</module>
<module>doc</module>
<module>dist</module>
- <module>rcp</module>
</modules>
<scm>
<connection>scm:git:http://git.argeo.org/apache2/argeo-commons.git</connection>
<excludes>
<exclude>.*</exclude>
<exclude>.*/**</exclude>
+ <!-- MANIFEST is set explicitly in the jar plugin configuration. We
+ don't copy it in order to avoid side-effects with BND -->
+ <exclude>META-INF/MANIFEST.MF</exclude>
<exclude>src/**</exclude>
<exclude>ext/**</exclude>
<exclude>target/**</exclude>
<!-- Maven -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
+ <version>3.8.1</version>
<configuration>
- <source>1.8</source>
+ <source>11</source>
<target>1.8</target>
<compilerId>eclipse</compilerId>
- <!-- Required for compliance level, see http://jira.codehaus.org/browse/PLXCOMP-231 -->
- <optimize>true</optimize>
<!-- Hack to work around issues with generated annotations : -->
<generatedSourcesDirectory>target/classes</generatedSourcesDirectory>
<generatedTestSourcesDirectory>target/test-classes</generatedTestSourcesDirectory>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.6</version>
+ <version>2.8.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>ecj</artifactId>
+ <version>3.19.0</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
- <configuration>
- <filesets>
- <fileset>
- <directory>META-INF</directory>
- <includes>
- <include>MANIFEST.MF</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<manifestLocation>META-INF</manifestLocation>
+ <niceManifest>true</niceManifest>
+ <noWarningProjectTypes>
+ <noWarningProjectType>pom</noWarningProjectType>
+ </noWarningProjectTypes>
<instructions>
<_include>bnd.bnd</_include>
- <Bundle-Version>${project.version}-r${tstamp}</Bundle-Version>
+ <Bundle-Version>${project.version}-r${maven.build.timestamp}</Bundle-Version>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-RequiredExecutionEnvironment>JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
+ <Bundle-RequiredExecutionEnvironment>JavaSE-11,JavaSE-1.8</Bundle-RequiredExecutionEnvironment>
<_removeheaders>Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By</_removeheaders>
<Automatic-Module-Name>${project.artifactId}</Automatic-Module-Name>
<SLC-Category>${project.groupId}</SLC-Category>
- <!-- Git metadata -->
- <!-- <SLC-Git-Commit-Id>${git.commit.id}</SLC-Git-Commit-Id> -->
- <!-- <SLC-Git-Commit-Describe>${git.commit.id.describe}</SLC-Git-Commit-Describe> -->
- <!-- <SLC-Git-Commit-Count>${git.closest.tag.commit.count}</SLC-Git-Commit-Count> -->
+ <SLC-Build-Timestamp>${maven.build.timestamp}</SLC-Build-Timestamp>
</instructions>
</configuration>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<!-- Codehaus -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rpm-maven-plugin</artifactId>
- <version>2.1.4</version>
+ <version>2.2.0</version>
<extensions>true</extensions>
<configuration>
<version>${project.version}</version>
</plugins>
</pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>META-INF</directory>
- <includes>
- <include>MANIFEST.MF</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <!-- <plugin> -->
- <!-- <groupId>pl.project13.maven</groupId> -->
- <!-- <artifactId>git-commit-id-plugin</artifactId> -->
- <!-- <executions> -->
- <!-- <execution> -->
- <!-- <id>get-the-git-infos</id> -->
- <!-- <goals> -->
- <!-- <goal>revision</goal> -->
- <!-- </goals> -->
- <!-- <phase>initialize</phase> -->
- <!-- </execution> -->
- <!-- </executions> -->
- <!-- </plugin> -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
</execution>
</executions>
</plugin>
+ <!-- MANIFEST generation by BND -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- Releases -->
<plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<goals>deploy</goals>
- <releaseProfiles>rpmbuild,rpmbuild-tp</releaseProfiles>
+ <releaseProfiles>rpmbuild</releaseProfiles>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
</plugins>
</build>
<dependencies>
<url>http://repo.argeo.org/data/java/argeo-2.1/</url>
<releases>
<enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
+ <updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
</snapshots>
</repository>
<repository>
<id>argeo-snapshots</id>
- <url>file:///srv/javafactory/argeo-2.1</url>
+ <url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
<releases>
<enabled>false</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
+ <updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</snapshots>
</repository>
<url>http://repo.argeo.org/data/java/argeo-2.1</url>
<releases>
<enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
+ <updatePolicy>never</updatePolicy>
<checksumPolicy>warn</checksumPolicy>
</releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>argeo-maven-plugins-snapshots</id>
+ <url>http://snapshots.argeo.org/data/java/argeo-2.1/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
</pluginRepository>
</pluginRepositories>
<distributionManagement>