ref #9359 update aspectj in taxeditor

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 455383675e4b4f602380fac9ada9bbc45f940b42..3cbde7a8c3a5075665568caa63064b99102bce4e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -559,7 +559,7 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.swt
 Bundle-ClassPath: .,
  lib/apache-log4j-extras-1.2.17.jar,
- lib/aspectjrt-1.9.6.jar,
+ lib/aspectjrt-1.9.7.jar,
  lib/cdmlib-commons-5.29.0-SNAPSHOT.jar,
  lib/cdmlib-ext-5.29.0-SNAPSHOT.jar,
  lib/cdmlib-io-5.29.0-SNAPSHOT.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 9430ad42d3297a9d74da63b123ccb136af735ac0..aa961d43422ec2c1b98d27341b0f3d899f9f576d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -1,8 +1,8 @@
 bin.includes = META-INF/,\
                .,\
                lib/apache-log4j-extras-1.2.17.jar,\
-               lib/aspectjrt-1.9.6.jar,\
-               lib/aspectjweaver-1.9.6.jar,\
+               lib/aspectjrt-1.9.7.jar,\
+               lib/aspectjweaver-1.9.7.jar,\
                lib/cdmlib-commons-5.29.0-SNAPSHOT.jar,\
                lib/cdmlib-ext-5.29.0-SNAPSHOT.jar,\
                lib/cdmlib-io-5.29.0-SNAPSHOT.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 858ee1c85bedfabf2ef61a81cb4e1714245ff501..60e5ba90ac3661702697f84b01d0a5e9e034c963 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -16,6 +16,7 @@
       <lucene.version>5.4.1</lucene.version>\r
       <spring.version>4.3.30.RELEASE</spring.version>                                 <!-- checked 2021-12, further upgrade possible -->\r
       <spring-security.version>4.2.20.RELEASE</spring-security.version>               <!-- checked 2021-12, further upgrade possible -->\r
+      <aspectj.version>1.9.7</aspectj.version>\r
   </properties>\r
   <name>CDM Library Dependencies Plugin</name>\r
   <description>CDM Library and dependencies as a plugin</description>\r
@@ -477,12 +478,12 @@
     <dependency>\r
        <groupId>org.aspectj</groupId>\r
        <artifactId>aspectjweaver</artifactId>\r
-       <version>1.9.6</version>\r
+       <version>${aspectj.version}</version>\r
     </dependency>\r
     <dependency>\r
        <groupId>org.aspectj</groupId>\r
        <artifactId>aspectjrt</artifactId>\r
-       <version>1.9.6</version>\r
+       <version>${aspectj.version}</version>\r
     </dependency>\r
     <dependency>\r
        <groupId>org.hibernate.javax.persistence</groupId>\r