mirrors
/
org.aspectj
mirror da https://github.com/eclipse/org.aspectj.git
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Rilasci 139 Wiki Attività
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
8586 Commit
38 Rami (Branch)
Albero (Tree): 651e92a328
Rami (Branch) Tag
${ item.name }
Crea branch ${ searchTerm }
da '651e92a328'
${ noResults }
org.aspectj/aspectjtools/aspectjtools-assembly.xml

aspectjtools-assembly.xml 3.2KB
Originale Normal View Cronologia

Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
tidyup retired modules and add aspectjtools submodule
5 anni fa
Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
tidyup retired modules and add aspectjtools submodule
5 anni fa
​
Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
tidyup retired modules and add aspectjtools submodule
5 anni fa
​
​
​
​
​
Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
​
​
Prepare main artifacts to be deployed via Maven, step 1 This change affects the following modules: - aspectjmatcher - aspectjrt - aspectjtools - aspectjweaver - installer They have in common that they all use Maven Assembly Plugin in order to create some kind of uber JARs with constituent modules and/or libraries. Except for the installer, they are all available on Maven Central today, but I think it would not hurt to deploy the installer to there, too. Changes made: - Use Flatten Maven Plugin in order to create simple POMs with only basic information and - most importantly - without dependencies. - The new dependency-reduced POM (DRP) or "flattened POM" gets attached to the build, i.e. it will be installed and deployed as a replacement of the original POM. - Attaching the DRP only works for 'jar' type modules, which is why I changed the packaging type for each module from 'pom' to 'jar'. - Deactivate generation of the default JAR for each module. This is necessary now, since we have the 'jar' packaging type. - Make sure that assembly descriptors using 'dependencySet' entries have set option 'useProjectArtifact=false' in order to avoid warnings about the non-existing main artifact. TODO: - Explore option to migrate from Maven Assembly to Maven Shade, because it does not need descriptor files, can also generate source JARs and can automatically create and attach a DRP which is less fragmentary than the one created by Flatten Maven, basically the original JAR minus the dependencies. - If in the future we want to make sure to only deploy the modules listed above, e.g. to Maven Central, if simply calling 'mvn deploy' for the whole project, we could use 'maven.deploy.skip=true' in the parent POM and override it by 'maven.deploy.skip=false' just in the few modules which need to be deployed. See also: https://stackoverflow.com/a/29574812/1082681 Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
​
Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
​
Replace use of ASM-renamed by original ASM This involves replacing references in weaver application code as well as a few tests. In order to make AspectJ weaver + tools contain a relocated ASM version, I added a Maven Shade relocation step after Maven Assembly created the uber JARs. Relocation works for both binaries and sources and also encompasses Class::forName calls like in class AsmDetector. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
​
​
​
tidyup retired modules and add aspectjtools submodule
5 anni fa
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Use dependencies instead of copies under 'lib' for assemblies This is one step to get rid of org.aspectj:org.eclipse.jdt.core and org.aspectj:asm-renamed in the 'lib' directory. AspectJ tools + weaver uber JAR builds now use dependencies in the POM in order to deal with creating binary + source assemblies. They no longer rely on manually updated copies under 'lib'. Details: - Binaries are copied via 'dependencySets' in the assembly descriptor. - Sources are unzipped via Maven Dependency Plugin before including them into the source uber JAR via assembly descriptor. - NEW: This also includes ASM-renamed sources which so far were ignored. It is a positive side-effect from the fact that for ASM-renamed Maven Shade automatically creates a source JAR. - Maven Ant Run is no longer used for unzipping binary + source JARs. - While working in parallel with JDT Core and AspectJ it is now much easier to produce up to date artifacts, e.g. for consumption by AJDT, because it does not matter anymore if we forget to run the build in module 'lib' in order to update the JDT Core copy. Status quo: - Folder lib/asm is no longer used and will be removed in a subsequent commit. - Folder lib/jdtcore-aj is no longer used by the Maven build, but still referenced in a few UNIX shell scripts and Ant build files. TODO: Find out if those are still actively used. If yes, refactor them to look for the file in the local Mavven repository. Otherwise, delete the referencing files and also lib/jdtcore-aj. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
3 anni fa
tidyup retired modules and add aspectjtools submodule
5 anni fa
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124 
  1. <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"

  2. 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

  3. 	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">

  4. 

  5. 	<id>aspectjtools</id>

  6. 

  7. 	<formats>

  8. 		<format>jar</format>

  9. 	</formats>

  10. 

  11. 	<includeBaseDirectory>false</includeBaseDirectory>

  12. 

  13. 	<dependencySets>

  14. 		<dependencySet>

  15. 			<unpack>true</unpack>

  16. 			<!-- Avoid warning when trying to add non-existing main artifact JAR -->

  17. 			<useProjectArtifact>false</useProjectArtifact>

  18. 			<includes>

  19. 				<include>org.aspectj:org.eclipse.jdt.core</include>

  20. 				<include>org.ow2.asm:asm</include>

  21. 			</includes>

  22. 		</dependencySet>

  23. 	</dependencySets>

  24. 

  25. 	<fileSets>

  26. 		<!-- runtime -->

  27. 		<fileSet>

  28. 			<directory>../runtime/target/classes</directory>

  29. 			<outputDirectory>.</outputDirectory>

  30. 			<excludes>

  31. 				<exclude>META-INF/maven/**</exclude>

  32. 			</excludes>

  33. 		</fileSet>

  34. 

  35. 		<!-- weaver -->

  36. 		<fileSet>

  37. 			<directory>../weaver/target/classes</directory>

  38. 			<outputDirectory>.</outputDirectory>

  39. 			<excludes>

  40. 				<exclude>META-INF/maven/**</exclude>

  41. 			</excludes>

  42. 		</fileSet>

  43. 		<fileSet>

  44. 			<directory>../util/target/classes</directory>

  45. 			<outputDirectory>.</outputDirectory>

  46. 			<excludes>

  47. 				<exclude>META-INF/maven/**</exclude>

  48. 			</excludes>

  49. 		</fileSet>

  50. 		<fileSet>

  51. 			<directory>../bridge/target/classes</directory>

  52. 			<outputDirectory>.</outputDirectory>

  53. 			<excludes>

  54. 				<exclude>META-INF/maven/**</exclude>

  55. 			</excludes>

  56. 		</fileSet>

  57. 		<fileSet>

  58. 			<directory>../asm/target/classes</directory>

  59. 			<outputDirectory>.</outputDirectory>

  60. 			<excludes>

  61. 				<exclude>META-INF/maven/**</exclude>

  62. 			</excludes>

  63. 		</fileSet>

  64. 		<fileSet>

  65. 			<directory>../org.aspectj.matcher/target/classes</directory>

  66. 			<outputDirectory>.</outputDirectory>

  67. 			<excludes>

  68. 				<exclude>META-INF/maven/**</exclude>

  69. 			</excludes>

  70. 		</fileSet>

  71. 		<fileSet>

  72. 			<directory>../bcel-builder/target/classes</directory>

  73. 			<outputDirectory>.</outputDirectory>

  74. 			<excludes>

  75. 				<exclude>META-INF/maven/**</exclude>

  76. 			</excludes>

  77. 		</fileSet>

  78. 		<fileSet>

  79. 			<directory>../loadtime/target/classes</directory>

  80. 			<outputDirectory>.</outputDirectory>

  81. 			<excludes>

  82. 				<exclude>META-INF/maven/**</exclude>

  83. 			</excludes>

  84. 		</fileSet>

  85. 

  86. 		<!-- tools -->

  87. 		<fileSet>

  88. 			<directory>../ajde/target/classes</directory>

  89. 			<outputDirectory>.</outputDirectory>

  90. 			<excludes>

  91. 				<exclude>META-INF/maven/**</exclude>

  92. 			</excludes>

  93. 		</fileSet>

  94. 		<fileSet>

  95. 			<directory>../ajde.core/target/classes</directory>

  96. 			<outputDirectory>.</outputDirectory>

  97. 			<excludes>

  98. 				<exclude>META-INF/maven/**</exclude>

  99. 			</excludes>

  100. 		</fileSet>

  101. 		<fileSet>

  102. 			<directory>../ajdoc/target/classes</directory>

  103. 			<outputDirectory>.</outputDirectory>

  104. 			<excludes>

  105. 				<exclude>META-INF/maven/**</exclude>

  106. 			</excludes>

  107. 		</fileSet>

  108. 		<fileSet>

  109. 			<directory>../org.aspectj.ajdt.core/target/classes</directory>

  110. 			<outputDirectory>.</outputDirectory>

  111. 			<excludes>

  112. 				<exclude>META-INF/maven/**</exclude>

  113. 			</excludes>

  114. 		</fileSet>

  115. 		<fileSet>

  116. 			<directory>../taskdefs/target/classes</directory>

  117. 			<outputDirectory>.</outputDirectory>

  118. 			<excludes>

  119. 				<exclude>META-INF/maven/**</exclude>

  120. 			</excludes>

  121. 		</fileSet>

  122. 	</fileSets>

  123. 

  124. </assembly>