mirrors
/
org.aspectj
mirror of https://github.com/eclipse/org.aspectj.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 138 Wiki Activity
Browse Source

POM cosmetics, e.g. plugin version management 

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
tags/V1_9_7_M2
Alexander Kriegisch 3 years ago
parent
060bf4c3c6
commit
1ed026071e
5 changed files with 92 additions and 40 deletions
Split View Show Diff Stats
  1. 1
    2
      bridge/pom.xml
  2. 3
    7
      build/pom.xml
  3. 80
    30
      pom.xml
  4. 1
    1
      run-all-junit-tests/pom.xml
  5. 7
    0
      tests/pom.xml

+ 1
- 2
bridge/pom.xml View File

@@ -26,7 +26,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<executions>
<execution>
<id>build.time</id>
@@ -34,11 +33,11 @@
<goal>timestamp-property</goal>
</goals>
<configuration>
<!-- Timestamp format: Thursday Apr 8, 2021 at 20:04:07 PDT -->
<name>version.time_text</name>
<pattern>EEEE MMM d, yyyy 'at' HH:mm:ss z</pattern>
<timeZone>America/Los_Angeles</timeZone>
<locale>en_US</locale>
<!-- build.time: Monday Feb 4, 2019 at 23:50:25 GMT -->
</configuration>
</execution>
</executions>

+ 3
- 7
build/pom.xml View File

@@ -33,7 +33,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<executions>
<execution>
<id>build.date</id>
@@ -41,11 +40,11 @@
<goal>timestamp-property</goal>
</goals>
<configuration>
<!-- Timestamp format: Thu Apr 8, 2021 -->
<name>build.date</name>
<pattern>E MMM d, YYYY</pattern>
<timeZone>America/Los_Angeles</timeZone>
<locale>en_US</locale>
<!-- build.date: Monday Feb 4, 2019 -->
</configuration>
</execution>
<execution>
@@ -54,14 +53,11 @@
<goal>timestamp-property</goal>
</goals>
<configuration>
<!-- Timestamp format: Thursday Apr 8, 2021 at 20:20:16 PDT -->
<name>build.time</name>
<!--
<pattern>E MMM d, YYYY 'at' HH:MM:SS z</pattern>
-->
<pattern>EEEE MMM d, yyyy 'at' HH:mm:ss z</pattern>
<timeZone>America/Los_Angeles</timeZone>
<locale>en_US</locale>
<!-- build.time: Monday Feb 4, 2019 at 23:50:25 GMT -->
</configuration>
</execution>
<execution>
@@ -70,11 +66,11 @@
<goal>timestamp-property</goal>
</goals>
<configuration>
<!-- Timestamp format: 2021 -->
<name>build.year</name>
<pattern>YYYY</pattern>
<timeZone>America/Los_Angeles</timeZone>
<locale>en_US</locale>
<!-- year: 2019 -->
</configuration>
</execution>
</executions>

+ 80
- 30
pom.xml View File

@@ -13,6 +13,7 @@
<properties>
<revision>1.9.7.BUILD-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<jdt.core.version>3.25.0-SNAPSHOT</jdt.core.version>
<lib.ant.version>1.6.3</lib.ant.version>
<lib.ant.xerces.version>2.6.2</lib.ant.xerces.version>
@@ -57,7 +58,6 @@
<module>bcel-builder</module>
<module>weaver</module>
<module>loadtime</module>
<module>org.eclipse.jdt.core</module>
<module>org.aspectj.ajdt.core</module>
<module>ajde.core</module>
<module>ajde</module>
@@ -143,6 +143,69 @@
<artifactId>maven-help-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-sources</id>
<phase>package</phase>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
<executions>
<execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<!-- TODO: upgrade after https://issues.apache.org/jira/browse/MSHADE-366 is fixed -->
<version>3.2.4</version>
<configuration>
<createSourcesJar>true</createSourcesJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<shadedArtifactAttached>false</shadedArtifactAttached>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
</plugins>
</pluginManagement>

@@ -150,25 +213,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<archive>
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
<executions>
<execution>
<id>test-jar</id>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<filesets>
<fileset>
@@ -176,26 +224,28 @@
<includes>
<include>**/ajcore.*.txt</include>
</includes>
<!--
<excludes>
<exclude>**/important.log</exclude>
<exclude>**/another-important.log</exclude>
</excludes>
-->
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>aj-build</directory>
<!--
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>.</directory>
<includes>
<include>**/*.tmp</include>
<include>**/*.log</include>
<include>**/ajcore.*.txt</include>
</includes>
<excludes>
<exclude>**/important.log</exclude>
<exclude>**/another-important.log</exclude>
</excludes>
-->
<followSymlinks>false</followSymlinks>
</fileset>
<fileset>
<directory>aj-build</directory>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>

+ 1
- 1
run-all-junit-tests/pom.xml View File

@@ -239,7 +239,7 @@
<artifactId>ant</artifactId>
<version>${lib.ant.version}</version>
</dependency>
<dependency>
<dependency>
<groupId>jrockit</groupId>
<artifactId>jrockit</artifactId>
<version>1.0</version>

+ 7
- 0
tests/pom.xml View File

@@ -120,6 +120,13 @@
<scope>system</scope>
<systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
</dependency>
-->
<!--
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${lib.commons.digester.version}</version>
</dependency>
-->
</dependencies>


Write Preview
Loading…
Cancel
Save