Skip to content

Commit

Permalink
test: add submodules for new integration tests
Browse files Browse the repository at this point in the history
- feat: build tooling for integration test builds
- chore: add `apache/dubbo`
- chore: add `apple/pkl`
- chore: add `bazelbuild/bazel`
- chore: add `checkstyle/checkstyle`
- chore: add `pmd/pmd`
- chore: add `line/armeria`
- chore: add `NationalSecurityAgency/ghidra`
- chore: add `signalapp/signal-server`
- fix: ignore and remove further snapshot artifacts
- fix: publish all modules for `guava` (parent, bom, testlib)
- docs: page headings, jekyll fixes

Relates-To: #26
Signed-off-by: Sam Gammon <[email protected]>
  • Loading branch information
sgammon committed Mar 15, 2024
1 parent 893f1da commit f1b4b24
Show file tree
Hide file tree
Showing 317 changed files with 1,345 additions and 5,484 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on.pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
name: "Build & Test"
uses: ./.github/workflows/ci.build-test.yml
with:
tests: true
tests: false # tests run automatically where needed now

build-dependency-graph:
name: "Build & Test"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/target
/libs
/annotation-tools
*SNAPSHOT*
.DS_Store
_site
.sass-cache
Expand Down
27 changes: 27 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,30 @@
[submodule "protobuf"]
path = com.google.protobuf
url = [email protected]:sgammon/protobuf.git
[submodule "dubbo"]
path = tests/integration/dubbo
url = [email protected]:javamodules/dubbo.git
[submodule "pmd"]
path = tests/integration/pmd
url = [email protected]:javamodules/pmd.git
[submodule "ghidra"]
path = tests/integration/ghidra
url = [email protected]:javamodules/ghidra.git
[submodule "armeria"]
path = tests/integration/armeria
url = [email protected]:javamodules/armeria.git
[submodule "bazel"]
path = tests/integration/bazel
url = [email protected]:bazelbuild/bazel.git
[submodule "signal-server"]
path = tests/integration/signal-server
url = [email protected]:javamodules/Signal-Server.git
[submodule "pkl"]
path = tests/integration/pkl
url = [email protected]:javamodules/pkl.git
[submodule "checkstyle"]
path = tests/integration/checkstyle
url = [email protected]:javamodules/checkstyle.git
[submodule "gson"]
path = tests/integration/gson
url = [email protected]:google/gson.git
76 changes: 69 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ endif

include tools/common.mk
DEV_LOCAL = $(DEV_ROOT) $(DEV_BIN) $(DEV_BIN)/protoc
BUILD_DEPS ?= $(DEV_LOCAL) $(DEPS)
BUILD_DEPS ?= $(DEV_LOCAL)

all: setup $(BUILD_DEPS) repository samples test ## Build all targets and setup the repository.

Expand All @@ -54,8 +54,6 @@ update-modules: ## Update all sub-modules.

setup: ## Setup local codebase features; performs first-run stuff.
$(info Building JPMS libraries...)
$(RULE)mkdir -p repository
$(RULE)$(GIT) submodule update --init --recursive

repository: $(DEPS) $(LIBS) prebuilts ## Build the repository layout.
$(info Building repository layout...)
Expand Down Expand Up @@ -128,7 +126,7 @@ org.checkerframework/checker-qual/build/libs:
# Library: Guava ---------------------------------------------------------------------------

guava: com.google.guava ## Build Guava and all requisite dependencies.
com.google.guava: $(BUILD_DEPS) org.checkerframework com.google.j2objc com.google.errorprone com.google.guava/guava/target
com.google.guava: org.checkerframework com.google.j2objc com.google.errorprone com.google.guava/guava/target
com.google.guava/guava/target: com.google.guava/guava/futures/failureaccess/target
$(info Building Guava...)
$(RULE)cd com.google.guava \
Expand All @@ -139,7 +137,24 @@ com.google.guava/guava/target: com.google.guava/guava/futures/failureaccess/targ
-Derrorprone.version=$(ERROR_PRONE_VERSION) \
-Dj2objc.version=$(J2OBJC_VERSION) \
-Dfailureaccess.version=$(GUAVA_FAILUREACCESS_VERSION) \
-U \
-U

$(RULE)cd com.google.guava/guava-bom \
&& $(MAVEN) versions:set -DnewVersion=$(GUAVA_VERSION)

ifeq ($(SNAPSHOT),no)
$(RULE)cd com.google.guava \
&& $(MAVEN) deploy:deploy-file \
-DgroupId=com.google.guava \
-DartifactId=guava-parent \
-Dversion=$(GUAVA_VERSION) \
-Dpackaging=jar \
-DpomFile=../tools/poms/guava-parent.xml \
-Dfile=pom.xml \
-DrepositoryId=jpms-local \
-Durl=$(REPOSITORY)

$(RULE)cd com.google.guava \
&& $(MAVEN) deploy:deploy-file \
-DgroupId=com.google.guava \
-DartifactId=guava \
Expand All @@ -148,7 +163,42 @@ com.google.guava/guava/target: com.google.guava/guava/futures/failureaccess/targ
-DpomFile=../tools/poms/guava.xml \
-Dfile=guava/target/guava-$(GUAVA_VERSION).jar \
-DrepositoryId=jpms-local \
-Durl=$(REPOSITORY) \
-Durl=$(REPOSITORY)

$(RULE)cd com.google.guava \
&& $(MAVEN) deploy:deploy-file \
-DgroupId=com.google.guava \
-DartifactId=guava-testlib \
-Dversion=$(GUAVA_VERSION) \
-Dpackaging=jar \
-DpomFile=../tools/poms/guava-testlib.xml \
-Dfile=guava-testlib/target/guava-testlib-$(GUAVA_VERSION).jar \
-DrepositoryId=jpms-local \
-Durl=$(REPOSITORY)

$(RULE)cd com.google.guava \
&& $(MAVEN) deploy:deploy-file \
-DgroupId=com.google.guava \
-DartifactId=guava-gwt \
-Dversion=$(GUAVA_VERSION) \
-Dpackaging=jar \
-DpomFile=../tools/poms/guava-gwt.xml \
-Dfile=guava-gwt/target/guava-gwt-$(GUAVA_VERSION).jar \
-DrepositoryId=jpms-local \
-Durl=$(REPOSITORY)

$(RULE)cd com.google.guava \
&& $(MAVEN) deploy:deploy-file \
-DgroupId=com.google.guava \
-DartifactId=guava-bom \
-Dversion=$(GUAVA_VERSION) \
-Dpackaging=pom \
-DpomFile=./guava-bom/pom.xml \
-Dfile=./guava-bom/pom.xml \
-DrepositoryId=jpms-local \
-Durl=$(REPOSITORY)
endif
$(RULE)cd com.google.guava \
&& $(GIT) checkout . \
&& find . -name pom.xml.versionsBackup -delete \
&& echo "Guava ready."
Expand Down Expand Up @@ -341,6 +391,17 @@ endif

@echo "Protobuf ready."

#
# Testing: Google GSON ---------------------------------------------------------------------

tests-gson: ## Build GSON against local libraries.
$(RULE)$(MAKE) -C tests/integration gson

tests-checkstyle: ## Build Checkstyle against local libraries.
$(RULE)$(MAKE) -C tests/integration checkstyle

tests-pmd: ## Build PMD against local libraries.
$(RULE)$(MAKE) -C tests/integration pmd

#
# Top-level commands
Expand Down Expand Up @@ -371,7 +432,8 @@ help: ## Show this help text ('make help').
# Local Dev Targets
#

dev $(DEV_LOCAL): setup ## Setup local development tooling.
dev: $(DEV_LOCAL) ## Setup local development tooling.
$(DEV_LOCAL):
@echo "Setting up local dev root..."
$(RULE)$(MKDIR) -p $(DEV_ROOT) $(DEV_BIN)
@echo "Building 'protoc'..."
Expand Down
1 change: 1 addition & 0 deletions pages/libs/error-prone.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Error Prone Compiler
1 change: 1 addition & 0 deletions pages/libs/guava.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Guava
1 change: 1 addition & 0 deletions pages/libs/j2objc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# J2ObjC
1 change: 1 addition & 0 deletions pages/libs/protobuf.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Protocol Buffers
1 change: 1 addition & 0 deletions pages/libs/reactivestreams.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Reactive Streams
1 change: 1 addition & 0 deletions pages/samples/modular-guava-maven.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Sample: Modular Guava (Maven)
1 change: 1 addition & 0 deletions pages/samples/modular-guava.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Sample: Modular Guava (Gradle)
1 change: 1 addition & 0 deletions pages/samples/modular-proto.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Sample: Modular Protobuf (Gradle)
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<versions>
<version>1.0.3-jpms</version>
</versions>
<lastUpdated>20240313005815</lastUpdated>
<lastUpdated>20240315181359</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cc948ef79eaf3c35520ebc219e63738f
9d1c193968ee17cc9ab6c38ba781c55b
Original file line number Diff line number Diff line change
@@ -1 +1 @@
818bafe14b6e5a3b87dbb9f2d9c9867d65e24659
7cfa8ba366593beeee0f246af251e6ea714f64b8
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<modelVersion>4.0.0</modelVersion>

<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<version>33.0.0-jre-jpms</version>
<packaging>pom</packaging>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
<relativePath></relativePath>
</parent>

<name>Guava BOM</name>
<description>BOM for Guava artifacts</description>
<url>https://github.com/google/guava</url>
<inceptionYear>2010</inceptionYear>

<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/google/guava/issues</url>
</issueManagement>

<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-gwt</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14d44441cc5bb9fe686f2ce9e2008749
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
910dcfb3555f81c138b2e1564605fe26752448a2
12 changes: 12 additions & 0 deletions repository/com/google/guava/guava-bom/maven-metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.google.guava</groupId>
<artifactId>guava-bom</artifactId>
<versioning>
<release>33.0.0-jre-jpms</release>
<versions>
<version>33.0.0-jre-jpms</version>
</versions>
<lastUpdated>20240315193223</lastUpdated>
</versioning>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
708a8444e6978869ef51fcee4e0cadab
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f770772549f00baf4a74489eae2971d5cdab0a71
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
10991d8ccbed6f72516f60970dfbc6ab
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3f356e0ef7aed97ceeda50fce2ef1c6852ed1316
Loading

0 comments on commit f1b4b24

Please sign in to comment.