Skip to content

Commit

Permalink
Revert "gh-page?"
Browse files Browse the repository at this point in the history
This reverts commit 0c618e8.
  • Loading branch information
cdonnelly1992 committed Nov 16, 2022
1 parent 0c618e8 commit 7107966
Show file tree
Hide file tree
Showing 68 changed files with 2,454 additions and 24 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.class
.classpath
.project
.settings
target/
*/*.iml
*.iml
*.releaseBackup
release.properties
17 changes: 0 additions & 17 deletions .project

This file was deleted.

2 changes: 0 additions & 2 deletions .settings/org.eclipse.core.resources.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.m2e.core.prefs

This file was deleted.

58 changes: 58 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# m2eclipse-ajdt
M2E Configurer for AJDT

This plugin provides support for Eclipse build procedure in maven projects that use `aspectj:compile`.
Without this plugin you may see warnings such as "`Plugin execution not covered by lifecycle configuration: org.codehaus.mojo:aspectj-maven-plugin ...`"

This plugin supports multiple different forked versions of `aspectj-maven-plugin`. Following `groupId` values for this plugin are recognized:
* `dev.aspectj`
* `com.nickwongdev`
* `org.codehaus.mojo`
* `com.github.m50d`
* `se.haleby.aspectj`
* `io.starter`

I need this plugin for work stuff and plan to maintain its compatiblity with Eclipse (mostly packaging related updates). Any updates for this plugin are expected to happen when somehing breaks my use-case. I welcome any patches and pull requests.

If you find this plugin useful, you are free to use and distribute it according to the original license.

## Build
Use Java version 11 to build this plugin (if you use other version, build will fail because MANIFEST.MF has required version set to JavaSE-11)
```sh
mvn clean package
# or use specific java installation
JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 mvn clean package
```
This build produces Eclipse update site to folder `org.maven.ide.eclipse.ajdt.site/target/site`. You can simply copy everything in that directory and host it with
any http server you want and then install the artifacts from that site with Eclipse.

## Tests
Execute integration tests with following command.
```sh
mvn clean integration-test
```
Integration test will launch eclipse instance and this process takes a while but should complete successfully.

## Release process
Create new release by executing:
```sh
# Prepare release
mvn release:prepare -DreleaseVersion=0.14.5 -Dtag=m2eclipse-ajdt-0.14.5 -DdevelopmentVersion=0.14.6-SNAPSHOT

# Perform release
mvn release:perform -Dgoals="clean install"
```

`release:perform` does not work yet (unresolved javadoc issues).

## Installation
You can install this m2e connector to eclipse by selecting Help -> Install new software... -> Add

Eclipse update site URLs:

| Eclipse version | Update site URL |
| --------------- | ---------------- |
| 2019-06 | https://repo.t5.fi/public/eclipse/m2eclipse-ajdt/eclipse-2019-06/ |
| 2020-12 | https://repo.t5.fi/public/eclipse/m2eclipse-ajdt/eclipse-2020-12/ |

These update sites are provided on best-effort basis but availability is generally good.
Binary file removed artifacts.jar
Binary file not shown.
26 changes: 26 additions & 0 deletions catalog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<catalog>
<catalogItems>
<catalogItem>
<categoryId>org.eclipse.m2e.discovery.category.lifecycles</categoryId>
<description>AspectJ m2e configurator</description>
<groupId>lifecycles</groupId>
<id>org.maven.ide.eclipse.ajdt</id>
<kind>lifecycles</kind>
<license>EPL</license>
<name>AspectJ</name>
<provider>SpringSource</provider>
<p2>
<repositoryUrl>http://dist.springsource.org/release/AJDT/composite/</repositoryUrl>
<iuId>org.maven.ide.eclipse.ajdt.feature.feature.group</iuId>
<iuVersion>0.13.0.201107281640</iuVersion>
<lifecycleMappingIU>
<iuId>org.maven.ide.eclipse.ajdt</iuId>
</lifecycleMappingIU>
</p2>
<overview>
<summary>Maven Integration for AspectJ Development Tools</summary>
<url>http://eclipse.org/ajdt</url>
</overview>
</catalogItem>
</catalogItems>
</catalog>
Binary file removed content.jar
Binary file not shown.
Binary file not shown.
1 change: 1 addition & 0 deletions org.maven.ide.eclipse.ajdt.feature/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
8 changes: 8 additions & 0 deletions org.maven.ide.eclipse.ajdt.feature/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
bin.includes = feature.xml,\
feature.properties,\
license.html
src.includes = feature.properties,\
feature.xml,\
license.html,\
build.properties,\
category.xml
17 changes: 17 additions & 0 deletions org.maven.ide.eclipse.ajdt.feature/category.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<description>
Maven Integration for AJDT
</description>
<feature url="features/org.maven.ide.eclipse.ajdt.feature_0.14.0.qualifier.jar" id="org.maven.ide.eclipse.ajdt.feature" version="0.14.0.qualifier">
<category name="m2eclipse-ajdt"/>
</feature>
<feature url="features/org.maven.ide.eclipse.ajdt.feature.source_0.14.0.qualifier.jar" id="org.maven.ide.eclipse.ajdt.feature.source" version="0.14.0.qualifier">
<category name="m2eclipse-ajdt"/>
</feature>
<category-def name="m2eclipse-ajdt" label="Maven Integration for Eclipse AJDT Integration">
<description>
Optional Maven (M2Eclipse) integration for AJDT.
</description>
</category-def>
</site>
71 changes: 71 additions & 0 deletions org.maven.ide.eclipse.ajdt.feature/dev.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#
#Thu Jul 28 16:18:19 PDT 2011
com.springsource.sts.core=bin
org.codehaus.groovy.eclipse.ui=bin
org.codehaus.groovy.m2eclipse=bin
com.springsource.sts.roo.ui=bin
org.codehaus.groovy.eclipse.refactoring=bin
org.codehaus.groovy.eclipse.quickfix.test=bin
com.springsource.sts.grails.explorer=bin
com.springsource.sts.grails.test=bin
org.eclipse.ajdt.examples=bin
org.eclipse.jdt.groovy.core.tests.builder=bin
org.eclipse.ajdt.core=bin
All_Plugins=bin
org.eclipse.jdt.groovy.core.tests.compiler=bin
org.eclipse.jdt.groovy.core=bin
com.springsource.sts.groovy.debug.tests=bin
com.springsource.sts.grails.junit=bin
org.eclipse.ajdt.mylyn.ui.tests=bin
org.codehaus.groovy.eclipse.core.test=bin
org.codehaus.groovy.eclipse.codebrowsing.test=bin
org.eclipse.jdt.core=bin
org.codehaus.groovy.eclipse.tests=bin
com.springsource.sts.ide.configurator=bin
com.springsource.sts.grails.ui=bin
org.codehaus.groovy.eclipse.dsl.tests=bin
com.springsource.sts.grails.runonserver=bin
@ignoredot@=true
org.codehaus.groovy.eclipse.codeassist.completion=bin
org.codehaus.groovy.eclipse.codebrowsing=bin
com.springsource.sts.tests.util=bin
com.springsource.sts.groovy.debug.ui=bin
org.eclipse.ajdt.mylyn.ui=bin
org.eclipse.ajdt.core.tests=bin
com.springsource.sts.groovy.debug.core=bin
org.codehaus.groovy.eclipse.core=bin
org.codehaus.groovy.eclipse.quickfix=bin
org.eclipse.contribution.weaving.jdt.tests=bin
org.eclipse.contribution.xref.ui.tests=bin
com.springsource.sts.grails.core=bin
org.codehaus.groovy.eclipse.astviews=bin
org.codehaus.groovy.frameworkadapter=bin
org.maven.ide.eclipse.ajdt.tests=target/classes
com.springsource.sts.roo.core=bin
org.eclipse.contribution.xref.core.tests=bin
org.codehaus.groovy.eclipse.codeassist.completion.test=bin
com.springsource.sts.maven=bin
org.eclipse.contribution.xref.core=bin
org.codehaus.groovy.eclipse.ant=bin
org.eclipse.ajdt.ui.visual.tests=bin
org.codehaus.groovy.eclipse.junit.test=bin
org.eclipse.ajdt.ui=bin
com.springsource.sts.frameworks.test.util=bin
org.eclipse.osgi=org.eclipse.osgi_3.7.0.v20110124-0830.jar
com.springsource.sts.grails.test.util=bin
org.codehaus.groovy.eclipse.dsl=bin
com.springsource.sts.grails.editor.groovy=bin
org.codehaus.groovy.alltests=bin
org.eclipse.contribution.weaving.jdt=bin
com.springsource.sts.frameworks.ui=bin
org.codehaus.groovy.eclipse.refactoring.test=bin
org.codehaus.groovy=bin,bin-trace
com.springsource.sts.grails.editor.gsp=bin
org.eclipse.equinox.weaving.hook=bin
org.eclipse.contribution.visualiser=bin
org.eclipse.contribution.xref.ui=bin
org.eclipse.contribution.visualiser.tests=bin
org.eclipse.ajdt.ui.tests=bin
org.maven.ide.eclipse.ajdt=target/classes
com.springsource.sts.grails.refactoring=bin
com.springsource.sts.frameworks.core=bin
120 changes: 120 additions & 0 deletions org.maven.ide.eclipse.ajdt.feature/feature.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
###############################################################################
# Copyright (c) 2000, 2009 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
featureName=Maven Integration for AJDT (Optional)

providerName=Sonatype, Inc.

description=Maven project configuration for Eclipse AJDT
descriptionURL=http://m2eclipse.sonatype.org

licenseURL=license.html

license=\
ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
March 17, 2005\n\
\n\
Usage Of Content\n\
\n\
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
\n\
Applicable Licenses\n\
\n\
Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
is provided to you under the terms and conditions of the Eclipse Public\n\
License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
For purposes of the EPL, "Program" will mean the Content.\n\
\n\
Content includes, but is not limited to, source code, object code,\n\
documentation and other files maintained in the Eclipse.org CVS\n\
repository ("Repository") in CVS modules ("Modules") and made available\n\
as downloadable archives ("Downloads").\n\
\n\
- Content may be structured and packaged into modules to facilitate delivering,\n\
extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
plug-in fragments ("Fragments"), and features ("Features").\n\
- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
in a directory named "plugins".\n\
- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
Each Feature may be packaged as a sub-directory in a directory named "features".\n\
Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- Features may also include other Features ("Included Features"). Within a Feature, files\n\
named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
\n\
Features may also include other Features ("Included Features"). Files named\n\
"feature.xml" may contain a list of the names and version numbers of\n\
Included Features.\n\
\n\
The terms and conditions governing Plug-ins and Fragments should be\n\
contained in files named "about.html" ("Abouts"). The terms and\n\
conditions governing Features and Included Features should be contained\n\
in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
Licenses may be located in any directory of a Download or Module\n\
including, but not limited to the following locations:\n\
\n\
- The top-level (root) directory\n\
- Plug-in and Fragment directories\n\
- Inside Plug-ins and Fragments packaged as JARs\n\
- Sub-directories of the directory named "src" of certain Plug-ins\n\
- Feature directories\n\
\n\
Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
Eclipse Update Manager, you must agree to a license ("Feature Update\n\
License") during the installation process. If the Feature contains\n\
Included Features, the Feature Update License should either provide you\n\
with the terms and conditions governing the Included Features or inform\n\
you where you can locate them. Feature Update Licenses may be found in\n\
the "license" property of files named "feature.properties". Such Abouts,\n\
Feature Licenses and Feature Update Licenses contain the terms and\n\
conditions (or references to such terms and conditions) that govern your\n\
use of the associated Content in that directory.\n\
\n\
THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
govern that particular Content.\n\
\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are\n\
currently may have restrictions on the import, possession, and use,\n\
and/or re-export to another country, of encryption software. BEFORE\n\
using any encryption software, please check the country's laws,\n\
regulations and policies concerning the import, possession, or use,\n\
and re-export of encryption software, to see if this is permitted.\n\
\n\
Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
########### end of license property ##########################################

copyright=Copyright (c) 2008 Sonatype, Inc.
copyrightUrl=http://sonatype.com/
42 changes: 42 additions & 0 deletions org.maven.ide.eclipse.ajdt.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.maven.ide.eclipse.ajdt.feature"
label="%featureName"
version="0.14.5.qualifier"
provider-name="%providerName">

<description url="%descriptionURL">
%description
</description>

<copyright url="%copyrightURL">
%copyright
</copyright>

<license url="%licenseURL">
%license
</license>

<requires>
<import plugin="org.eclipse.ajdt.core" version="1.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.m2e.core" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.m2e.maven.runtime" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.m2e.jdt" version="1.0.0" match="greaterOrEqual"/>
<import feature="org.eclipse.ajdt" version="1.5" match="greaterOrEqual"/>
<import feature="org.eclipse.jdt" version="3.3" match="greaterOrEqual"/>
<import feature="org.eclipse.platform" version="3.3" match="greaterOrEqual"/>
<import feature="org.eclipse.rcp" version="3.3" match="greaterOrEqual"/>
<import feature="org.eclipse.m2e.feature" version="0.14.0" match="greaterOrEqual"/>
</requires>

<plugin
id="org.maven.ide.eclipse.ajdt"
download-size="0"
install-size="0"
version="0.14.5.qualifier"
unpack="false"/>

</feature>
Loading

0 comments on commit 7107966

Please sign in to comment.