From 09d2f33a9d8b54f079ab123136e0d5471799c0cf Mon Sep 17 00:00:00 2001 From: Markus Paulsen Date: Tue, 22 Oct 2024 17:09:01 +0200 Subject: [PATCH 1/6] Make pom.xml file ready for deployment on Maven Central. --- pom.xml | 75 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 57 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 626eb6aa..f3f932c9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.tum.cit.ase ares - 2.0.0-SNAPSHOT + 2.0.0-Beta-1 21 1.3.0 @@ -19,8 +19,8 @@ UTF-8 - - D1A045E1DD48B876 + + 23E62BB282A473EE4DDA2F8763EFD39363D21A8D 1.9.22 @@ -196,6 +196,20 @@ jar + + install-pom + package + + install-file + + + ${basedir}/pom.xml + ${project.groupId} + ${project.artifactId} + ${project.version} + pom + + install-javadoc-jar install @@ -446,7 +460,9 @@ 3.5.1 1 - -javaagent:${project.build.directory}${file.separator}ares-2.0.0-SNAPSHOT-agent.jar -Xbootclasspath/a:${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar + -javaagent:${project.build.directory}${file.separator}ares-2.0.0-Beta-1-agent.jar + -Xbootclasspath/a:${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar + @@ -514,7 +530,35 @@ https://ase.cit.tum.de/ - scientific researcher + Scientific Researcher + + Europe/Berlin + + + SarpSahinalp + Sarp Sahinalp + sarp.sahinalp@tum.de + https://ase.cit.tum.de/people/paulsen/ + Technical University of Munich, School of Computation, Information and Technology , Research + Group Applied Software Engineering + + https://ase.cit.tum.de/ + + Thesis Student + + Europe/Berlin + + + AnirudhZaveri + Anirudh Zaveri + anirudh.zaveri@tum.de + https://ase.cit.tum.de/people/paulsen/ + Technical University of Munich, School of Computation, Information and Technology , Research + Group Applied Software Engineering + + https://ase.cit.tum.de/ + + Thesis Student Europe/Berlin @@ -591,7 +635,9 @@ 3.3.0 1 - -javaagent:/home/sarps/IdeaProjects/Ares2/target/ares-2.0.0-SNAPSHOT-agent.jar -Xbootclasspath/a:${user.home}/.m2/repository/org/aspectj/aspectjrt/${aspectj.version}/aspectjrt-${aspectj.version}.jar + -javaagent:/home/sarps/IdeaProjects/Ares2/target/ares-2.0.0-Beta-1-agent.jar + -Xbootclasspath/a:${user.home}/.m2/repository/org/aspectj/aspectjrt/${aspectj.version}/aspectjrt-${aspectj.version}.jar + @@ -600,19 +646,13 @@ ossrh - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + 3.2.7 sign-artifacts @@ -634,13 +674,12 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.13 + org.sonatype.central + central-publishing-maven-plugin + 0.6.0 true - ossrh - https://oss.sonatype.org/ + central From 2e151646b5906a7c382dca6f368d296fb8b7413d Mon Sep 17 00:00:00 2001 From: Markus Paulsen <39456125+MarkusPaulsen@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:18:56 +0200 Subject: [PATCH 2/6] Update pom.xml Co-authored-by: Sarp Sahinalp <92453703+sarpsahinalp@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f3f932c9..d5e4796f 100644 --- a/pom.xml +++ b/pom.xml @@ -635,7 +635,7 @@ 3.3.0 1 - -javaagent:/home/sarps/IdeaProjects/Ares2/target/ares-2.0.0-Beta-1-agent.jar + -javaagent:${project.build.directory}${file.separator}ares-2.0.0-Beta-1-agent.jar -Xbootclasspath/a:${user.home}/.m2/repository/org/aspectj/aspectjrt/${aspectj.version}/aspectjrt-${aspectj.version}.jar From 6e849bc906dca163f4758de21c5f023f8677f048 Mon Sep 17 00:00:00 2001 From: Markus Paulsen Date: Tue, 29 Oct 2024 08:42:13 +0100 Subject: [PATCH 3/6] Changed fixed artifactId and version to variable one. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f3f932c9..a502a21c 100644 --- a/pom.xml +++ b/pom.xml @@ -460,7 +460,7 @@ 3.5.1 1 - -javaagent:${project.build.directory}${file.separator}ares-2.0.0-Beta-1-agent.jar + -javaagent:${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar -Xbootclasspath/a:${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar @@ -635,7 +635,7 @@ 3.3.0 1 - -javaagent:/home/sarps/IdeaProjects/Ares2/target/ares-2.0.0-Beta-1-agent.jar + -javaagent:/home/sarps/IdeaProjects/Ares2/target/${project.artifactId}-${project.version}-agent.jar -Xbootclasspath/a:${user.home}/.m2/repository/org/aspectj/aspectjrt/${aspectj.version}/aspectjrt-${aspectj.version}.jar From baa3b138d30a7678428005c0b9ea9747e9fcbf13 Mon Sep 17 00:00:00 2001 From: Markus Paulsen Date: Tue, 29 Oct 2024 08:52:58 +0100 Subject: [PATCH 4/6] Fixed potential OS based errors by removing / and replacing it with ${file.separator} --- pom.xml | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 9872924d..e59b1ceb 100644 --- a/pom.xml +++ b/pom.xml @@ -189,7 +189,7 @@ install-file - ${project.build.directory}/${project.build.finalName}.jar + ${project.build.directory}${file.separator}${project.build.finalName}.jar ${project.groupId} ${project.artifactId} ${project.version} @@ -203,7 +203,7 @@ install-file - ${basedir}/pom.xml + ${basedir}${file.separator}pom.xml ${project.groupId} ${project.artifactId} ${project.version} @@ -217,7 +217,7 @@ install-file - ${project.build.directory}/${project.build.finalName}-javadoc.jar + ${project.build.directory}${file.separator}${project.build.finalName}-javadoc.jar ${project.groupId} ${project.artifactId} ${project.version} @@ -232,7 +232,7 @@ install-file - ${project.build.directory}/${project.build.finalName}-sources.jar + ${project.build.directory}${file.separator}${project.build.finalName}-sources.jar ${project.groupId} ${project.artifactId} ${project.version} @@ -362,28 +362,28 @@ - ${project.build.outputDirectory}/ch/qos/logback/ - ${project.build.outputDirectory}/com/intellij/ - ${project.build.outputDirectory}/com/sun/ + ${project.build.outputDirectory}${file.separator}ch${file.separator}qos${file.separator}logback${file.separator} + ${project.build.outputDirectory}${file.separator}com${file.separator}intellij${file.separator} + ${project.build.outputDirectory}${file.separator}com${file.separator}sun${file.separator} - ${project.build.outputDirectory}/java/ - ${project.build.outputDirectory}/javax/ - ${project.build.outputDirectory}/jdk/ - ${project.build.outputDirectory}/net/jqwik/ - ${project.build.outputDirectory}/org/apache/ - ${project.build.outputDirectory}/org/assertj/ - ${project.build.outputDirectory}/org/eclipse/ - ${project.build.outputDirectory}/org/jacoco/ - ${project.build.outputDirectory}/org/json/ - ${project.build.outputDirectory}/org/junit/ - ${project.build.outputDirectory}/org/opentest4j/ - ${project.build.outputDirectory}/sun/ - ${project.build.outputDirectory}/com/github/javaparser/ + ${project.build.outputDirectory}${file.separator}de${file.separator}tum${file.separator}cit${file.separator}ase${file.separator}ares${file.separator}api${file.separator} --> + ${project.build.outputDirectory}${file.separator}java${file.separator} + ${project.build.outputDirectory}${file.separator}javax${file.separator} + ${project.build.outputDirectory}${file.separator}jdk${file.separator} + ${project.build.outputDirectory}${file.separator}net${file.separator}jqwik${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}apache${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}assertj${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}eclipse${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}jacoco${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}json${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}junit${file.separator} + ${project.build.outputDirectory}${file.separator}org${file.separator}opentest4j${file.separator} + ${project.build.outputDirectory}${file.separator}sun${file.separator} + ${project.build.outputDirectory}${file.separator}com${file.separator}github${file.separator}javaparser${file.separator} - - ${project.build.outputDirectory}/org/gradle/ - ${project.build.outputDirectory}/worker/org/gradle/ + + ${project.build.outputDirectory}${file.separator}org${file.separator}gradle${file.separator} + ${project.build.outputDirectory}${file.separator}worker${file.separator}org${file.separator}gradle${file.separator} @@ -415,11 +415,11 @@ - ${basedir}/.settings/eclipse-rules.importorder + ${basedir}${file.separator}.settings${file.separator}eclipse-rules.importorder 4.17.0 - ${basedir}/.settings/eclipse-formatter-rules.xml + ${basedir}${file.separator}.settings${file.separator}eclipse-formatter-rules.xml @@ -620,7 +620,7 @@ internal - file://${project.build.directory}/mvn-repo + file://${project.build.directory}${file.separator}mvn-repo @@ -636,7 +636,7 @@ 1 -javaagent:${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar - -Xbootclasspath/a:${user.home}/.m2/repository/org/aspectj/aspectjrt/${aspectj.version}/aspectjrt-${aspectj.version}.jar + -Xbootclasspath/a:${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar From 25c82f92f7574b5513ea54f246111e6d8b0c28e4 Mon Sep 17 00:00:00 2001 From: Markus Paulsen Date: Tue, 29 Oct 2024 17:29:56 +0100 Subject: [PATCH 5/6] Try to indentify de.tum.cit.ase.ares.api.security.ConfigurationException --- pom.xml | 54 ++++++++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index e59b1ceb..826bb53b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,9 @@ 23E62BB282A473EE4DDA2F8763EFD39363D21A8D 1.9.22 + + ${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar + ${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar @@ -362,28 +365,27 @@ - ${project.build.outputDirectory}${file.separator}ch${file.separator}qos${file.separator}logback${file.separator} - ${project.build.outputDirectory}${file.separator}com${file.separator}intellij${file.separator} - ${project.build.outputDirectory}${file.separator}com${file.separator}sun${file.separator} - - ${project.build.outputDirectory}${file.separator}java${file.separator} - ${project.build.outputDirectory}${file.separator}javax${file.separator} - ${project.build.outputDirectory}${file.separator}jdk${file.separator} - ${project.build.outputDirectory}${file.separator}net${file.separator}jqwik${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}apache${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}assertj${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}eclipse${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}jacoco${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}json${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}junit${file.separator} - ${project.build.outputDirectory}${file.separator}org${file.separator}opentest4j${file.separator} - ${project.build.outputDirectory}${file.separator}sun${file.separator} - ${project.build.outputDirectory}${file.separator}com${file.separator}github${file.separator}javaparser${file.separator} - - - ${project.build.outputDirectory}${file.separator}org${file.separator}gradle${file.separator} - ${project.build.outputDirectory}${file.separator}worker${file.separator}org${file.separator}gradle${file.separator} + ${project.build.outputDirectory}/abc/def/ + ${project.build.outputDirectory}/ch/qos/logback/ + ${project.build.outputDirectory}/com/github/javaparser/ + ${project.build.outputDirectory}/com/intellij/ + ${project.build.outputDirectory}/com/sun/ + ${project.build.outputDirectory}/de/tum/cit/ase/ares/api/ + ${project.build.outputDirectory}/de/tum/in/test/api/ + ${project.build.outputDirectory}/java/ + ${project.build.outputDirectory}/javax/ + ${project.build.outputDirectory}/jdk/ + ${project.build.outputDirectory}/net/jqwik/ + ${project.build.outputDirectory}/org/apache/ + ${project.build.outputDirectory}/org/assertj/ + ${project.build.outputDirectory}/org/eclipse/ + ${project.build.outputDirectory}/org/jacoco/ + ${project.build.outputDirectory}/org/json/ + ${project.build.outputDirectory}/org/junit/ + ${project.build.outputDirectory}/org/opentest4j/ + ${project.build.outputDirectory}/sun/ + ${project.build.outputDirectory}/org/gradle/ + ${project.build.outputDirectory}/worker/org/gradle/ @@ -460,9 +462,7 @@ 3.5.1 1 - -javaagent:${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar - -Xbootclasspath/a:${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar - + -javaagent:${instrumentation-path} -Xbootclasspath/a:${aspectj-path} @@ -635,9 +635,7 @@ 3.3.0 1 - -javaagent:${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar - -Xbootclasspath/a:${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar - + -javaagent:${instrumentation-path} -Xbootclasspath/a:${aspectj-path} From 97fe7a074098158f427fa7702d1c5efe07dcfa3b Mon Sep 17 00:00:00 2001 From: Markus Paulsen Date: Tue, 29 Oct 2024 17:34:23 +0100 Subject: [PATCH 6/6] Fixed de.tum.cit.ase.ares.api.security.ConfigurationException --- pom.xml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 826bb53b..97f05189 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,12 @@ 23E62BB282A473EE4DDA2F8763EFD39363D21A8D 1.9.22 - ${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar - ${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar + + ${project.build.directory}${file.separator}${project.artifactId}-${project.version}-agent.jar + + + ${user.home}${file.separator}.m2${file.separator}repository${file.separator}org${file.separator}aspectj${file.separator}aspectjrt${file.separator}${aspectj.version}${file.separator}aspectjrt-${aspectj.version}.jar + @@ -206,7 +210,8 @@ install-file - ${basedir}${file.separator}pom.xml + ${basedir}${file.separator}pom.xml + ${project.groupId} ${project.artifactId} ${project.version} @@ -220,7 +225,8 @@ install-file - ${project.build.directory}${file.separator}${project.build.finalName}-javadoc.jar + ${project.build.directory}${file.separator}${project.build.finalName}-javadoc.jar + ${project.groupId} ${project.artifactId} ${project.version} @@ -235,7 +241,8 @@ install-file - ${project.build.directory}${file.separator}${project.build.finalName}-sources.jar + ${project.build.directory}${file.separator}${project.build.finalName}-sources.jar + ${project.groupId} ${project.artifactId} ${project.version} @@ -365,12 +372,14 @@ - ${project.build.outputDirectory}/abc/def/ + + ${project.build.outputDirectory}/ch/qos/logback/ ${project.build.outputDirectory}/com/github/javaparser/ ${project.build.outputDirectory}/com/intellij/ ${project.build.outputDirectory}/com/sun/ - ${project.build.outputDirectory}/de/tum/cit/ase/ares/api/ + ${project.build.outputDirectory}/de/tum/in/test/api/ ${project.build.outputDirectory}/java/ ${project.build.outputDirectory}/javax/ @@ -421,7 +430,8 @@ 4.17.0 - ${basedir}${file.separator}.settings${file.separator}eclipse-formatter-rules.xml + ${basedir}${file.separator}.settings${file.separator}eclipse-formatter-rules.xml +