Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added default values in parent pom for skip properties #90

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added default values in parent pom for skip properties #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34f13a4
Added default values in parent pom for maven.gpg.skip and maven.sourc…
cb4 Sep 12, 2021
bb9f1ba
Added default values in parent pom for maven.gpg.skip and maven.sourc…
cb4 Sep 12, 2021
4d917b1
Added default values in parent pom for maven.gpg.skip and maven.sourc…
cb4 Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ AspectJ is a maven project, as such it should import cleanly into your IDE. The
Simply run the maven project importer and point it at the root of the cloned AspectJ repository. This will import all of the AspectJ
modules.

Each module comes with its own testsuites however there is a module called `run-all-junit-tests` - within there is a file `RunTheseBeforeYouCommitTests` which you can launch as a JUnit test (rightclick -> RunAs -> Junit Test).
Each module comes with its own test suite, however there is a module called `run-all-junit-tests` - within there is a
file `RunTheseBeforeYouCommitTests` which you can launch as a JUnit test (rightclick -> RunAs -> Junit Test).
This will run a few thousand tests to verify your IDE import.

Some tests are conditional based on the JDK you are using in your IDE since they are exercising features only available in recent Java.
Expand All @@ -20,7 +21,12 @@ A JRE will likely not suffice because tools like javadoc will be invoked from th

#### IntelliJ

TODO
Create a new project on the welcome screen with the `Get from VCS` button or within the IDE from `File | New |
Project from version control…` IntelliJ will recognize AspectJ as a multi-module maven project and import it as such.
To build, create a run/debug configuration with the command line set to `clean install` and other settings as
appropriate. If you have multiple JDKs installed, on the `Runner` tab select the desired JDK for the build, set
`JAVA_HOME` to match, and uncheck `Skip Tests`. Before running the build, select the profile matching your JDK in
the maven pane (or put on the command line in your run/debug configuration with `-P`).


### Developing tests
Expand Down
15 changes: 4 additions & 11 deletions aspectjmatcher/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,9 @@
</scm>

<properties>
<!-- By default, do not deploy artifacts - but deploy this public one -->
<!-- Override defaults: always sign and deploy this required artifact -->
<maven.gpg.skip>false</maven.gpg.skip>
<maven.deploy.skip>false</maven.deploy.skip>
<!-- By default, do not sign artifacts - but sign this public one -->
<maven.gpg.skip>false</maven.gpg.skip>
</properties>

<build>
Expand Down Expand Up @@ -94,8 +93,6 @@
<Can-Redefine-Classes>true</Can-Redefine-Classes>
-->
</manifestEntries>


<manifestSections>
<manifestSection>
<name>org/aspectj/matcher/</name>
Expand Down Expand Up @@ -148,6 +145,7 @@
<configuration>
<!-- The assembly ID 'sources' becomes the artifact classifier, exactly what we want -->
<appendAssemblyId>true</appendAssemblyId>
<!-- False for release profile (see parent POM) -->
<skipAssembly>${maven.source.skip}</skipAssembly>
<archive>
</archive>
Expand All @@ -171,11 +169,6 @@
<goal>copy</goal>
</goals>
<configuration>
<!--
Skip, if javadoc generation is also meant to be skipped, which is the default unless the 'release'
profile is active or the property is overridden manually to be false. See property definitions in parent
POM for default case and release profile.
-->
<skip>${maven.javadoc.skip}</skip>
<verbose>true</verbose>
<fileset>
Expand Down Expand Up @@ -270,7 +263,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore>true</ignore>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
11 changes: 5 additions & 6 deletions aspectjrt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@
</scm>

<properties>
<!-- By default, do not deploy artifacts - but deploy this public one -->
<maven.deploy.skip>false</maven.deploy.skip>
<!-- By default, do not sign artifacts - but sign this public one -->
<maven.gpg.skip>false</maven.gpg.skip>
<!-- Override defaults: always sign and deploy this required artifact -->
<maven.gpg.skip>false</maven.gpg.skip>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>

<build>
Expand Down Expand Up @@ -235,8 +234,8 @@
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
</plugin>

</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
Expand All @@ -263,7 +262,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore>true</ignore>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
9 changes: 4 additions & 5 deletions aspectjtools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@
</scm>

<properties>
<!-- By default, do not deploy artifacts - but deploy this public one -->
<maven.deploy.skip>false</maven.deploy.skip>
<!-- By default, do not sign artifacts - but sign this public one -->
<maven.gpg.skip>false</maven.gpg.skip>
<!-- Override defaults: always sign and deploy this required artifact -->
<maven.gpg.skip>false</maven.gpg.skip>
<maven.deploy.skip>false</maven.deploy.skip>
</properties>

<build>
Expand Down Expand Up @@ -344,7 +343,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore>true</ignore>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
7 changes: 3 additions & 4 deletions aspectjweaver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,9 @@
</scm>

<properties>
<!-- By default, do not deploy artifacts - but deploy this public one -->
<!-- Override defaults: always sign and deploy this required artifact -->
<maven.gpg.skip>false</maven.gpg.skip>
<maven.deploy.skip>false</maven.deploy.skip>
<!-- By default, do not sign artifacts - but sign this public one -->
<maven.gpg.skip>false</maven.gpg.skip>
</properties>

<build>
Expand Down Expand Up @@ -344,7 +343,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
<ignore>true</ignore>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down
7 changes: 3 additions & 4 deletions installer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,9 @@
ones from aspectjtools, because the installer contains runtime, weaver and tools and the latter one is a
superset of the former two.
-->
<!-- By default, do not deploy artifacts - but deploy this public one -->
<!--<maven.deploy.skip>false</maven.deploy.skip>-->
<!-- By default, do not sign artifacts - but sign this public one -->
<!--<maven.gpg.skip>false</maven.gpg.skip>-->
<!-- Override defaults: always sign and deploy this public artifact -->
<!-- <maven.gpg.skip>false</maven.gpg.skip> -->
<!-- <maven.deploy.skip>false</maven.deploy.skip> -->
</properties>

<dependencies>
Expand Down
33 changes: 19 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>org.aspectj</groupId>
Expand All @@ -15,10 +16,13 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<!-- By default, do not deploy artifacts - override for the ones which actually should be deployed -->
<!-- By default, do not sign or deploy artifacts. Overridden where needed. -->
<maven.gpg.skip>true</maven.gpg.skip>
<maven.deploy.skip>true</maven.deploy.skip>
<!-- By default, do not create javadoc - override in release profile or manually -->

<!-- By default, do not create javadoc or include source. Overridden in release profile. -->
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.source.skip>true</maven.source.skip>

<!-- Dependency versions -->
<jdt.core.version>1.9.7.M2</jdt.core.version>
Expand Down Expand Up @@ -144,30 +148,30 @@
<module>run-all-junit-tests</module>
<module>docs</module>

<!-- create the important artifacts we care about -->
<!-- These required artifacts are published in Maven Central upon release -->
<module>aspectjrt</module>
<module>aspectjweaver</module>
<module>aspectjtools</module>
<module>aspectjmatcher</module>

<!-- build the java -jar'able installer -->
<!-- Build the java -jar'able installer. Not currently published (see installer pom) -->
<module>installer</module>
</modules>

<!--
Caveat: Automatic, JDK-based profile activation can *not* be inherited by child POMs defining
the same profiles. Thus, we have to repeat activation conditions there.
Caveat: Automatic, JDK-based profile activation can *not* be inherited by child POMs defining
the same profiles. Thus, we have to repeat activation conditions there.

Note: We can check if automatic profile activation works via mvn help:active-profiles.
-->
Note: We can check if automatic profile activation works via mvn help:active-profiles.
-->
<profiles>
<profile>
<id>jdk-8-to-15</id>
<activation>
<jdk>[1.8,16)</jdk>
</activation>
<properties>
<jvm.arg.addOpens/>
<jvm.arg.addOpens />
</properties>
</profile>
<profile>
Expand All @@ -189,6 +193,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<!-- FIXME Why getting 'plugin not found' error here? -->
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
Expand Down Expand Up @@ -332,7 +337,7 @@
<goal>sign</goal>
</goals>
<configuration>
<!-- Only sign artifacts which are also meant to be deployed -->
<!-- Only sign certain artifacts, typically those also meant to be deployed -->
<skip>${maven.gpg.skip}</skip>
</configuration>
</execution>
Expand Down Expand Up @@ -492,8 +497,8 @@

<dependencies>
<!--
Actually, it would be cleaner to only define JUnit only it modules which actually use it. But since this comprises
the majority, we can afford to be a little bit unclean here with regard to dependency management.
It would be cleaner to only define JUnit in modules which actually use it. But since this comprises the
majority, we can afford to be a little bit unclean here with regard to dependency management.
-->
<dependency>
<groupId>junit</groupId>
Expand Down