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

Merge develop into master #440

Merged
merged 25 commits into from
Nov 9, 2023
Merged

Merge develop into master #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8f52e08
Sync master and develop (#400)
AnakinRaW Oct 20, 2022
a76a485
Upgrade to GitHub-native Dependabot (#343)
dependabot-preview[bot] Oct 20, 2022
89b7f0d
Bump jackson-databind from 2.13.4.1 to 2.13.4.2 (#401)
dependabot[bot] Oct 21, 2022
747bff3
Bump maven-clean-plugin from 3.1.0 to 3.2.0 (#410)
dependabot[bot] Oct 21, 2022
60642ba
Bump gson from 2.9.0 to 2.9.1 (#408)
dependabot[bot] Oct 21, 2022
43f35d0
Bump org.eclipse.emf.common from 2.25.0 to 2.26.0 (#406)
dependabot[bot] Oct 21, 2022
0a4398f
Bump maven-dependency-plugin from 3.1.2 to 3.3.0 (#405)
dependabot[bot] Oct 21, 2022
c9cbc27
Bump org.eclipse.emf.ecore from 2.27.0 to 2.28.0 (#404)
dependabot[bot] Oct 21, 2022
94e6618
Bump junit from 4.13.1 to 4.13.2 (#403)
dependabot[bot] Oct 21, 2022
6db5f31
Bump gson from 2.9.1 to 2.10 (#414)
dependabot[bot] Oct 31, 2022
a93427b
update some deps
AnakinRaW Oct 31, 2022
d45a4c9
Merge branch 'develop' of https://github.com/CROSSINGTUD/CryptoAnalys…
AnakinRaW Oct 31, 2022
bc85da6
Bump flatten-maven-plugin from 1.2.2 to 1.3.0 (#411)
dependabot[bot] Oct 31, 2022
814a10b
version to 2.8.0-SNAPSHOT
AnakinRaW Oct 31, 2022
d34dba2
ignore test artifacts
AnakinRaW Oct 31, 2022
883943c
Refactor reporters
smeyer198 Jan 13, 2023
499ec5f
Update and add tests for reporter changes
smeyer198 Jan 13, 2023
c7cc6a5
Add docs to the refactored reporter parts
smeyer198 Jan 18, 2023
d344f40
Update README.md to include reporter changes
smeyer198 Jan 18, 2023
5b479d5
Merge pull request #430 from CROSSINGTUD/reporter_refactoring
schlichtig Jan 19, 2023
baa6dff
Adapt repository URLs in pom files
smeyer198 Nov 5, 2023
f29b218
Update crysl version to 2.0.2
smeyer198 Nov 6, 2023
be02985
Add deployment profile and workflow
smeyer198 Nov 6, 2023
a0a0278
Add fields for Sonatype server
smeyer198 Nov 6, 2023
af1d63f
Merge pull request #439 from CROSSINGTUD/2_8_0_release
schlichtig Nov 8, 2023
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
12 changes: 12 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: maven
directory: "/"
schedule:
interval: weekly
time: "04:00"
open-pull-requests-limit: 10
ignore:
- dependency-name: com.google.crypto.tink:tink
versions:
- 1.5.0
34 changes: 34 additions & 0 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Deploy CryptoAnalysis

on: [workflow_dispatch]

jobs:
deployment:
runs-on: ubuntu-latest
name: CryptoAnalysis deployment
steps:
- name: Checkout source code
uses: actions/checkout@v3
# Sets up Java version
- name: Set up Java
uses: actions/setup-java@v3
with:
distribution: 'adopt'
java-package: 'jdk'
java-version: '8'
server-id: 'ossrh' # must match the serverId configured for the nexus-staging-maven-plugin
server-username: OSSRH_USERNAME # Env var that holds your OSSRH user name
server-password: OSSRH_PASSWORD # Env var that holds your OSSRH user pw
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} # Substituted with the value stored in the referenced secret
gpg-passphrase: SIGN_KEY_PASS # Env var that holds the key's passphrase
# Sets up Maven version
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.6.3
- name: Build & Deploy CryptoAnalysis
run: mvn -B -U clean deploy -Pdeployment -DskipTests
env:
SIGN_KEY_PASS: ${{ secrets.GPG_PRIVATE_KEY_PASSPHRASE }}
OSSRH_USERNAME: ${{ secrets.SONATYPE_USER }}
OSSRH_PASSWORD: ${{ secrets.SONATYPE_PW }}
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
bin/
tmp/
*.tmp
*.temp
*.bak
*.swp
*~.nib
Expand Down Expand Up @@ -202,4 +203,5 @@ buildNumber.properties

# End of https://www.toptal.com/developers/gitignore/api/java,maven,eclipse,intellij+all

.flattened-pom.xml
.flattened-pom.xml
/shippable/testresults/
63 changes: 20 additions & 43 deletions CryptoAnalysis-Android/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<groupId>de.fraunhofer.iem</groupId>
<artifactId>CryptoAnalysis-Parent</artifactId>
<version>${revision}</version>
<version>2.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

<properties>
<flowDroidVersion>2.7.1</flowDroidVersion>
<flowDroidVersion>2.12.0</flowDroidVersion>
</properties>
<build>
<plugins>
Expand Down Expand Up @@ -69,53 +69,30 @@
<artifactId>CryptoAnalysis</artifactId>
</dependency>
<dependency>
<groupId>de.tud.sse</groupId>
<artifactId>soot-infoflow</artifactId>
<version>${flowDroidVersion}</version>
</dependency>
<dependency>
<groupId>de.tud.sse</groupId>
<artifactId>soot-infoflow-android</artifactId>
<version>${flowDroidVersion}</version>
</dependency>
<dependency>
<groupId>de.tud.sse</groupId>
<artifactId>soot-infoflow-cmd</artifactId>
<version>${flowDroidVersion}</version>
</dependency>
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
<artifactId>soot-infoflow</artifactId>
<version>${flowDroidVersion}</version>
</dependency>
<dependency>
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
<artifactId>soot-infoflow-summaries</artifactId>
<version>${flowDroidVersion}</version>
</dependency>
<dependency>
<groupId>de.fraunhofer.sit.sse.flowdroid</groupId>
<artifactId>soot-infoflow-android</artifactId>
<version>${flowDroidVersion}</version>
</dependency>
</dependencies>

<distributionManagement>
<snapshotRepository>
<id>soot-snapshot</id>
<name>Soot snapshot repository</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/</url>
<layout>default</layout>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<uniqueVersion>true</uniqueVersion>
<id>soot-release</id>
<name>Soot release repository</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/</url>
<layout>default</layout>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>soot-snapshot</id>
<name>soot snapshots</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>

<repository>
<id>soot-release</id>
<name>soot release</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/</url>
</repository>
</repositories>

</project>
58 changes: 22 additions & 36 deletions CryptoAnalysis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>de.fraunhofer.iem</groupId>
<artifactId>CryptoAnalysis-Parent</artifactId>
<version>${revision}</version>
<version>2.8.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -30,7 +30,7 @@
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>3.1.1</versionRange>
<versionRange>3.3.0</versionRange>
<goals>
<goal>unpack</goal>
</goals>
Expand All @@ -49,7 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.2</version>
<version>3.3.0</version>
<executions>
<execution>
<id>unpack</id>
Expand Down Expand Up @@ -125,7 +125,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<version>4.13.2</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -176,7 +176,7 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<filesets>
<fileset>
Expand Down Expand Up @@ -251,10 +251,17 @@
<version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<!-- Not sure why, but without this explicit dependency,
any newer version of maven-invoker-plugin than 3.2.1, causes tests to crash with runtime exceptions. -->
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -284,12 +291,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
<version>2.10</version>
</dependency>
<dependency>
<groupId>de.darmstadt.tu.crossing.CrySL</groupId>
<artifactId>de.darmstadt.tu.crossing.CrySL</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
Expand All @@ -300,13 +307,13 @@
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.common</artifactId>
<version>2.25.0</version>
<version>2.26.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.eclipse.emf/org.eclipse.emf.ecore -->
<dependency>
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore</artifactId>
<version>2.27.0</version>
<version>2.28.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
Expand All @@ -318,7 +325,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.1</version>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand All @@ -329,33 +336,12 @@

<distributionManagement>
<snapshotRepository>
<id>soot-snapshot</id>
<name>Soot snapshot repository</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/</url>
<layout>default</layout>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<uniqueVersion>true</uniqueVersion>
<id>soot-release</id>
<name>Soot release repository</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/</url>
<layout>default</layout>
<id>ossrh</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<repositories>
<repository>
<id>soot-snapshot</id>
<name>soot snapshots</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-snapshot/</url>
<releases>
<enabled>false</enabled>
</releases>
</repository>
<repository>
<id>soot-release</id>
<name>soot release</name>
<url>https://soot-build.cs.uni-paderborn.de/nexus/repository/soot-release/</url>
</repository>
</repositories>
</project>
Loading